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

Commit c6ff7776 authored by Jay Sullivan's avatar Jay Sullivan Committed by Android (Google) Code Review
Browse files

Merge "[ECM] Rename getPkgName to getPackageName" into main

parents aaec57c2 22364c01

core/api/module-lib-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ package android.content.pm { 


  @FlaggedApi("android.permission.flags.enhanced_confirmation_mode_apis_enabled") public class SignedPackage {

    method @NonNull public byte[] getCertificateDigest();

    method @NonNull public String getPkgName();

    method @NonNull public String getPackageName();

  }



}

core/java/android/content/pm/SignedPackage.java

+7 −7
Original line number Diff line number Diff line
@@ -35,9 +35,9 @@ public class SignedPackage { 
    private final SignedPackageParcel mData;



    /** @hide */

    public SignedPackage(@NonNull String pkgName, @NonNull byte[] certificateDigest) {

    public SignedPackage(@NonNull String packageName, @NonNull byte[] certificateDigest) {

        SignedPackageParcel data = new SignedPackageParcel();

        data.pkgName = pkgName;

        data.packageName = packageName;

        data.certificateDigest = certificateDigest;

        mData = data;

    }
@@ -52,8 +52,8 @@ public class SignedPackage { 
        return mData;

    }



    public @NonNull String getPkgName() {

        return mData.pkgName;

    public @NonNull String getPackageName() {

        return mData.packageName;

    }



    public @NonNull byte[] getCertificateDigest() {
@@ -64,12 +64,12 @@ public class SignedPackage { 
    public boolean equals(Object o) {

        if (this == o) return true;

        if (!(o instanceof SignedPackage that)) return false;

        return mData.pkgName.equals(that.mData.pkgName) && Arrays.equals(mData.certificateDigest,

                that.mData.certificateDigest);

        return mData.packageName.equals(that.mData.packageName) && Arrays.equals(

                mData.certificateDigest, that.mData.certificateDigest);

    }



    @Override

    public int hashCode() {

        return Objects.hash(mData.pkgName, Arrays.hashCode(mData.certificateDigest));

        return Objects.hash(mData.packageName, Arrays.hashCode(mData.certificateDigest));

    }

}

core/java/android/content/pm/SignedPackageParcel.aidl

+1 −1
Original line number Diff line number Diff line
@@ -20,6 +20,6 @@ import android.content.ComponentName; 


/** @hide */

parcelable SignedPackageParcel {

    String pkgName;

    String packageName;

    byte[] certificateDigest;

}

services/tests/servicestests/src/com/android/server/systemconfig/SystemConfigTest.java

+4 −4
Original line number Diff line number Diff line
@@ -662,7 +662,7 @@ public class SystemConfigTest { 
            android.permission.flags.Flags.FLAG_ENHANCED_CONFIRMATION_MODE_APIS_ENABLED)

    public void getEnhancedConfirmationTrustedInstallers_returnsTrustedInstallers()

            throws IOException {

        String pkgName = "com.example.app";

        String packageName = "com.example.app";

        String certificateDigestStr = "E9:7A:BC:2C:D1:CA:8D:58:6A:57:0B:8C:F8:60:AA:D2:"

                + "8D:13:30:2A:FB:C9:00:2C:5D:53:B2:6C:09:A4:85:A0";
@@ -670,7 +670,7 @@ public class SystemConfigTest { 
                .toByteArray();

        String contents = "<config>"

                + "<" + "enhanced-confirmation-trusted-installer" + " "

                + "package=\"" + pkgName + "\""

                + "package=\"" + packageName + "\""

                + " sha256-cert-digest=\"" + certificateDigestStr + "\""

                + "/>"

                + "</config>";
@@ -684,10 +684,10 @@ public class SystemConfigTest { 


        assertThat(actualTrustedInstallers.size()).isEqualTo(1);

        SignedPackage actual = actualTrustedInstallers.stream().findFirst().orElseThrow();

        SignedPackage expected = new SignedPackage(pkgName, certificateDigest);

        SignedPackage expected = new SignedPackage(packageName, certificateDigest);



        assertThat(actual.getCertificateDigest()).isEqualTo(expected.getCertificateDigest());

        assertThat(actual.getPkgName()).isEqualTo(expected.getPkgName());

        assertThat(actual.getPackageName()).isEqualTo(expected.getPackageName());

        assertThat(actual).isEqualTo(expected);

    }