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

Commit 26224ee1 authored by Jackal Guo's avatar Jackal Guo
Browse files

Add flag MATCH_ANY_USER to query the package uid. 

The target package may not be always installed on the user 0. Since
getPacakgeUid would check the package installed state now, we should
use the flag MATCH_ANY_USER to query the package uid across user.

Bug: 186180067
Fix: 189728752
Test: atest -p services/core/java/com/android/server/am
Test: atest -p services/core/java/com/android/server/wm
Change-Id: Iab7c31beb38a4a4a4252cbfa016dc1096f1e1d37
parent 1a7e40fa

services/core/java/com/android/server/am/ActivityManagerService.java

+4 −10
Original line number Diff line number Diff line
@@ -4116,11 +4116,8 @@ public class ActivityManagerService extends IActivityManager.Stub 
            return;

        }

        if (appId < 0) {

            try {

                appId = UserHandle.getAppId(AppGlobals.getPackageManager()

                        .getPackageUid(packageName, MATCH_DEBUG_TRIAGED_MISSING, 0));

            } catch (RemoteException e) {

            }

            appId = UserHandle.getAppId(getPackageManagerInternal().getPackageUid(packageName,

                    MATCH_DEBUG_TRIAGED_MISSING | MATCH_ANY_USER, UserHandle.USER_SYSTEM));

        }















        mProcessList.killAppZygotesLocked(packageName, appId, userId, true /* force */);









@@ -4137,11 +4134,8 @@ public class ActivityManagerService extends IActivityManager.Stub













        }





























        if (appId < 0 && packageName != null) {













            try {













                appId = UserHandle.getAppId(AppGlobals.getPackageManager()













                        .getPackageUid(packageName, MATCH_DEBUG_TRIAGED_MISSING, 0));













            } catch (RemoteException e) {













            }













            appId = UserHandle.getAppId(getPackageManagerInternal().getPackageUid(packageName,













                    MATCH_DEBUG_TRIAGED_MISSING | MATCH_ANY_USER, UserHandle.USER_SYSTEM));















        }





























        boolean didSomething;