Merge "Fix issue #7209355, #7214271." into jb-mr1-dev (b939e352) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -6770,6 +6770,7 @@ package android.content.pm {

	public class ResolveInfo implements android.os.Parcelable {		public class ResolveInfo implements android.os.Parcelable {
	ctor public ResolveInfo();		ctor public ResolveInfo();
			ctor public ResolveInfo(android.content.pm.ResolveInfo);
	method public int describeContents();		method public int describeContents();
	method public void dump(android.util.Printer, java.lang.String);		method public void dump(android.util.Printer, java.lang.String);
	method public final int getIconResource();		method public final int getIconResource();

core/java/android/content/pm/ResolveInfo.java

+15 −0

Original line number	Original line	Diff line number	Diff line
	@@ -230,6 +230,21 @@ public class ResolveInfo implements Parcelable {
	public ResolveInfo() {		public ResolveInfo() {
	}		}

			public ResolveInfo(ResolveInfo orig) {
			activityInfo = orig.activityInfo;
			serviceInfo = orig.serviceInfo;
			filter = orig.filter;
			priority = orig.priority;
			preferredOrder = orig.preferredOrder;
			match = orig.match;
			specificIndex = orig.specificIndex;
			labelRes = orig.labelRes;
			nonLocalizedLabel = orig.nonLocalizedLabel;
			icon = orig.icon;
			resolvePackageName = orig.resolvePackageName;
			system = orig.system;
			}

	public String toString() {		public String toString() {
	ComponentInfo ci = activityInfo != null ? activityInfo : serviceInfo;		ComponentInfo ci = activityInfo != null ? activityInfo : serviceInfo;
	return "ResolveInfo{"		return "ResolveInfo{"

packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -538,12 +538,14 @@ public class RecentsPanelView extends FrameLayout implements OnItemClickListener
	}		}

	private void updateUiElements() {		private void updateUiElements() {
	final int items = mRecentTaskDescriptions.size();		final int items = mRecentTaskDescriptions != null
			? mRecentTaskDescriptions.size() : 0;

	mRecentsContainer.setVisibility(items > 0 ? View.VISIBLE : View.GONE);		mRecentsContainer.setVisibility(items > 0 ? View.VISIBLE : View.GONE);

	// Set description for accessibility		// Set description for accessibility
	int numRecentApps = mRecentTaskDescriptions.size();		int numRecentApps = mRecentTaskDescriptions != null
			? mRecentTaskDescriptions.size() : 0;
	String recentAppsAccessibilityDescription;		String recentAppsAccessibilityDescription;
	if (numRecentApps == 0) {		if (numRecentApps == 0) {
	recentAppsAccessibilityDescription =		recentAppsAccessibilityDescription =

services/java/com/android/server/am/ActivityStack.java

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -4390,6 +4390,8 @@ final class ActivityStack {
	while (j < NA) {		while (j < NA) {
	ActivityRecord ar = mHistory.get(j);		ActivityRecord ar = mHistory.get(j);
	if (!ar.finishing && ar.task.taskId == taskId) {		if (!ar.finishing && ar.task.taskId == taskId) {
			thumbs.root = ar;
			thumbs.rootIndex = j;
	holder = ar.thumbHolder;		holder = ar.thumbHolder;
	if (holder != null) {		if (holder != null) {
	thumbs.mainThumbnail = holder.lastThumbnail;		thumbs.mainThumbnail = holder.lastThumbnail;
	@@ -4404,9 +4406,6 @@ final class ActivityStack {
	return thumbs;		return thumbs;
	}		}

	thumbs.root = mHistory.get(j);
	thumbs.rootIndex = j;

	ArrayList<TaskAccessInfo.SubTask> subtasks = new ArrayList<TaskAccessInfo.SubTask>();		ArrayList<TaskAccessInfo.SubTask> subtasks = new ArrayList<TaskAccessInfo.SubTask>();
	thumbs.subtasks = subtasks;		thumbs.subtasks = subtasks;
	while (j < NA) {		while (j < NA) {

services/java/com/android/server/pm/PackageManagerService.java

+10 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2488,6 +2488,15 @@ public class PackageManagerService extends IPackageManager.Stub {
	if (ri != null) {		if (ri != null) {
	return ri;		return ri;
	}		}
			if (userId != 0) {
			ri = new ResolveInfo(mResolveInfo);
			ri.activityInfo = new ActivityInfo(ri.activityInfo);
			ri.activityInfo.applicationInfo = new ApplicationInfo(
			ri.activityInfo.applicationInfo);
			ri.activityInfo.applicationInfo.uid = UserHandle.getUid(userId,
			UserHandle.getAppId(ri.activityInfo.applicationInfo.uid));
			return ri;
			}
	return mResolveInfo;		return mResolveInfo;
	}		}
	}		}
	@@ -3668,7 +3677,7 @@ public class PackageManagerService extends IPackageManager.Stub {
	mResolveActivity.applicationInfo = mAndroidApplication;		mResolveActivity.applicationInfo = mAndroidApplication;
	mResolveActivity.name = ResolverActivity.class.getName();		mResolveActivity.name = ResolverActivity.class.getName();
	mResolveActivity.packageName = mAndroidApplication.packageName;		mResolveActivity.packageName = mAndroidApplication.packageName;
	mResolveActivity.processName = mAndroidApplication.processName;		mResolveActivity.processName = "system:ui";
	mResolveActivity.launchMode = ActivityInfo.LAUNCH_MULTIPLE;		mResolveActivity.launchMode = ActivityInfo.LAUNCH_MULTIPLE;
	mResolveActivity.flags = ActivityInfo.FLAG_EXCLUDE_FROM_RECENTS;		mResolveActivity.flags = ActivityInfo.FLAG_EXCLUDE_FROM_RECENTS;
	mResolveActivity.theme = com.android.internal.R.style.Theme_Holo_Dialog_Alert;		mResolveActivity.theme = com.android.internal.R.style.Theme_Holo_Dialog_Alert;