diff options
| author | Jessica Wagantall <jwagantall@cyngn.com> | 2016-09-07 12:40:29 -0700 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-09-07 12:40:29 -0700 |
| commit | abcf8652e4d308d51110fafd00ecc90f9b607d83 (patch) | |
| tree | 94ea5631c76fe3c362bf668b35dd4e5bd97f1d42 /src/com/android/settings/users | |
| parent | 333ca009c5e8c1c591b2a50351f2a18841a9e7ed (diff) | |
| parent | 2169505c9a9300ca564a39d218b80dcfefc76c2a (diff) | |
| download | packages_apps_Settings-abcf8652e4d308d51110fafd00ecc90f9b607d83.zip packages_apps_Settings-abcf8652e4d308d51110fafd00ecc90f9b607d83.tar.gz packages_apps_Settings-abcf8652e4d308d51110fafd00ecc90f9b607d83.tar.bz2 | |
Merge tag 'android-6.0.1_r66' into HEAD
Android 6.0.1 release 66
# gpg: Signature made Tue 06 Sep 2016 09:27:08 AM PDT using DSA key ID 9AB10E78
# gpg: Can't check signature: public key not found
Diffstat (limited to 'src/com/android/settings/users')
| -rw-r--r-- | src/com/android/settings/users/UserSettings.java | 6 |
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 85d2700..a172766 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 |