Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 14e883b2: Fix merge error

Browse Source 
* commit '14e883b25e0998e3bc4e574a0df3db252d6e987f':
  Fix merge error
This commit is contained in:
Amith Yamasani
2012-08-17 16:39:09 -07:00
committed by Android Git Automerger
parent 0784c87061 14e883b25e
commit ca5d8dc2c0
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/com/android/internal/app/ResolverActivity.java
View File

@@ -151,7 +151,7 @@ public class ResolverActivity extends AlertActivity implements AdapterView.OnIte
resizeGrid(); resizeGrid();
} else if (count == 1) { } else if (count == 1) {
startActivityAsUser(mAdapter.intentForPosition(0), startActivityAsUser(mAdapter.intentForPosition(0),
UserHandle.getUserId(mLaunchedFromUid)); new UserHandle(UserHandle.getUserId(mLaunchedFromUid)));
mPackageMonitor.unregister(); mPackageMonitor.unregister();
mRegistered = false; mRegistered = false;
finish(); finish();
@@ -369,7 +369,7 @@ public class ResolverActivity extends AlertActivity implements AdapterView.OnIte
} }
if (intent != null) { 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") Intent in = new Intent().setAction("android.settings.APPLICATION_DETAILS_SETTINGS")
.setData(Uri.fromParts("package", ri.activityInfo.packageName, null)) .setData(Uri.fromParts("package", ri.activityInfo.packageName, null))
.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET); .addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
startActivityAsUser(in, UserHandle.getUserId(mLaunchedFromUid)); startActivityAsUser(in, new UserHandle(UserHandle.getUserId(mLaunchedFromUid)));
} }
private final class DisplayResolveInfo { private final class DisplayResolveInfo {