Fix merge error

Amith Yamasani · Amith Yamasani · commit 14e883b25e09 · 2012-08-17T16:34:53.000-07:00
Didn't apply the recent API change from another CL.

Change-Id: I65ac6108909eca7ac48beabb4a8b7bbedda84249
diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java
@@ -151,7 +151,7 @@ protected void onCreate(Bundle savedInstanceState, Intent intent,
             resizeGrid();
         } else if (count == 1) {
             startActivityAsUser(mAdapter.intentForPosition(0),
-                    UserHandle.getUserId(mLaunchedFromUid));
+                    new UserHandle(UserHandle.getUserId(mLaunchedFromUid)));
             mPackageMonitor.unregister();
             mRegistered = false;
             finish();
@@ -369,15 +369,15 @@ protected void onIntentSelected(ResolveInfo ri, Intent intent, boolean alwaysChe
         }
 
         if (intent != null) {
-            startActivityAsUser(intent, UserHandle.getUserId(mLaunchedFromUid));
+            startActivityAsUser(intent, new UserHandle(UserHandle.getUserId(mLaunchedFromUid)));
         }
     }
 
     void showAppDetails(ResolveInfo ri) {
         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 {

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ protected void onCreate(Bundle savedInstanceState, Intent intent,`
`151`	`151`	`resizeGrid();`
`152`	`152`	`} else if (count == 1) {`
`153`	`153`	`startActivityAsUser(mAdapter.intentForPosition(0),`
`154`		`- UserHandle.getUserId(mLaunchedFromUid));`
	`154`	`+ new UserHandle(UserHandle.getUserId(mLaunchedFromUid)));`
`155`	`155`	`mPackageMonitor.unregister();`
`156`	`156`	`mRegistered = false;`
`157`	`157`	`finish();`
`@@ -369,15 +369,15 @@ protected void onIntentSelected(ResolveInfo ri, Intent intent, boolean alwaysChe`
`369`	`369`	`}`
`370`	`370`
`371`	`371`	`if (intent != null) {`
`372`		`- startActivityAsUser(intent, UserHandle.getUserId(mLaunchedFromUid));`
	`372`	`+ startActivityAsUser(intent, new UserHandle(UserHandle.getUserId(mLaunchedFromUid)));`
`373`	`373`	`}`
`374`	`374`	`}`
`375`	`375`
`376`	`376`	`void showAppDetails(ResolveInfo ri) {`
`377`	`377`	`Intent in = new Intent().setAction("android.settings.APPLICATION_DETAILS_SETTINGS")`
`378`	`378`	`.setData(Uri.fromParts("package", ri.activityInfo.packageName, null))`
`379`	`379`	`.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);`
`380`		`- startActivityAsUser(in, UserHandle.getUserId(mLaunchedFromUid));`
	`380`	`+ startActivityAsUser(in, new UserHandle(UserHandle.getUserId(mLaunchedFromUid)));`
`381`	`381`	`}`
`382`	`382`
`383`	`383`	`private final class DisplayResolveInfo {`