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

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

Merge "Do not remove User Manager and AppOps from Java cache" into main am: 1838dff0 

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



Change-Id: I03f84880519dd6b619dc8e1ff7ca6fd016cda70e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2dd597d3 1838dff0

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

+3 −2
Original line number Diff line number Diff line
@@ -2884,23 +2884,24 @@ public class ActivityManagerService extends IActivityManager.Stub 
                addServiceToMap(mAppBindArgs, Context.INPUT_METHOD_SERVICE);

                addServiceToMap(mAppBindArgs, Context.INPUT_SERVICE);

                addServiceToMap(mAppBindArgs, "graphicsstats");

                addServiceToMap(mAppBindArgs, Context.APP_OPS_SERVICE);

                addServiceToMap(mAppBindArgs, "content");

                addServiceToMap(mAppBindArgs, Context.JOB_SCHEDULER_SERVICE);

                addServiceToMap(mAppBindArgs, Context.NOTIFICATION_SERVICE);

                addServiceToMap(mAppBindArgs, Context.VIBRATOR_SERVICE);

                addServiceToMap(mAppBindArgs, Context.ACCOUNT_SERVICE);

                addServiceToMap(mAppBindArgs, Context.POWER_SERVICE);

                addServiceToMap(mAppBindArgs, Context.USER_SERVICE);

                addServiceToMap(mAppBindArgs, "mount");

                addServiceToMap(mAppBindArgs, Context.PLATFORM_COMPAT_SERVICE);

            }

            // See b/79378449

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

            // is blocked for Apps. However they are necessary for apps.

            // Removing User Service and App Ops Service from cache breaks boot for auto.

            // TODO: remove exception

            addServiceToMap(mAppBindArgs, Context.APP_OPS_SERVICE);

            addServiceToMap(mAppBindArgs, "package");

            addServiceToMap(mAppBindArgs, Context.WINDOW_SERVICE);

            addServiceToMap(mAppBindArgs, Context.USER_SERVICE);

        }

        return mAppBindArgs;

    }