From 14e883b25e0998e3bc4e574a0df3db252d6e987f Mon Sep 17 00:00:00 2001 From: Amith Yamasani Date: Fri, 17 Aug 2012 16:34:53 -0700 Subject: [PATCH] Fix merge error Didn't apply the recent API change from another CL. Change-Id: I65ac6108909eca7ac48beabb4a8b7bbedda84249 --- core/java/com/android/internal/app/ResolverActivity.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java index 4937e1dd98d0b..bffbe119724c2 100644 --- a/core/java/com/android/internal/app/ResolverActivity.java +++ b/core/java/com/android/internal/app/ResolverActivity.java @@ -151,7 +151,7 @@ public class ResolverActivity extends AlertActivity implements AdapterView.OnIte resizeGrid(); } else if (count == 1) { startActivityAsUser(mAdapter.intentForPosition(0), - UserHandle.getUserId(mLaunchedFromUid)); + new UserHandle(UserHandle.getUserId(mLaunchedFromUid))); mPackageMonitor.unregister(); mRegistered = false; finish(); @@ -369,7 +369,7 @@ public class ResolverActivity extends AlertActivity implements AdapterView.OnIte } if (intent != null) { - startActivityAsUser(intent, UserHandle.getUserId(mLaunchedFromUid)); + startActivityAsUser(intent, new UserHandle(UserHandle.getUserId(mLaunchedFromUid))); } } @@ -377,7 +377,7 @@ public class ResolverActivity extends AlertActivity implements AdapterView.OnIte Intent in = new Intent().setAction("android.settings.APPLICATION_DETAILS_SETTINGS") .setData(Uri.fromParts("package", ri.activityInfo.packageName, null)) .addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET); - startActivityAsUser(in, UserHandle.getUserId(mLaunchedFromUid)); + startActivityAsUser(in, new UserHandle(UserHandle.getUserId(mLaunchedFromUid))); } private final class DisplayResolveInfo {