summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorChristopher Tate <ctate@google.com>2014-05-28 16:31:58 -0700
committerChristopher Tate <ctate@google.com>2014-05-28 16:31:58 -0700
commitf889ed11d21bfd3010f8e4e192a0532b7f6f7994 (patch)
treee87ad7edac25126ad813b0d0b1879a65c1801036 /services
parentb9a65de1f79d92326abcccc295c18f24afb83053 (diff)
downloadframeworks_base-f889ed11d21bfd3010f8e4e192a0532b7f6f7994.zip
frameworks_base-f889ed11d21bfd3010f8e4e192a0532b7f6f7994.tar.gz
frameworks_base-f889ed11d21bfd3010f8e4e192a0532b7f6f7994.tar.bz2
Don't crash on boot
...when removing dangling preferred-activity entries. Bug 15310848 Change-Id: Ibe9d82a06f8c608b866a2c3c6b286da2ededacca
Diffstat (limited to 'services')
-rwxr-xr-xservices/core/java/com/android/server/pm/PackageManagerService.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index b06b090..d505e81 100755
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -11775,8 +11775,8 @@ public class PackageManagerService extends IPackageManager.Stub {
}
}
if (removed.size() > 0) {
- for (int j=0; j<removed.size(); j++) {
- PreferredActivity pa = removed.get(i);
+ for (int r=0; r<removed.size(); r++) {
+ PreferredActivity pa = removed.get(r);
Slog.w(TAG, "Removing dangling preferred activity: "
+ pa.mPref.mComponent);
pir.removeFilter(pa);