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

Commit 7d0da763 authored by Sumedh Sen's avatar Sumedh Sen
Browse files

Revert "Check whether the correct callingUid has the necessary permissions" 

This reverts commit 17badbcb.

Reason for revert: Breaks resolveService for AAOS: b/370999057
Bug:370999057

Change-Id: I02a2752ff5893edae8887142e7fa2b87ee82cb17
parent 17badbcb

services/core/java/com/android/server/pm/ComputerEngine.java

+3 −3
Original line number Diff line number Diff line
@@ -2208,10 +2208,10 @@ public class ComputerEngine implements Computer { 
            return true;

        }

        boolean permissionGranted = requireFullPermission ? hasPermission(

                Manifest.permission.INTERACT_ACROSS_USERS_FULL, callingUid)

                Manifest.permission.INTERACT_ACROSS_USERS_FULL)

                : (hasPermission(

                        android.Manifest.permission.INTERACT_ACROSS_USERS_FULL, callingUid)

                        || hasPermission(Manifest.permission.INTERACT_ACROSS_USERS, callingUid));

                        android.Manifest.permission.INTERACT_ACROSS_USERS_FULL)

                        || hasPermission(Manifest.permission.INTERACT_ACROSS_USERS));

        if (!permissionGranted) {

            if (Process.isIsolatedUid(callingUid) && isKnownIsolatedComputeApp(callingUid)) {

                return checkIsolatedOwnerHasPermission(callingUid, requireFullPermission);

services/core/java/com/android/server/pm/LauncherAppsService.java

+1 −1
Original line number Diff line number Diff line
@@ -716,7 +716,7 @@ public class LauncherAppsService extends SystemService { 
                    visiblePackages.add(info.getActivityInfo().packageName);

                }

                final List<ApplicationInfo> installedPackages =

                        mPackageManagerInternal.getInstalledApplicationsCrossUser(

                        mPackageManagerInternal.getInstalledApplications(

                                /* flags= */ 0, user.getIdentifier(), callingUid);

                for (ApplicationInfo applicationInfo : installedPackages) {

                    if (!visiblePackages.contains(applicationInfo.packageName)) {

services/tests/PackageManagerComponentOverrideTests/src/com/android/server/pm/test/override/PackageManagerComponentLabelIconOverrideTest.kt

+0 −5
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ import org.junit.BeforeClass 
import org.junit.Test

import org.junit.runner.RunWith

import org.junit.runners.Parameterized

import org.mockito.ArgumentMatchers.eq

import org.mockito.Mockito.any

import org.mockito.Mockito.anyInt

import org.mockito.Mockito.doReturn
@@ -384,10 +383,6 @@ class PackageManagerComponentLabelIconOverrideTest { 
                    android.Manifest.permission.INTERACT_ACROSS_USERS_FULL)) {

                PackageManager.PERMISSION_GRANTED

            }

            whenever(this.checkPermission(

                eq(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL), anyInt(), anyInt())) {

                PackageManager.PERMISSION_GRANTED

            }

        }

        val mockSharedLibrariesImpl: SharedLibrariesImpl = mock {

            whenever(this.snapshot()) { this@mock }