PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add remote control of Instant Apps am: 6ed0c7e8d7

Browse Source 
am: d95430cbe6

Change-Id: I3a052aeb59f608d21a3be43691128e2b7acd56a4
This commit is contained in:
Todd Kennedy
2016-09-22 21:58:04 +00:00
committed by android-build-merger
parent 2a7e6aa6a7 d95430cbe6
commit 212eb25768
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/applications/ManageDomainUrls.java
View File

@@ -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();