commit 69ce586155b175969b89fdf1a3b5ecb880410d94
author Jason Monk <jmonk@google.com> Tue Jul 19 20:39:18 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jul 19 20:39:18 2016 +0000
tree 8eb283b3b5da6c54492543cd7161909fa04a9ee0
parent c2733db43fde3c98b5cd979a27de5bd3ee458f33
parent 5a3d1c17f265da96007a0d615bc974e64994b083

Merge \"Pre-setup restrictions\" into nyc-dev
am: 5a3d1c17f2

Change-Id: I0bc7e426b0dfc4d233b9caa263e5361f94dbf6f2

src/com/android/settings/users/UserSettings.java

diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index 0975cba..d943e52 100644
--- 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.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 @@
         loadProfile();
         updateUserList();
         mShouldUpdateUserList = false;
+
+        if (Global.getInt(getContext().getContentResolver(), Global.DEVICE_PROVISIONED, 0) == 0) {
+            getActivity().finish();
+            return;
+        }
     }
 
     @Override