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

Commit 73c729d1 authored by Jacob Hobbie's avatar Jacob Hobbie Committed by Android (Google) Code Review
Browse files

Merge "Updating telephony to use flags to mark dynamically registered... 

Merge "Updating telephony to use flags to mark dynamically registered receivers as exported or not exported to comply with ag/15099757. All flags are hidden behind testing/debug flags, so marking as exported. Effectively a no-op."
parents 6d06c69d 060dfa53

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);

            }

        }

    }