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

Merge "Select correct oat/odex when pinning the Camera APK" into oc-dr1-dev

Browse Source 
am: 1a7d4c25b3

Change-Id: I230dfa9275ad5d873a0ce9e3fba201f0bbf01af2
This commit is contained in:
John Eckerdal
2017-07-19 22:49:21 +00:00
committed by android-build-merger
parent 1885632105 1a7d4c25b3
commit 1d22d53283
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";