summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/users
diff options
context:
space:
mode:
authorJason Monk <jmonk@google.com>2016-06-30 11:26:08 -0400
committergitbuildkicker <android-build@google.com>2016-07-21 17:35:48 -0700
commit2169505c9a9300ca564a39d218b80dcfefc76c2a (patch)
tree298a8bd03edbd04fb3efed729f1e7dc7d50dca7a /src/com/android/settings/users
parent1edd645dd50fdbacd287af489ba0a4ad912bbd1c (diff)
downloadpackages_apps_Settings-2169505c9a9300ca564a39d218b80dcfefc76c2a.zip
packages_apps_Settings-2169505c9a9300ca564a39d218b80dcfefc76c2a.tar.gz
packages_apps_Settings-2169505c9a9300ca564a39d218b80dcfefc76c2a.tar.bz2
Pre-setup restrictions DO NOT MERGE
- Prevent external tiles from system apps - Don't let user settings run - Disable help Bug: 29194585 Change-Id: I74ab8aaab62d62cc4dbbdf3164429a503f3a572b
Diffstat (limited to 'src/com/android/settings/users')
-rw-r--r--src/com/android/settings/users/UserSettings.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index 1849a9a..1278d54 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -45,6 +45,7 @@ import android.preference.Preference.OnPreferenceClickListener;
import android.preference.PreferenceGroup;
import android.preference.PreferenceScreen;
import android.provider.Settings;
+import android.provider.Settings.Global;
import android.provider.Settings.Secure;
import android.util.Log;
import android.util.SparseArray;
@@ -229,6 +230,11 @@ public class UserSettings extends SettingsPreferenceFragment
filter.addAction(Intent.ACTION_USER_INFO_CHANGED);
context.registerReceiverAsUser(mUserChangeReceiver, UserHandle.ALL, filter, null,
mHandler);
+
+ if (Global.getInt(getContext().getContentResolver(), Global.DEVICE_PROVISIONED, 0) == 0) {
+ getActivity().finish();
+ return;
+ }
}
@Override