Merge "[RESTRICT AUTOMERGE] Correct the behavior of ACTION_PACKAGE_DATA_CLEARED" into rvc-dev
This commit is contained in:
@@ -4296,20 +4296,24 @@ public class ActivityManagerService extends IActivityManager.Stub
|
||||
finishForceStopPackageLocked(packageName, appInfo.uid);
|
||||
}
|
||||
}
|
||||
final Intent intent = new Intent(Intent.ACTION_PACKAGE_DATA_CLEARED,
|
||||
Uri.fromParts("package", packageName, null));
|
||||
intent.addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);
|
||||
intent.putExtra(Intent.EXTRA_UID, (appInfo != null) ? appInfo.uid : -1);
|
||||
intent.putExtra(Intent.EXTRA_USER_HANDLE, resolvedUserId);
|
||||
if (isInstantApp) {
|
||||
intent.putExtra(Intent.EXTRA_PACKAGE_NAME, packageName);
|
||||
broadcastIntentInPackage("android", null, SYSTEM_UID, uid, pid, intent,
|
||||
null, null, 0, null, null, permission.ACCESS_INSTANT_APPS, null,
|
||||
false, false, resolvedUserId, false);
|
||||
} else {
|
||||
broadcastIntentInPackage("android", null, SYSTEM_UID, uid, pid, intent,
|
||||
null, null, 0, null, null, null, null, false, false, resolvedUserId,
|
||||
false);
|
||||
|
||||
if (succeeded) {
|
||||
final Intent intent = new Intent(Intent.ACTION_PACKAGE_DATA_CLEARED,
|
||||
Uri.fromParts("package", packageName, null /* fragment */));
|
||||
intent.addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);
|
||||
intent.putExtra(Intent.EXTRA_UID,
|
||||
(appInfo != null) ? appInfo.uid : Process.INVALID_UID);
|
||||
intent.putExtra(Intent.EXTRA_USER_HANDLE, resolvedUserId);
|
||||
if (isInstantApp) {
|
||||
intent.putExtra(Intent.EXTRA_PACKAGE_NAME, packageName);
|
||||
}
|
||||
|
||||
broadcastIntentInPackage("android", null /* featureId */, SYSTEM_UID,
|
||||
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) {
|
||||
|
||||
Reference in New Issue
Block a user