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

Commit 946fe8e0 authored by Junda Liu's avatar Junda Liu Committed by Android (Google) Code Review
Browse files

Merge "Handle both null and empty string for package name in carrier rule." into nyc-dev

parents ab8dde0e d53a74c7

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