Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69ce5861 authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

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

am: 5a3d1c17

Change-Id: I0bc7e426b0dfc4d233b9caa263e5361f94dbf6f2
parents c2733db4 5a3d1c17

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

+6 −0
Original line number Diff line number Diff line
@@ -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