summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorChristopher Tate <ctate@google.com>2014-05-28 23:37:29 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-05-28 23:37:30 +0000
commit56f2daab14a7b0161e36c86bdc61cd628a847245 (patch)
tree76a01a2d417f7a4294dbadc2ca63064e3d0903c4 /services
parentc1073c3376763a68d4acff68be745227ee63bef9 (diff)
parentf889ed11d21bfd3010f8e4e192a0532b7f6f7994 (diff)
downloadframeworks_base-56f2daab14a7b0161e36c86bdc61cd628a847245.zip
frameworks_base-56f2daab14a7b0161e36c86bdc61cd628a847245.tar.gz
frameworks_base-56f2daab14a7b0161e36c86bdc61cd628a847245.tar.bz2
Merge "Don't crash on boot" into lmp-preview-dev
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);