[automerge] [RESTRICT AUTOMERGE] Correct the behavior of ACTION_PACKAGE_DATA_CLEARED 2p: 1748c4e356
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20302364 Bug: 240267890 Change-Id: I3cbe20a8111634773900dc0c363cf0486178ed52
This commit is contained in:
@@ -3517,20 +3517,25 @@ 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 : 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, null);
|
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, null);
|
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 */,
|
||||||
|
null /* backgroundActivityStartsToken */);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (observer != null) {
|
if (observer != null) {
|
||||||
|
|||||||
Reference in New Issue
Block a user