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

Commit 0f91c3db authored by Cheonho Park's avatar Cheonho Park Committed by android-build-merger
Browse files

Merge "Allow signing key rotation" into qt-qpr1-dev 

am: ebdbec74

Change-Id: I584efd394ab6117f8c15c44d7056c002d7638c4c
parents ce2831a0 ebdbec74

src/java/com/android/internal/telephony/euicc/EuiccController.java

+2 −1
Original line number Diff line number Diff line
@@ -1184,7 +1184,8 @@ public class EuiccController extends IEuiccController.Stub { 


        final PackageInfo info;

        try {

            info = mPackageManager.getPackageInfo(callingPackage, PackageManager.GET_SIGNATURES);

            info = mPackageManager.getPackageInfo(callingPackage,

                PackageManager.GET_SIGNING_CERTIFICATES);

        } catch (PackageManager.NameNotFoundException e) {

            Log.e(TAG, "Calling package valid but gone");

            return false;

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

+1 −1
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ public class UiccCarrierPrivilegeRules extends Handler { 
            // is disabled by default, and some other component wants to enable it when it has

            // gained carrier privileges (as an indication that a matching SIM has been inserted).

            PackageInfo pInfo = packageManager.getPackageInfo(packageName,

                    PackageManager.GET_SIGNATURES

                    PackageManager.GET_SIGNING_CERTIFICATES

                            | PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS

                            | PackageManager.MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS);

            return getCarrierPrivilegeStatus(pInfo);