Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d22d532 authored by John Eckerdal's avatar John Eckerdal Committed by android-build-merger
Browse files

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

am: 1a7d4c25

Change-Id: I230dfa9275ad5d873a0ce9e3fba201f0bbf01af2
parents 18856321 1a7d4c25

services/core/java/com/android/server/PinnerService.java

+4 −3
Original line number Diff line number Diff line
@@ -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)) {

        if (cameraInfo.primaryCpuAbi != null) {

            if (VMRuntime.is64BitAbi(cameraInfo.primaryCpuAbi)) {

                arch = arch + "64";

            }

        } else {

            if (VMRuntime.is64BitAbi(Build.SUPPORTED_ABIS[0])) {

                arch = arch + "64";