commit bb06a427eb471227cf42a8078a54ca0581309493
author Dianne Hackborn <hackbod@google.com> Thu Aug 16 11:01:57 2012 -0700
committer Dianne Hackborn <hackbod@google.com> Thu Aug 16 12:47:09 2012 -0700
tree b3c7551fb78800794fba5600193311b6ca543432
parent 704ca026e0919c9361859d755b1f3f4eb1315c64

Rename UserId to UserHandle.

Change-Id: I04b86f3777c28fb83f03eb404dd5c2eb18d3da8f

src/com/android/settings/Settings.java

diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index e6e6cff..364f96a 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -40,7 +40,7 @@
 import android.os.INetworkManagementService;
 import android.os.RemoteException;
 import android.os.ServiceManager;
-import android.os.UserId;
+import android.os.UserHandle;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceActivity.Header;
@@ -415,13 +415,13 @@
                 i = insertAccountsHeaders(target, headerIndex);
             } else if (id == R.id.user_settings) {
                 if (!mEnableUserManagement
-                        || !UserId.MU_ENABLED || UserId.myUserId() != 0
+                        || !UserHandle.MU_ENABLED || UserHandle.myUserId() != 0
                         || !getResources().getBoolean(R.bool.enable_user_management)
                         || Utils.isMonkeyRunning()) {
                     target.remove(header);
                 }
             }
-            if (UserId.MU_ENABLED && UserId.myUserId() != 0
+            if (UserHandle.MU_ENABLED && UserHandle.myUserId() != 0
                     && !ArrayUtils.contains(SETTINGS_FOR_RESTRICTED, id)) {
                 target.remove(header);
             }