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

Commit 24beeb82 authored by Parth Sane's avatar Parth Sane
Browse files

Keeping window service and permissions service in cache 

removing these break v2/android-virtual-infra/test_mapping/presubmit-avd

Flag: android.server.remove_java_service_manager_cache
Bug: 375649213
Change-Id: I73e28e21a4dad5f691fa5a782396810bd4a2c943
parent 33e0bcb0

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

+3 −3
Original line number Diff line number Diff line
@@ -2896,9 +2896,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
@@ -2906,6 +2903,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;

    }