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

Commit 709831de authored by Michael Groover's avatar Michael Groover Committed by Automerger Merge Worker
Browse files

Merge "Add required flag to registerReceiver calls for test/debug receivers"... 

Merge "Add required flag to registerReceiver calls for test/debug receivers" am: 1f283ca7 am: a9d0fcd5 am: 960fff39

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1947037

Change-Id: I004e6b125d305e6558eddaa50c0918b251670a08
parents 10a530ba 960fff39

src/java/com/android/internal/telephony/TelephonyTester.java

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


            filter.addAction(ACTION_TEST_CHANGE_NUMBER);

            log("register for intent action=" + ACTION_TEST_CHANGE_NUMBER);

            phone.getContext().registerReceiver(mIntentReceiver, filter, null, mPhone.getHandler());

            phone.getContext().registerReceiver(mIntentReceiver, filter, null, mPhone.getHandler(),

                    Context.RECEIVER_EXPORTED);

        }

    }

src/java/com/android/internal/telephony/cdma/CdmaInboundSmsHandler.java

+4 −2
Original line number Diff line number Diff line
@@ -141,13 +141,15 @@ public class CdmaInboundSmsHandler extends InboundSmsHandler { 
                sTestBroadcastReceiver = new CdmaCbTestBroadcastReceiver();

                IntentFilter filter = new IntentFilter();

                filter.addAction(TEST_ACTION);

                context.registerReceiver(sTestBroadcastReceiver, filter);

                context.registerReceiver(sTestBroadcastReceiver, filter,

                        Context.RECEIVER_EXPORTED);

            }

            if (sTestScpBroadcastReceiver == null) {

                sTestScpBroadcastReceiver = new CdmaScpTestBroadcastReceiver();

                IntentFilter filter = new IntentFilter();

                filter.addAction(SCP_TEST_ACTION);

                context.registerReceiver(sTestScpBroadcastReceiver, filter);

                context.registerReceiver(sTestScpBroadcastReceiver, filter,

                        Context.RECEIVER_EXPORTED);

            }

        }

    }

src/java/com/android/internal/telephony/dataconnection/DcTesterDeactivateAll.java

+2 −1
Original line number Diff line number Diff line
@@ -78,7 +78,8 @@ public class DcTesterDeactivateAll { 
            filter.addAction(mPhone.getActionDetached());

            log("register for intent action=" + mPhone.getActionDetached());



            phone.getContext().registerReceiver(sIntentReceiver, filter, null, handler);

            phone.getContext().registerReceiver(sIntentReceiver, filter, null, handler,

                    Context.RECEIVER_EXPORTED);

        }

    }

src/java/com/android/internal/telephony/dataconnection/DcTesterFailBringUpAll.java

+2 −1
Original line number Diff line number Diff line
@@ -89,7 +89,8 @@ public class DcTesterFailBringUpAll { 
            filter.addAction(mPhone.getActionAttached());

            log("register for intent action=" + mPhone.getActionAttached());



            phone.getContext().registerReceiver(mIntentReceiver, filter, null, handler);

            phone.getContext().registerReceiver(mIntentReceiver, filter, null, handler,

                    Context.RECEIVER_EXPORTED);

        }

    }

src/java/com/android/internal/telephony/gsm/GsmInboundSmsHandler.java

+2 −1
Original line number Diff line number Diff line
@@ -67,7 +67,8 @@ public class GsmInboundSmsHandler extends InboundSmsHandler { 
                sTestBroadcastReceiver = new GsmCbTestBroadcastReceiver();

                IntentFilter filter = new IntentFilter();

                filter.addAction(TEST_ACTION);

                context.registerReceiver(sTestBroadcastReceiver, filter);

                context.registerReceiver(sTestBroadcastReceiver, filter,

                        Context.RECEIVER_EXPORTED);

            }

        }

    }