diff options
| author | Dianne Hackborn <hackbod@google.com> | 2012-08-16 10:48:27 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2012-08-16 12:46:38 -0700 |
| commit | f02b60aa4f367516f40cf3d60fffae0c6fe3e1b8 (patch) | |
| tree | 893430514916fc74f4fd008dbcb457c2dd317989 /core/java/android/app/ActivityThread.java | |
| parent | ca34bcf6746454c561b0c07ca5c6e42bd4a73e9e (diff) | |
| download | frameworks_base-f02b60aa4f367516f40cf3d60fffae0c6fe3e1b8.zip frameworks_base-f02b60aa4f367516f40cf3d60fffae0c6fe3e1b8.tar.gz frameworks_base-f02b60aa4f367516f40cf3d60fffae0c6fe3e1b8.tar.bz2 | |
Rename UserId to UserHandle.
This is the start of turning this into a formal public API.
Change-Id: I5786d2c320f1de41a06ed5d0f65adb68967287a0
Diffstat (limited to 'core/java/android/app/ActivityThread.java')
| -rw-r--r-- | core/java/android/app/ActivityThread.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index 0789c60..7eb86f4 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -62,7 +62,7 @@ import android.os.ServiceManager; import android.os.StrictMode; import android.os.SystemClock; import android.os.Trace; -import android.os.UserId; +import android.os.UserHandle; import android.util.AndroidRuntimeException; import android.util.DisplayMetrics; import android.util.EventLog; @@ -1696,7 +1696,7 @@ public final class ActivityThread { ApplicationInfo ai = null; try { ai = getPackageManager().getApplicationInfo(packageName, - PackageManager.GET_SHARED_LIBRARY_FILES, UserId.myUserId()); + PackageManager.GET_SHARED_LIBRARY_FILES, UserHandle.myUserId()); } catch (RemoteException e) { // Ignore } @@ -1713,7 +1713,7 @@ public final class ActivityThread { boolean includeCode = (flags&Context.CONTEXT_INCLUDE_CODE) != 0; boolean securityViolation = includeCode && ai.uid != 0 && ai.uid != Process.SYSTEM_UID && (mBoundApplication != null - ? !UserId.isSameApp(ai.uid, mBoundApplication.appInfo.uid) + ? !UserHandle.isSameApp(ai.uid, mBoundApplication.appInfo.uid) : true); if ((flags&(Context.CONTEXT_INCLUDE_CODE |Context.CONTEXT_IGNORE_SECURITY)) |