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

Commit 30047191 authored by Jackal Guo's avatar Jackal Guo Committed by Android (Google) Code Review
Browse files

Merge "Revert "Revert "Add MATCH_ANY_USER flag when get valid package uid"""

parents 4b9b3502 131d0199

services/accessibility/java/com/android/server/accessibility/AccessibilitySecurityPolicy.java

+3 −1
Original line number Diff line number Diff line
@@ -444,8 +444,10 @@ public class AccessibilitySecurityPolicy { 
    private boolean isValidPackageForUid(String packageName, int uid) {

        final long token = Binder.clearCallingIdentity();

        try {

            // Since we treat calls from a profile as if made by its parent, using

            // MATCH_ANY_USER to query the uid of the given package name.

            return uid == mPackageManager.getPackageUidAsUser(

                    packageName, UserHandle.getUserId(uid));

                    packageName, PackageManager.MATCH_ANY_USER, UserHandle.getUserId(uid));

        } catch (PackageManager.NameNotFoundException e) {

            return false;

        } finally {

services/tests/servicestests/src/com/android/server/accessibility/AccessibilitySecurityPolicyTest.java

+2 −2
Original line number Diff line number Diff line
@@ -261,8 +261,8 @@ public class AccessibilitySecurityPolicyTest { 
    @Test

    public void resolveValidReportedPackage_uidAndPkgNameMatched_returnPkgName()

            throws PackageManager.NameNotFoundException {

        when(mMockPackageManager.getPackageUidAsUser(PACKAGE_NAME, TEST_USER_ID))

                .thenReturn(APP_UID);

        when(mMockPackageManager.getPackageUidAsUser(PACKAGE_NAME,

                PackageManager.MATCH_ANY_USER, TEST_USER_ID)).thenReturn(APP_UID);



        assertEquals(mA11ySecurityPolicy.resolveValidReportedPackageLocked(

                PACKAGE_NAME, APP_UID, TEST_USER_ID, APP_PID),