Merge \"Pre-setup restrictions\" into nyc-dev

am: 5a3d1c17f2 Change-Id: I0bc7e426b0dfc4d233b9caa263e5361f94dbf6f2
2016-07-19 20:39:18 +00:00
parent c2733db43f 5a3d1c17f2
commit 69ce586155
1 changed files with 6 additions and 0 deletions
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -44,6 +44,7 @@ import android.support.v7.preference.Preference;
 import android.support.v7.preference.Preference.OnPreferenceClickListener;
 import android.support.v7.preference.PreferenceGroup;
 import android.support.v7.preference.PreferenceScreen;
+import android.provider.Settings.Global;
 import android.util.Log;
 import android.util.SparseArray;
 import android.view.Menu;
@@ -241,6 +242,11 @@ public class UserSettings extends SettingsPreferenceFragment
        loadProfile();
        updateUserList();
        mShouldUpdateUserList = false;
+
+        if (Global.getInt(getContext().getContentResolver(), Global.DEVICE_PROVISIONED, 0) == 0) {
+            getActivity().finish();
+            return;
+        }
    }

    @Override