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

Commit 502e1404 authored by Suprabh Shukla's avatar Suprabh Shukla Committed by SteadyQuad
Browse files

DO NOT MERGE Isolated processes don't get precached system service binders 

More specifically, they get a PackageManager binder -- necessary for
Android process startup and configuration -- but none of the other
usual preloaded service binders.
(backported from commit 2c61c57a)

Bug: 30202228

Change-Id: I3810649f504cd631665ece338a83d2e54d41ad05
(cherry picked from commit 2aa7e5e8)
parent cd78af9e

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

+14 −2
Original line number Diff line number Diff line
@@ -804,6 +804,7 @@ public final class ActivityManagerService extends ActivityManagerNative 
     * For example, references to the commonly used services.

     */

    HashMap<String, IBinder> mAppBindArgs;

    HashMap<String, IBinder> mIsolatedAppBindArgs;









    /**









     * Temporary to avoid allocations.  Protected by main lock.










@@ -2317,7 +2318,17 @@ public final class ActivityManagerService extends ActivityManagerNative







     * process when the bindApplication() IPC is sent to the process. They're









     * lazily setup to make sure the services are running when they're asked for.









     */









    private HashMap<String, IBinder> getCommonServicesLocked() {









    private HashMap<String, IBinder> getCommonServicesLocked(boolean isolated) {









        // Isolated processes won't get this optimization, so that we don't









        // violate the rules about which services they have access to.









        if (isolated) {









            if (mIsolatedAppBindArgs == null) {









                mIsolatedAppBindArgs = new HashMap<String, IBinder>();









                mIsolatedAppBindArgs.put("package", ServiceManager.getService("package"));









            }









            return mIsolatedAppBindArgs;









        }

















        if (mAppBindArgs == null) {









            mAppBindArgs = new HashMap<String, IBinder>();


















@@ -5144,7 +5155,8 @@ public final class ActivityManagerService extends ActivityManagerNative







                    app.instrumentationArguments, app.instrumentationWatcher,









                    app.instrumentationUiAutomationConnection, testMode, enableOpenGlTrace,









                    isRestrictedBackupMode || !normalMode, app.persistent,









                    new Configuration(mConfiguration), app.compat, getCommonServicesLocked(),









                    new Configuration(mConfiguration), app.compat,









                    getCommonServicesLocked(app.isolated),









                    mCoreSettingsObserver.getCoreSettingsLocked());









            updateLruProcessLocked(app, false, null);









            app.lastRequestedGc = app.lastLowMemory = SystemClock.uptimeMillis();