drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fail if we're unable to agree on an ISA for shared UIDs."

Browse Source
This commit is contained in:
Narayan Kamath
2014-05-19 13:26:44 +00:00
committed by Gerrit Code Review
parent 0a5236a7cd 20ee78ab95
commit a4fd1baac6
1 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1603,7 +1603,10 @@ public class PackageManagerService extends IPackageManager.Stub {
updateAllSharedLibrariesLPw(); updateAllSharedLibrariesLPw();
for (SharedUserSetting setting : mSettings.getAllSharedUsersLPw()) { for (SharedUserSetting setting : mSettings.getAllSharedUsersLPw()) {
adjustCpuAbisForSharedUserLPw(setting.packages, true /* do dexopt */, // NOTE: We ignore potential failures here during a system scan (like
// the rest of the commands above) because there's precious little we
// can do about it. A settings error is reported, though.
adjustCpuAbisForSharedUserLPw(setting.packages, null,
false /* force dexopt */, false /* defer dexopt */); false /* force dexopt */, false /* defer dexopt */);
} }
@ -5251,8 +5254,12 @@ public class PackageManagerService extends IPackageManager.Stub {
if ((scanMode&SCAN_BOOTING) == 0 && pkgSetting.sharedUser != null) { if ((scanMode&SCAN_BOOTING) == 0 && pkgSetting.sharedUser != null) {
// We don't do this here during boot because we can do it all // We don't do this here during boot because we can do it all
// at once after scanning all existing packages. // at once after scanning all existing packages.
adjustCpuAbisForSharedUserLPw(pkgSetting.sharedUser.packages, if (!adjustCpuAbisForSharedUserLPw(pkgSetting.sharedUser.packages,
true, forceDex, (scanMode & SCAN_DEFER_DEX) != 0); pkg.applicationInfo.cpuAbi,
forceDex, (scanMode & SCAN_DEFER_DEX) != 0)) {
mLastScanError = PackageManager.INSTALL_FAILED_CPU_ABI_INCOMPATIBLE;
return null;
}
} }
// We don't expect installation to fail beyond this point, // We don't expect installation to fail beyond this point,
if ((scanMode&SCAN_MONITOR) != 0) { if ((scanMode&SCAN_MONITOR) != 0) {
@ -5597,9 +5604,8 @@ public class PackageManagerService extends IPackageManager.Stub {
return pkg; return pkg;
} }
public void adjustCpuAbisForSharedUserLPw(Set<PackageSetting> packagesForUser, private boolean adjustCpuAbisForSharedUserLPw(Set<PackageSetting> packagesForUser,
boolean doDexOpt, boolean forceDexOpt, boolean deferDexOpt) { String requiredInstructionSet, boolean forceDexOpt, boolean deferDexOpt) {
String requiredInstructionSet = null;
PackageSetting requirer = null; PackageSetting requirer = null;
for (PackageSetting ps : packagesForUser) { for (PackageSetting ps : packagesForUser) {
if (ps.cpuAbiString != null) { if (ps.cpuAbiString != null) {
@ -5607,20 +5613,16 @@ public class PackageManagerService extends IPackageManager.Stub {
if (requiredInstructionSet != null) { if (requiredInstructionSet != null) {
if (!instructionSet.equals(requiredInstructionSet)) { if (!instructionSet.equals(requiredInstructionSet)) {
// We have a mismatch between instruction sets (say arm vs arm64). // We have a mismatch between instruction sets (say arm vs arm64).
// // bail out.
// TODO: We should rescan all the packages in a shared UID to check if String errorMessage = "Instruction set mismatch, "
// they do contain shared libs for other ABIs in addition to the ones we've + ((requirer == null) ? "[caller]" : requirer.pkg)
// already extracted. For example, the package might contain both arm64-v8a + " requires " + requiredInstructionSet + " whereas " + ps.pkg
// and armeabi-v7a shared libs, and we'd have chosen arm64-v8a on 64 bit
// devices.
String errorMessage = "Instruction set mismatch, " + requirer.pkg.packageName
+ " requires " + requiredInstructionSet + " whereas " + ps.pkg.packageName
+ " requires " + instructionSet; + " requires " + instructionSet;
Slog.e(TAG, errorMessage); Slog.e(TAG, errorMessage);
reportSettingsProblem(Log.WARN, errorMessage); reportSettingsProblem(Log.WARN, errorMessage);
// Give up, don't bother making any other changes to the package settings. // Give up, don't bother making any other changes to the package settings.
return; return false;
} }
} else { } else {
requiredInstructionSet = instructionSet; requiredInstructionSet = instructionSet;
@ -5636,14 +5638,20 @@ public class PackageManagerService extends IPackageManager.Stub {
if (ps.pkg != null) { if (ps.pkg != null) {
ps.pkg.applicationInfo.cpuAbi = requirer.cpuAbiString; ps.pkg.applicationInfo.cpuAbi = requirer.cpuAbiString;
Slog.i(TAG, "Adjusting ABI for : " + ps.name + " to " + ps.cpuAbiString); Slog.i(TAG, "Adjusting ABI for : " + ps.name + " to " + ps.cpuAbiString);
if (doDexOpt) {
performDexOptLI(ps.pkg, forceDexOpt, deferDexOpt, true); if (performDexOptLI(ps.pkg, forceDexOpt, deferDexOpt, true) == DEX_OPT_FAILED) {
ps.cpuAbiString = null;
ps.pkg.applicationInfo.cpuAbi = null;
return false;
} else {
mInstaller.rmdex(ps.codePathString, getPreferredInstructionSet()); mInstaller.rmdex(ps.codePathString, getPreferredInstructionSet());
} }
} }
} }
} }
} }
return true;
} }
private void setUpCustomResolverActivity(PackageParser.Package pkg) { private void setUpCustomResolverActivity(PackageParser.Package pkg) {