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

Commit 0e75596b authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [4285741, 4285547, 4284105, 4284670, 4284671, 4284672] into pi-release 

Change-Id: Id1db54c94efb90a49a7443c9e5b28918f2e18cee
parents f1c3370a daed5e29

src/java/com/android/internal/telephony/uicc/UiccCarrierPrivilegeRules.java

+1 −2
Original line number Diff line number Diff line
@@ -310,8 +310,7 @@ public class UiccCarrierPrivilegeRules extends Handler { 
            // gained carrier privileges (as an indication that a matching SIM has been inserted).

            PackageInfo pInfo = packageManager.getPackageInfo(packageName,

                    PackageManager.GET_SIGNATURES

                            | PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS

                            | PackageManager.MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS);

                            | PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS);

            return getCarrierPrivilegeStatus(pInfo);

        } catch (PackageManager.NameNotFoundException ex) {

            log("Package " + packageName + " not found for carrier privilege status check");

tests/telephonytests/src/com/android/internal/telephony/CarrierAppUtilsTest.java

+162 −190

File changed.

Preview size limit exceeded, changes collapsed.