Fix issue #21753257: Stability: startActivity asks to run as user 0... (a825c084) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/ActivityManagerService.java

+14 −8

Original line number	Original line	Diff line number	Diff line
	@@ -10779,6 +10779,9 @@ public final class ActivityManagerService extends ActivityManagerNative
	return;		return;
	}		}
	}		}

			long ident = Binder.clearCallingIdentity();
			try {
	pae.intent.replaceExtras(pae.extras);		pae.intent.replaceExtras(pae.extras);
	pae.intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK		pae.intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
	\| Intent.FLAG_ACTIVITY_SINGLE_TOP		\| Intent.FLAG_ACTIVITY_SINGLE_TOP
	@@ -10789,6 +10792,9 @@ public final class ActivityManagerService extends ActivityManagerNative
	} catch (ActivityNotFoundException e) {		} catch (ActivityNotFoundException e) {
	Slog.w(TAG, "No activity to handle assist action.", e);		Slog.w(TAG, "No activity to handle assist action.", e);
	}		}
			} finally {
			Binder.restoreCallingIdentity(ident);
			}
	}		}

	public boolean launchAssistIntent(Intent intent, int requestType, String hint, int userHandle,		public boolean launchAssistIntent(Intent intent, int requestType, String hint, int userHandle,