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

Commit fc961b2d authored by Ivan Chiang's avatar Ivan Chiang
Browse files

[PM] Use List to instead of Set for keeping order of abis 

We should preserve the order of ro.product.cpu.abilist* because it's ordered by priority.

Test: atest PackageManagerMultiArchAppTest
Bug: 282783453
Bug: 325405513
Change-Id: Ic6ba4583218ab6dbe02aa081b2c774244158a07b
parent 3488035f

services/core/java/com/android/server/pm/PackageAbiHelperImpl.java

+3 −2
Original line number Diff line number Diff line
@@ -53,7 +53,8 @@ import libcore.io.IoUtils; 


import java.io.File;

import java.io.IOException;

import java.util.Set;

import java.util.ArrayList;

import java.util.List;



final class PackageAbiHelperImpl implements PackageAbiHelper {
@@ -314,7 +315,7 @@ final class PackageAbiHelperImpl implements PackageAbiHelper { 


    @NonNull

    private static String[] getNativelySupportedAbis(@NonNull String[] supportedAbis) {

        Set<String> nativelySupportedAbis = new ArraySet<>();

        List<String> nativelySupportedAbis = new ArrayList<>();

        for (int i = 0; i < supportedAbis.length; i++) {

            final String currentAbi = supportedAbis[i];

            // In presence of a native bridge this means the Abi is emulated.