Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 2d6b10f1: am 0ca6cf20: Merge "Clearing tasks along with application data. (Bug 16952119)" into lmp-dev

Browse Source 
* commit '2d6b10f11a3ecb17374adde204175c8f9f8c63de':
  Clearing tasks along with application data. (Bug 16952119)
This commit is contained in:
Winson Chung
2014-08-12 22:13:34 +00:00
committed by Android Git Automerger
parent 5b5bb2d984 42e5e88317
commit ec05f2cce4
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -4665,14 +4665,26 @@ public final class ActivityManagerService extends ActivityManagerNative
+ android.Manifest.permission.CLEAR_APP_USER_DATA + " to clear data"
+ " of package " + packageName);
}
// Remove all tasks match the cleared application package and user
for (int i = mRecentTasks.size() - 1; i >= 0; i--) {
final TaskRecord tr = mRecentTasks.get(i);
final String taskPackageName =
tr.getBaseIntent().getComponent().getPackageName();
if (tr.userId != userId) continue;
if (!taskPackageName.equals(packageName)) continue;
removeTaskByIdLocked(tr.taskId, 0);
}
}
try {
// Clear application user data
pm.clearApplicationUserData(packageName, observer, userId);
// Remove all permissions granted from/to this package
removeUriPermissionsForPackageLocked(packageName, userId, true);
synchronized(this) {
// Remove all permissions granted from/to this package
removeUriPermissionsForPackageLocked(packageName, userId, true);
}
Intent intent = new Intent(Intent.ACTION_PACKAGE_DATA_CLEARED,
Uri.fromParts("package", packageName, null));
@@ -7410,7 +7422,7 @@ public final class ActivityManagerService extends ActivityManagerNative
final int N = mRecentTasks.size();
for (int i = 0; i < N; i++) {
TaskRecord tr = mRecentTasks.get(i);
// Skip tasks that are not created by the caller
// Skip tasks that do not match the package name
if (packages.contains(tr.getBaseIntent().getComponent().getPackageName())) {
ActivityManager.RecentTaskInfo taskInfo =
createRecentTaskInfoFromTaskRecord(tr);