diff options
Diffstat (limited to 'core/java/com/android/internal')
4 files changed, 11 insertions, 11 deletions
diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java index 84fe8ce..e63c57f 100644 --- a/core/java/com/android/internal/app/ResolverActivity.java +++ b/core/java/com/android/internal/app/ResolverActivity.java @@ -37,7 +37,7 @@ import android.os.Bundle; import android.os.PatternMatcher; import android.os.Process; import android.os.RemoteException; -import android.os.UserId; +import android.os.UserHandle; import android.util.Log; import android.view.LayoutInflater; import android.view.View; @@ -133,7 +133,7 @@ public class ResolverActivity extends AlertActivity implements AdapterView.OnIte mAdapter = new ResolveListAdapter(this, intent, initialIntents, rList, mLaunchedFromUid); int count = mAdapter.getCount(); - if (mLaunchedFromUid < 0 || UserId.isIsolated(mLaunchedFromUid)) { + if (mLaunchedFromUid < 0 || UserHandle.isIsolated(mLaunchedFromUid)) { // Gulp! finish(); return; diff --git a/core/java/com/android/internal/statusbar/StatusBarNotification.java b/core/java/com/android/internal/statusbar/StatusBarNotification.java index 540d134..cb87ac4 100644 --- a/core/java/com/android/internal/statusbar/StatusBarNotification.java +++ b/core/java/com/android/internal/statusbar/StatusBarNotification.java @@ -19,7 +19,7 @@ package com.android.internal.statusbar; import android.app.Notification; import android.os.Parcel; import android.os.Parcelable; -import android.os.UserId; +import android.os.UserHandle; import android.widget.RemoteViews; @@ -136,7 +136,7 @@ public class StatusBarNotification implements Parcelable { /** Returns a userHandle for the instance of the app that posted this notification. */ public int getUserId() { - return UserId.getUserId(this.uid); + return UserHandle.getUserId(this.uid); } } diff --git a/core/java/com/android/internal/widget/LockPatternUtils.java b/core/java/com/android/internal/widget/LockPatternUtils.java index f77e8f3..4777c16 100644 --- a/core/java/com/android/internal/widget/LockPatternUtils.java +++ b/core/java/com/android/internal/widget/LockPatternUtils.java @@ -34,7 +34,7 @@ import android.os.Process; import android.os.RemoteException; import android.os.ServiceManager; import android.os.SystemClock; -import android.os.UserId; +import android.os.UserHandle; import android.os.storage.IMountService; import android.provider.Settings; import android.security.KeyStore; @@ -246,7 +246,7 @@ public class LockPatternUtils { if (callingUid == android.os.Process.SYSTEM_UID) { return mCurrentUserId; } else { - return UserId.getUserId(callingUid); + return UserHandle.getUserId(callingUid); } } diff --git a/core/java/com/android/internal/widget/LockSettingsService.java b/core/java/com/android/internal/widget/LockSettingsService.java index 2fb81ac..350e006 100644 --- a/core/java/com/android/internal/widget/LockSettingsService.java +++ b/core/java/com/android/internal/widget/LockSettingsService.java @@ -25,7 +25,7 @@ import android.database.sqlite.SQLiteOpenHelper; import android.os.Binder; import android.os.RemoteException; import android.os.SystemProperties; -import android.os.UserId; +import android.os.UserHandle; import android.provider.Settings; import android.provider.Settings.Secure; import android.text.TextUtils; @@ -97,7 +97,7 @@ public class LockSettingsService extends ILockSettings.Stub { private static final void checkWritePermission(int userId) { final int callingUid = Binder.getCallingUid(); - if (UserId.getAppId(callingUid) != android.os.Process.SYSTEM_UID) { + if (UserHandle.getAppId(callingUid) != android.os.Process.SYSTEM_UID) { throw new SecurityException("uid=" + callingUid + " not authorized to write lock settings"); } @@ -105,7 +105,7 @@ public class LockSettingsService extends ILockSettings.Stub { private static final void checkPasswordReadPermission(int userId) { final int callingUid = Binder.getCallingUid(); - if (UserId.getAppId(callingUid) != android.os.Process.SYSTEM_UID) { + if (UserHandle.getAppId(callingUid) != android.os.Process.SYSTEM_UID) { throw new SecurityException("uid=" + callingUid + " not authorized to read lock password"); } @@ -113,8 +113,8 @@ public class LockSettingsService extends ILockSettings.Stub { private static final void checkReadPermission(int userId) { final int callingUid = Binder.getCallingUid(); - if (UserId.getAppId(callingUid) != android.os.Process.SYSTEM_UID - && UserId.getUserId(callingUid) != userId) { + if (UserHandle.getAppId(callingUid) != android.os.Process.SYSTEM_UID + && UserHandle.getUserId(callingUid) != userId) { throw new SecurityException("uid=" + callingUid + " not authorized to read settings of user " + userId); } |