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

Commit c042373b 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: a7c041ab 

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



Change-Id: I0c86aeed96128fbd1be6078a4aad071e81dd3944
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5e8283b6 a7c041ab

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

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

                addServiceToMap(mAppBindArgs, Context.POWER_SERVICE);

                addServiceToMap(mAppBindArgs, "mount");

                addServiceToMap(mAppBindArgs, "mount");

                addServiceToMap(mAppBindArgs, Context.PLATFORM_COMPAT_SERVICE);

                addServiceToMap(mAppBindArgs, Context.PLATFORM_COMPAT_SERVICE);

                addServiceToMap(mAppBindArgs, "permissionmgr");

                addServiceToMap(mAppBindArgs, Context.APP_OPS_SERVICE);

                addServiceToMap(mAppBindArgs, Context.USER_SERVICE);

            }

            }

            // See b/79378449

            // See b/79378449

            // Getting the window service and package service binder from servicemanager

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

            // TODO: remove exception

            addServiceToMap(mAppBindArgs, "package");

            addServiceToMap(mAppBindArgs, "package");

            addServiceToMap(mAppBindArgs, Context.WINDOW_SERVICE);

            addServiceToMap(mAppBindArgs, Context.WINDOW_SERVICE);

            addServiceToMap(mAppBindArgs, Context.USER_SERVICE);

            addServiceToMap(mAppBindArgs, "permissionmgr");

            addServiceToMap(mAppBindArgs, Context.APP_OPS_SERVICE);

        }

        }

        return mAppBindArgs;

        return mAppBindArgs;

    }

    }