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
This commit is contained in:
TreeHugger Robot
2017-07-19 22:40:32 +00:00
committed by Android (Google) Code Review
parent 1da6af31ff 60b07cd345
commit 1a7d4c25b3
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 // determine the ABI from either ApplicationInfo or Build
String arch = "arm"; String arch = "arm";
if (cameraInfo.primaryCpuAbi != null if (cameraInfo.primaryCpuAbi != null) {
&& VMRuntime.is64BitAbi(cameraInfo.primaryCpuAbi)) { if (VMRuntime.is64BitAbi(cameraInfo.primaryCpuAbi)) {
arch = arch + "64"; arch = arch + "64";
}
} else { } else {
if (VMRuntime.is64BitAbi(Build.SUPPORTED_ABIS[0])) { if (VMRuntime.is64BitAbi(Build.SUPPORTED_ABIS[0])) {
arch = arch + "64"; arch = arch + "64";