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

am e46a5b31: Merge "Throw a checked exception on inconsistent installs." into mnc-dev

Browse Source 
* commit 'e46a5b31d600c55be0d540214f4b3193400b0674':
  Throw a checked exception on inconsistent installs.
This commit is contained in:
Narayan Kamath
2015-05-20 16:09:55 +00:00
committed by Android Git Automerger
parent 198a2b02f0 e46a5b31d6
commit 9238fb6b0d
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -6356,12 +6356,14 @@ public class PackageManagerService extends IPackageManager.Stub {
// to scan the package again.
deriveNonSystemPackageAbi(pkg, scanFile, cpuAbiOverride, false /* extract libs */);
if (!TextUtils.equals(oldPrimaryCpuAbi, pkg.applicationInfo.primaryCpuAbi)) {
throw new IllegalStateException("unexpected abi change for " + pkg.packageName + " ("
throw new PackageManagerException(INSTALL_FAILED_INTERNAL_ERROR,
"unexpected abi change for " + pkg.packageName + " ("
+ oldPrimaryCpuAbi + "-> " + pkg.applicationInfo.primaryCpuAbi);
}
if (!TextUtils.equals(oldSecondaryCpuAbi, pkg.applicationInfo.secondaryCpuAbi)) {
throw new IllegalStateException("unexpected abi change for " + pkg.packageName + " ("
throw new PackageManagerException(INSTALL_FAILED_INTERNAL_ERROR,
"unexpected abi change for " + pkg.packageName + " ("
+ oldSecondaryCpuAbi + "-> " + pkg.applicationInfo.secondaryCpuAbi);
}
}
@@ -11661,7 +11663,7 @@ public class PackageManagerService extends IPackageManager.Stub {
true /* extract libs */);
} catch (PackageManagerException pme) {
Slog.e(TAG, "Error deriving application ABI", pme);
res.setError(INSTALL_FAILED_INTERNAL_ERROR, "Error ");
res.setError(INSTALL_FAILED_INTERNAL_ERROR, "Error deriving application ABI");
return;
}