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

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

Add exported flag to exposed test runtime receivers 

Android T allows apps to declare a runtime receiver as not exported
by invoking registerReceiver with a new RECEIVER_NOT_EXPORTED flag;
receivers registered with this flag will only receive broadcasts from
the platform and the app itself. However to ensure developers can
properly protect their receivers, all apps targeting a future
platform release and registering a receiver for non-system
broadcasts must specify either the exported or not exported flag
when invoking #registerReceiver; if one of these flags is not
provided, the platform will throw a SecurityException. This commit
updates all the exposed receivers with the RECEIVER_EXPORTED flag
to maintain the existing behavior for these tests.

Bug: 234659204
Tag: #compatibility
Test: atest BassClientServiceTest
Test: atest HapClientTest
Change-Id: Ib832007a0c80755e9a50d029eca45a69b4011ea6
parent 288c4bca

android/app/tests/unit/src/com/android/bluetooth/bass_client/BassClientServiceTest.java

+1 −1
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ public class BassClientServiceTest { 
        filter.addAction(BluetoothLeBroadcastAssistant.ACTION_CONNECTION_STATE_CHANGED);



        mBassIntentReceiver = new BassIntentReceiver();

        mTargetContext.registerReceiver(mBassIntentReceiver, filter);

        mTargetContext.registerReceiver(mBassIntentReceiver, filter, Context.RECEIVER_EXPORTED);

    }



    @After

android/app/tests/unit/src/com/android/bluetooth/hap/HapClientTest.java

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ public class HapClientTest { 
        mService.mCallbacks.register(mCallback);



        mHasIntentReceiver = new HasIntentReceiver();

        mTargetContext.registerReceiver(mHasIntentReceiver, filter);

        mTargetContext.registerReceiver(mHasIntentReceiver, filter, Context.RECEIVER_EXPORTED);



        mDevice = TestUtils.getTestDevice(mAdapter, 0);

        when(mNativeInterface.getDevice(getByteAddress(mDevice))).thenReturn(mDevice);

framework/tests/stress/src/android/bluetooth/BluetoothTestUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -1534,7 +1534,7 @@ public class BluetoothTestUtils extends Assert { 
        for (String action: actions) {

            filter.addAction(action);

        }

        mContext.registerReceiver(receiver, filter);

        mContext.registerReceiver(receiver, filter, Context.RECEIVER_EXPORTED);

        mReceivers.add(receiver);

    }