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

Commit d53a74c7 authored by Junda Liu's avatar Junda Liu
Browse files

Handle both null and empty string for package name in carrier rule. 

If package name is null or empty, the rule should allow all packages signed by the same cert.

Bug: b/28426990
Change-Id: Iba75f0bd4f4642a95aff039d6cadbe3396d3ce51
parent 0a0852c2

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

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ public class UiccCarrierPrivilegeRules extends Handler { 


        boolean matches(byte[] certHash, String packageName) {

          return certHash != null && Arrays.equals(this.certificateHash, certHash) &&

                (this.packageName == null || this.packageName.equals(packageName));

                (TextUtils.isEmpty(this.packageName) || this.packageName.equals(packageName));

        }



        @Override