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

Commit d5dca749 authored by Gavin Corkery's avatar Gavin Corkery Committed by Presubmit Automerger Backend
Browse files

[automerge] Enforce that sdk sandbox may only bind/start allowed services 2p: 65a00767 

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

Bug: 209770510
Change-Id: I408fcc4f540df5344252c5465c6249294695a40b
parents 6b817ab7 65a00767

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

+23 −0
Original line number Diff line number Diff line
@@ -2949,6 +2949,27 @@ public class ActivityManagerService extends IActivityManager.Stub 
        }

    }













    /**













     * If the caller is an {@link Process#isSdkSandboxUid(int) SDK sandbox uid}, enforces that the













     * SDK sandbox has permission to start or bind to a given service.













     *













     * @param intent the intent used to start or bind to the service.













     * @throws IllegalStateException if {@link SdkSandboxManagerLocal} cannot be resolved.













     * @throws SecurityException if the SDK sandbox is not allowed to bind to this service.













     */













    private void enforceAllowedToStartOrBindServiceIfSdkSandbox(Intent intent) {













        if (Process.isSdkSandboxUid(Binder.getCallingUid())) {













            SdkSandboxManagerLocal sdkSandboxManagerLocal =













                    LocalManagerRegistry.getManager(SdkSandboxManagerLocal.class);













            if (sdkSandboxManagerLocal != null) {













                sdkSandboxManagerLocal.enforceAllowedToStartOrBindService(intent);













            } else {













                throw new IllegalStateException("SdkSandboxManagerLocal not found when checking"













                        + " whether SDK sandbox uid may start or bind to a service.");













            }













        }













    }



























    @Override















    public void setPackageScreenCompatMode(String packageName, int mode) {















        mActivityTaskManager.setPackageScreenCompatMode(packageName, mode);










@@ -12363,6 +12384,7 @@ public class ActivityManagerService extends IActivityManager.Stub













            String callingFeatureId, int userId)















            throws TransactionTooLargeException {















        enforceNotIsolatedCaller("startService");













        enforceAllowedToStartOrBindServiceIfSdkSandbox(service);















        // Refuse possible leaked file descriptors















        if (service != null && service.hasFileDescriptors() == true) {















            throw new IllegalArgumentException("File descriptors passed in Intent");










@@ -12523,6 +12545,7 @@ public class ActivityManagerService extends IActivityManager.Stub













            String sdkSandboxClientAppPackage, String callingPackage, int userId)















            throws TransactionTooLargeException {















        enforceNotIsolatedCaller("bindService");













        enforceAllowedToStartOrBindServiceIfSdkSandbox(service);





























        // Refuse possible leaked file descriptors















        if (service != null && service.hasFileDescriptors() == true) {