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

Commit 07dbdcd4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Keeping window service and permissions service in cache" into main am:... 

Merge "Keeping window service and permissions service in cache" into main am: a7c041ab am: c042373b

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3320256



Change-Id: I4a8adc7fe2e7e42d559eb51bea1f133c6a2e5353
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9917c9c7 c042373b

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

+3 −3
Original line number Diff line number Diff line
@@ -2794,9 +2794,6 @@ public class ActivityManagerService extends IActivityManager.Stub 
                addServiceToMap(mAppBindArgs, Context.POWER_SERVICE);

                addServiceToMap(mAppBindArgs, "mount");

                addServiceToMap(mAppBindArgs, Context.PLATFORM_COMPAT_SERVICE);

                addServiceToMap(mAppBindArgs, "permissionmgr");

                addServiceToMap(mAppBindArgs, Context.APP_OPS_SERVICE);

                addServiceToMap(mAppBindArgs, Context.USER_SERVICE);

            }

            // See b/79378449

            // Getting the window service and package service binder from servicemanager
@@ -2804,6 +2801,9 @@ public class ActivityManagerService extends IActivityManager.Stub 
            // TODO: remove exception

            addServiceToMap(mAppBindArgs, "package");

            addServiceToMap(mAppBindArgs, Context.WINDOW_SERVICE);

            addServiceToMap(mAppBindArgs, Context.USER_SERVICE);

            addServiceToMap(mAppBindArgs, "permissionmgr");

            addServiceToMap(mAppBindArgs, Context.APP_OPS_SERVICE);

        }

        return mAppBindArgs;

    }