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

Select correct oat/odex when pinning the Camera APK

Browse Source 
Make sure that if a primary ABI is set for an application that this
ABI is properly taken into account when comparing the VM runtime
bitness.

Without this change a 32-bit camera running application running on a
device where the primary ABI is 64-bit the code would assume create
a path to a non-existant 64-bit binary.

Test: Enable debug prints in pinning service and check if all parts
  of camera is pinned.
Bug: 32633857
Change-Id: Iabf7ab890628fa92b0afd3e315a2d74073afde41
This commit is contained in:
John Eckerdal
2016-11-03 14:04:47 +01:00
committed by Carmen Jackson
parent 8d10791f5b
commit 60b07cd345
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/PinnerService.java
View File

@@ -267,9 +267,10 @@ public final class PinnerService extends SystemService {
// determine the ABI from either ApplicationInfo or Build
String arch = "arm";
if (cameraInfo.primaryCpuAbi != null
&& VMRuntime.is64BitAbi(cameraInfo.primaryCpuAbi)) {
arch = arch + "64";
if (cameraInfo.primaryCpuAbi != null) {
if (VMRuntime.is64BitAbi(cameraInfo.primaryCpuAbi)) {
arch = arch + "64";
}
} else {
if (VMRuntime.is64BitAbi(Build.SUPPORTED_ABIS[0])) {
arch = arch + "64";