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

Commit 006c1570 authored by Nan Wu's avatar Nan Wu Committed by Automerger Merge Worker
Browse files

RESTRICT AUTOMERGE Backport preventing BAL bypass via bound service am: 8fdf4a34 

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



Change-Id: Ie099e5870047d2e109fb0bf7caaf263774dba93c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f5b1c57b 8fdf4a34

apex/jobscheduler/service/java/com/android/server/job/JobServiceContext.java

+4 −2
Original line number Diff line number Diff line
@@ -291,11 +291,13 @@ public final class JobServiceContext implements ServiceConnection { 
                    bindFlags = Context.BIND_AUTO_CREATE | Context.BIND_NOT_FOREGROUND

                            | Context.BIND_ALMOST_PERCEPTIBLE

                            | Context.BIND_BYPASS_POWER_NETWORK_RESTRICTIONS

                            | Context.BIND_NOT_APP_COMPONENT_USAGE;

                            | Context.BIND_NOT_APP_COMPONENT_USAGE

                            | Context.BIND_DENY_ACTIVITY_STARTS;

                } else {

                    bindFlags = Context.BIND_AUTO_CREATE | Context.BIND_NOT_FOREGROUND

                            | Context.BIND_NOT_PERCEPTIBLE

                            | Context.BIND_NOT_APP_COMPONENT_USAGE;

                            | Context.BIND_NOT_APP_COMPONENT_USAGE

                            | Context.BIND_DENY_ACTIVITY_STARTS;

                }

                binding = mContext.bindServiceAsUser(intent, this, bindFlags,

                        UserHandle.of(job.getUserId()));

core/java/android/speech/tts/TextToSpeech.java

+2 −1
Original line number Diff line number Diff line
@@ -2379,7 +2379,8 @@ public class TextToSpeech { 
        boolean connect(String engine) {

            Intent intent = new Intent(Engine.INTENT_ACTION_TTS_SERVICE);

            intent.setPackage(engine);

            return mContext.bindService(intent, this, Context.BIND_AUTO_CREATE);

            return mContext.bindService(intent, this,

                    Context.BIND_AUTO_CREATE | Context.BIND_DENY_ACTIVITY_STARTS);

        }



        @Override

services/core/java/com/android/server/content/SyncManager.java

+2 −1
Original line number Diff line number Diff line
@@ -221,7 +221,8 @@ public class SyncManager { 


    /** Flags used when connecting to a sync adapter service */

    private static final int SYNC_ADAPTER_CONNECTION_FLAGS = Context.BIND_AUTO_CREATE

            | Context.BIND_NOT_FOREGROUND | Context.BIND_ALLOW_OOM_MANAGEMENT;

            | Context.BIND_NOT_FOREGROUND | Context.BIND_ALLOW_OOM_MANAGEMENT

            | Context.BIND_DENY_ACTIVITY_STARTS;



    /** Singleton instance. */

    @GuardedBy("SyncManager.class")

services/core/java/com/android/server/media/MediaRoute2ProviderServiceProxy.java

+2 −1
Original line number Diff line number Diff line
@@ -238,7 +238,8 @@ final class MediaRoute2ProviderServiceProxy extends MediaRoute2Provider 
            service.setComponent(mComponentName);

            try {

                mBound = mContext.bindServiceAsUser(service, this,

                        Context.BIND_AUTO_CREATE | Context.BIND_FOREGROUND_SERVICE,

                        Context.BIND_AUTO_CREATE | Context.BIND_FOREGROUND_SERVICE

                                | Context.BIND_DENY_ACTIVITY_STARTS,

                        new UserHandle(mUserId));

                if (!mBound && DEBUG) {

                    Slog.d(TAG, this + ": Bind failed");

services/print/java/com/android/server/print/RemotePrintService.java

+2 −1
Original line number Diff line number Diff line
@@ -572,7 +572,8 @@ final class RemotePrintService implements DeathRecipient { 


        boolean wasBound = mContext.bindServiceAsUser(mIntent, mServiceConnection,

                Context.BIND_AUTO_CREATE | Context.BIND_FOREGROUND_SERVICE

                        | Context.BIND_INCLUDE_CAPABILITIES | Context.BIND_ALLOW_INSTANT,

                        | Context.BIND_INCLUDE_CAPABILITIES | Context.BIND_ALLOW_INSTANT

                        | Context.BIND_DENY_ACTIVITY_STARTS,

                new UserHandle(mUserId));



        if (!wasBound) {