Merge "ShortcutManager: When app\'s data is cleared, remove all shortcuts," into nyc-dev am: d1c30db548

am: 07f8d94c6e

* commit '07f8d94c6e53cfd7dd389027fc2471ce5ea07846':
  ShortcutManager: When app's data is cleared, remove all shortcuts,

Change-Id: Id5755e333af7552537ddf02c07f0ef12d998b427
This commit is contained in:
Makoto Onuki
2016-04-28 20:18:34 +00:00
committed by android-build-merger
3 changed files with 116 additions and 26 deletions

View File

@@ -45,6 +45,7 @@ public abstract class PackageMonitor extends android.content.BroadcastReceiver {
sPackageFilt.addAction(Intent.ACTION_PACKAGE_CHANGED);
sPackageFilt.addAction(Intent.ACTION_QUERY_PACKAGE_RESTART);
sPackageFilt.addAction(Intent.ACTION_PACKAGE_RESTARTED);
sPackageFilt.addAction(Intent.ACTION_PACKAGE_DATA_CLEARED);
sPackageFilt.addDataScheme("package");
sNonDataFilt.addAction(Intent.ACTION_UID_REMOVED);
sNonDataFilt.addAction(Intent.ACTION_USER_STOPPED);
@@ -275,6 +276,9 @@ public abstract class PackageMonitor extends android.content.BroadcastReceiver {
public void onFinishPackageChanges() {
}
public void onPackageDataCleared(String packageName, int uid) {
}
public int getChangingUserId() {
return mChangeUserId;
}
@@ -365,6 +369,12 @@ public abstract class PackageMonitor extends android.content.BroadcastReceiver {
}
onPackageModified(pkg);
}
} else if (Intent.ACTION_PACKAGE_DATA_CLEARED.equals(action)) {
String pkg = getPackageName(intent);
int uid = intent.getIntExtra(Intent.EXTRA_UID, 0);
if (pkg != null) {
onPackageDataCleared(pkg, uid);
}
} else if (Intent.ACTION_QUERY_PACKAGE_RESTART.equals(action)) {
mDisappearingPackages = intent.getStringArrayExtra(Intent.EXTRA_PACKAGES);
mChangeType = PACKAGE_TEMPORARY_CHANGE;