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

Commit ea5d1c49 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Remove FLAG_RECEIVER_INCLUDE_BACKGROUND from code to whitelist" am: beb168af 

Change-Id: I3b2532d14c47f7648d76f4ae6d1181fa181a04e5
parents 3c0370b1 beb168af

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

+0 −22
Original line number Diff line number Diff line
@@ -714,9 +714,6 @@ public abstract class InboundSmsHandler extends StateMachine { 
            // broadcast SMS_REJECTED_ACTION intent

            Intent intent = new Intent(Intents.SMS_REJECTED_ACTION);

            intent.putExtra("result", result);

            // Allow registered broadcast receivers to get this intent even

            // when they are in the background.

            intent.addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);

            mContext.sendBroadcast(intent, android.Manifest.permission.RECEIVE_SMS);

        }

        acknowledgeLastIncomingSms(success, result, response);
@@ -1131,18 +1128,6 @@ public abstract class InboundSmsHandler extends StateMachine { 
            Bundle opts, BroadcastReceiver resultReceiver, UserHandle user, int subId) {

        intent.addFlags(Intent.FLAG_RECEIVER_NO_ABORT);

        final String action = intent.getAction();

        if (Intents.SMS_DELIVER_ACTION.equals(action)

                || Intents.SMS_RECEIVED_ACTION.equals(action)

                || Intents.WAP_PUSH_DELIVER_ACTION.equals(action)

                || Intents.WAP_PUSH_RECEIVED_ACTION.equals(action)) {

            // Some intents need to be delivered with high priority:

            // SMS_DELIVER, SMS_RECEIVED, WAP_PUSH_DELIVER, WAP_PUSH_RECEIVED

            // In some situations, like after boot up or system under load, normal

            // intent delivery could take a long time.

            // This flag should only be set for intents for visible, timely operations

            // which is true for the intents above.

            intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);

        }

        SubscriptionManager.putPhoneIdAndSubIdExtra(intent, mPhone.getPhoneId());



        // override the subId value in the intent with the values from tracker as they can be
@@ -1290,9 +1275,6 @@ public abstract class InboundSmsHandler extends StateMachine { 
            Uri uri = Uri.parse("sms://localhost:" + destPort);

            intent.setData(uri);

            intent.setComponent(null);

            // Allow registered broadcast receivers to get this intent even

            // when they are in the background.

            intent.addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);

        }



        Bundle options = handleSmsWhitelisting(intent.getComponent(), isClass0);
@@ -1478,7 +1460,6 @@ public abstract class InboundSmsHandler extends StateMachine { 
                intent.setAction(Intents.SMS_RECEIVED_ACTION);

                // Allow registered broadcast receivers to get this intent even

                // when they are in the background.

                intent.addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);

                intent.setComponent(null);

                // All running users will be notified of the received sms.

                Bundle options = handleSmsWhitelisting(null, false /* bgActivityStartAllowed */);
@@ -1490,9 +1471,6 @@ public abstract class InboundSmsHandler extends StateMachine { 
                // Now dispatch the notification only intent

                intent.setAction(Intents.WAP_PUSH_RECEIVED_ACTION);

                intent.setComponent(null);

                // Allow registered broadcast receivers to get this intent even

                // when they are in the background.

                intent.addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);

                // Only the primary user will receive notification of incoming mms.

                // That app will do the actual downloading of the mms.

                Bundle options = null;

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

+4 −8
Original line number Diff line number Diff line
@@ -2208,8 +2208,7 @@ public class SubscriptionController extends ISub.Stub { 
        // Broadcast an Intent for default sms sub change

        if (DBG) logdl("[broadcastDefaultSmsSubIdChanged] subId=" + subId);

        Intent intent = new Intent(SubscriptionManager.ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED);

        intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING

                | Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);

        intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING);

        SubscriptionManager.putSubscriptionIdExtra(intent, subId);

        mContext.sendStickyBroadcastAsUser(intent, UserHandle.ALL);

    }
@@ -2269,8 +2268,7 @@ public class SubscriptionController extends ISub.Stub { 
        // Broadcast an Intent for default voice sub change

        if (DBG) logdl("[broadcastDefaultVoiceSubIdChanged] subId=" + subId);

        Intent intent = new Intent(TelephonyIntents.ACTION_DEFAULT_VOICE_SUBSCRIPTION_CHANGED);

        intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING

                | Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);

        intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING);

        SubscriptionManager.putSubscriptionIdExtra(intent, subId);

        mContext.sendStickyBroadcastAsUser(intent, UserHandle.ALL);

    }
@@ -2369,8 +2367,7 @@ public class SubscriptionController extends ISub.Stub { 
        // Broadcast an Intent for default data sub change

        if (DBG) logdl("[broadcastDefaultDataSubIdChanged] subId=" + subId);

        Intent intent = new Intent(TelephonyIntents.ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED);

        intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING

                | Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);

        intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING);

        SubscriptionManager.putSubscriptionIdExtra(intent, subId);

        mContext.sendStickyBroadcastAsUser(intent, UserHandle.ALL);

    }
@@ -2418,8 +2415,7 @@ public class SubscriptionController extends ISub.Stub { 
        // Broadcast an Intent for default sub change

        int phoneId = SubscriptionManager.getPhoneId(subId);

        Intent intent = new Intent(SubscriptionManager.ACTION_DEFAULT_SUBSCRIPTION_CHANGED);

        intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING

                | Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);

        intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING);

        SubscriptionManager.putPhoneIdAndSubIdExtra(intent, phoneId, subId);

        if (DBG) {

            logdl("[sendDefaultChangedBroadcast] broadcast default subId changed phoneId="

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

+0 −2
Original line number Diff line number Diff line
@@ -1120,7 +1120,6 @@ public class SubscriptionInfoUpdater extends Handler { 
            sSimCardState[phoneId] = state;

            Intent i = new Intent(TelephonyManager.ACTION_SIM_CARD_STATE_CHANGED);

            i.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT);

            i.addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);

            i.putExtra(TelephonyManager.EXTRA_SIM_STATE, state);

            SubscriptionManager.putPhoneIdAndSubIdExtra(i, phoneId);

            // TODO(b/130664115) we manually populate this intent with the slotId. In the future we
@@ -1147,7 +1146,6 @@ public class SubscriptionInfoUpdater extends Handler { 
        if (state != sSimApplicationState[phoneId] && (!isUnknownToNotReady || emptyProfile)) {

            sSimApplicationState[phoneId] = state;

            Intent i = new Intent(TelephonyManager.ACTION_SIM_APPLICATION_STATE_CHANGED);

            i.addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);

            i.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT);

            i.putExtra(TelephonyManager.EXTRA_SIM_STATE, state);

            SubscriptionManager.putPhoneIdAndSubIdExtra(i, phoneId);

src/java/com/android/internal/telephony/uicc/UiccController.java

+0 −1
Original line number Diff line number Diff line
@@ -1011,7 +1011,6 @@ public class UiccController extends Handler { 
        options.setBackgroundActivityStartsAllowed(true);

        Intent intent = new Intent(TelephonyManager.ACTION_SIM_SLOT_STATUS_CHANGED);

        intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT);

        intent.addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);

        mContext.sendBroadcast(intent, android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE,

                options.toBundle());

    }