am 838b1e22: Merge "Fix NPE in PackageManagerService."

* commit '838b1e2215cbc27e77530f4c79124c088353e0e7':
  Fix NPE in PackageManagerService.
This commit is contained in:
narayan
2014-05-21 20:17:52 +00:00
committed by Android Git Automerger

View File

@ -5689,6 +5689,7 @@ public class PackageManagerService extends IPackageManager.Stub {
}
ps.cpuAbiString = adjustedAbi;
if (ps.pkg != null && ps.pkg.applicationInfo != null) {
ps.pkg.applicationInfo.cpuAbi = adjustedAbi;
Slog.i(TAG, "Adjusting ABI for : " + ps.name + " to " + adjustedAbi);
@ -5702,6 +5703,7 @@ public class PackageManagerService extends IPackageManager.Stub {
}
}
}
}
return true;
}