From 6ed0c7e8d7b987b04ae57fa9591f4db6711cbf9b Mon Sep 17 00:00:00 2001
From: Todd Kennedy <toddke@google.com>
Date: Tue, 13 Sep 2016 16:36:25 -0700
Subject: [PATCH] Add remote control of Instant Apps

Bug: 31470039
Test: manual
Change-Id: I82eb47f4d24fb88d0f264eca1176aec55364867c
---
 .../android/settings/applications/ManageDomainUrls.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/com/android/settings/applications/ManageDomainUrls.java b/src/com/android/settings/applications/ManageDomainUrls.java
index 9b3f09e5063..13e105db728 100644
--- a/src/com/android/settings/applications/ManageDomainUrls.java
+++ b/src/com/android/settings/applications/ManageDomainUrls.java
@@ -22,6 +22,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.provider.Settings;
+import android.provider.Settings.Global;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.Preference.OnPreferenceChangeListener;
@@ -57,9 +58,6 @@ import java.util.ArrayList;
 public class ManageDomainUrls extends SettingsPreferenceFragment
         implements ApplicationsState.Callbacks, OnPreferenceChangeListener {
 
-    // STOPSHIP; b/30256615
-    private static final boolean DISABLE_WEB_ACTIONS = !Build.IS_DEBUGGABLE;
-
     private ApplicationsState mApplicationsState;
     private ApplicationsState.Session mSession;
     private PreferenceGroup mDomainAppList;
@@ -114,7 +112,9 @@ public class ManageDomainUrls extends SettingsPreferenceFragment
             return;
         }
 
-        if (DISABLE_WEB_ACTIONS) {
+        final boolean disableWebActions = Global.getInt(getContext().getContentResolver(),
+                Global.ENABLE_EPHEMERAL_FEATURE, 1) == 0;
+        if (disableWebActions) {
             mDomainAppList = getPreferenceScreen();
         } else {
             final PreferenceGroup preferenceScreen = getPreferenceScreen();