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

Commit 387c9494 authored by Parth Sane's avatar Parth Sane Committed by Automerger Merge Worker
Browse files

Merge "Keep Cache implementation for Android Auto" into main am: c50f74d7 am: cbc04d37 

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



Change-Id: I4922121378b4f7775fd1b42ea82875e2d0fda243
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3f4654f4 cbc04d37

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

+9 −5
Original line number Diff line number Diff line
@@ -2772,8 +2772,12 @@ public class ActivityManagerService extends IActivityManager.Stub 
            // Add common services.

            // IMPORTANT: Before adding services here, make sure ephemeral apps can access them too.

            // Enable the check in ApplicationThread.bindApplication() to make sure.

            if (!android.server.Flags.removeJavaServiceManagerCache()) {

                addServiceToMap(mAppBindArgs, "permissionmgr");













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













            // Removing permissionmgr breaks tests for Android Auto due to SELinux restrictions.













            // TODO: fix SELinux restrictions and remove caching for Android Auto.













            if (mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE)













                    || !android.server.Flags.removeJavaServiceManagerCache()) {















                addServiceToMap(mAppBindArgs, Context.ALARM_SERVICE);















                addServiceToMap(mAppBindArgs, Context.DISPLAY_SERVICE);















                addServiceToMap(mAppBindArgs, Context.NETWORKMANAGEMENT_SERVICE);









@@ -2790,16 +2794,16 @@ 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















            // 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;















    }