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

Commit 806d730e authored by Michael Groover's avatar Michael Groover Committed by Automerger Merge Worker
Browse files

Merge "Add exported flag to CallsManager and TtyManager receivers" am:... 

Merge "Add exported flag to CallsManager and TtyManager receivers" am: 9ece7b2a am: c2317a82 am: 741b62e6

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telecomm/+/1868057

Change-Id: Ie37c1ed36a6fd9e5d92dbe37a98621a7e87795a5
parents f03e86dd 741b62e6

src/com/android/server/telecom/CallsManager.java

+1 −1
Original line number Diff line number Diff line
@@ -596,7 +596,7 @@ public class CallsManager extends Call.ListenerBase 
        IntentFilter intentFilter = new IntentFilter(

                CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED);

        intentFilter.addAction(SystemContract.ACTION_BLOCK_SUPPRESSION_STATE_CHANGED);

        context.registerReceiver(mReceiver, intentFilter);

        context.registerReceiver(mReceiver, intentFilter, Context.RECEIVER_EXPORTED);

        mGraphHandlerThreads = new LinkedList<>();

    }

src/com/android/server/telecom/TtyManager.java

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ final class TtyManager implements WiredHeadsetManager.Listener { 
                TelecomManager.ACTION_TTY_PREFERRED_MODE_CHANGED);

        mContext.registerReceiver(mReceiver, intentFilter,

                android.Manifest.permission.MODIFY_PHONE_STATE,

                null);

                null, Context.RECEIVER_EXPORTED);



        updateCurrentTtyMode();

    }

tests/src/com/android/server/telecom/tests/ComponentContextFixture.java

+11 −0
Original line number Diff line number Diff line
@@ -326,12 +326,23 @@ public class ComponentContextFixture implements TestFixture<Context> { 
            return null;

        }



        @Override

        public Intent registerReceiver(BroadcastReceiver receiver, IntentFilter filter, int flags) {

            return null;

        }



        @Override

        public Intent registerReceiver(BroadcastReceiver receiver, IntentFilter filter,

                String broadcastPermission, Handler scheduler) {

            return null;

        }



        @Override

        public Intent registerReceiver(BroadcastReceiver receiver, IntentFilter filter,

                String broadcastPermission, Handler scheduler, int flags) {

            return null;

        }



        @Override

        public Intent registerReceiverAsUser(BroadcastReceiver receiver, UserHandle handle,

                IntentFilter filter, String broadcastPermission, Handler scheduler) {