[RESTRICT AUTOMERGE] Correct the behavior of ACTION_PACKAGE_DATA_CLEARED am: 0587cd294a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20307962

Change-Id: Id9bdbbb6f826920e3a5f24508cbc38c8923d7fa4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jackal Guo
2022-11-10 01:47:20 +00:00
committed by Automerger Merge Worker

View File

@@ -4288,20 +4288,24 @@ public class ActivityManagerService extends IActivityManager.Stub
finishForceStopPackageLocked(packageName, appInfo.uid); finishForceStopPackageLocked(packageName, appInfo.uid);
} }
} }
final Intent intent = new Intent(Intent.ACTION_PACKAGE_DATA_CLEARED,
Uri.fromParts("package", packageName, null)); if (succeeded) {
intent.addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND); final Intent intent = new Intent(Intent.ACTION_PACKAGE_DATA_CLEARED,
intent.putExtra(Intent.EXTRA_UID, (appInfo != null) ? appInfo.uid : -1); Uri.fromParts("package", packageName, null /* fragment */));
intent.putExtra(Intent.EXTRA_USER_HANDLE, resolvedUserId); intent.addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);
if (isInstantApp) { intent.putExtra(Intent.EXTRA_UID,
intent.putExtra(Intent.EXTRA_PACKAGE_NAME, packageName); (appInfo != null) ? appInfo.uid : Process.INVALID_UID);
broadcastIntentInPackage("android", null, SYSTEM_UID, uid, pid, intent, intent.putExtra(Intent.EXTRA_USER_HANDLE, resolvedUserId);
null, null, 0, null, null, permission.ACCESS_INSTANT_APPS, null, if (isInstantApp) {
false, false, resolvedUserId, false); intent.putExtra(Intent.EXTRA_PACKAGE_NAME, packageName);
} else { }
broadcastIntentInPackage("android", null, SYSTEM_UID, uid, pid, intent,
null, null, 0, null, null, null, null, false, false, resolvedUserId, broadcastIntentInPackage("android", null /* featureId */, SYSTEM_UID,
false); uid, pid, intent, null /* resolvedType */, null /* resultTo */,
0 /* resultCode */, null /* resultData */, null /* resultExtras */,
isInstantApp ? permission.ACCESS_INSTANT_APPS : null,
null /* bOptions */, false /* serialized */, false /* sticky */,
resolvedUserId, false /* allowBackgroundActivityStarts */);
} }
if (observer != null) { if (observer != null) {