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

Commit e615f013 authored by Michael Groover's avatar Michael Groover
Browse files

Add exported flag to CallsManager and TtyManager receivers 

This commit adds the exported flag for the receivers registered
for BLOCK_SUPPRESSION_STATE_CHANGED in CallsManager and
TTY_PREFERRED_MODE_CHANGED in TtyManager.
BLOCK_SUPPRESSION_STATE_CHANGED is sent by the BlockedNumberProvider,
so this action cannot be a protected-broadcast.

Bug: 161145287
Test: atest com.android.server.telecom.tests
Change-Id: I620e88eb17cb8183247f1ea7a1ba78063f6dfe00
parent 24ad325b

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

+1 −1
Original line number Diff line number Diff line
@@ -594,7 +594,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
@@ -51,7 +51,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
@@ -295,12 +295,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) {