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

Merge "Don't adjust ABI if PackageSetting#pkg is null."

Browse Source
This commit is contained in:
Narayan Kamath
2014-05-01 13:56:58 +00:00
committed by Gerrit Code Review
parent 27f2bfc406 f465db9f1d
commit 1cec7f8539
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/java/com/android/server/pm/PackageManagerService.java
View File

@@ -5373,12 +5373,13 @@ public class PackageManagerService extends IPackageManager.Stub {
for (PackageSetting ps : packagesForUser) {
if (ps.requiredCpuAbiString == null) {
ps.requiredCpuAbiString = requirer.requiredCpuAbiString;
ps.pkg.applicationInfo.requiredCpuAbi = requirer.requiredCpuAbiString;
Slog.i(TAG, "Adjusting ABI for : " + ps.pkg.packageName + " to " + ps.requiredCpuAbiString);
if (doDexOpt) {
performDexOptLI(ps.pkg, forceDexOpt, deferDexOpt, true);
mInstaller.rmdex(ps.codePathString, getPreferredInstructionSet());
if (ps.pkg != null) {
ps.pkg.applicationInfo.requiredCpuAbi = requirer.requiredCpuAbiString;
Slog.i(TAG, "Adjusting ABI for : " + ps.name + " to " + ps.requiredCpuAbiString);
if (doDexOpt) {
performDexOptLI(ps.pkg, forceDexOpt, deferDexOpt, true);
mInstaller.rmdex(ps.codePathString, getPreferredInstructionSet());
}
}
}
}