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

Commit 0a7e5c99 authored by Paul Hobbs's avatar Paul Hobbs Committed by Android (Google) Code Review
Browse files

Merge "Revert "Specify temp-allowlist reasonCode."" into sc-dev

parents 1f7dc5b1 cca61143

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

+3 −13
Original line number Diff line number Diff line
@@ -16,9 +16,6 @@ 


package com.android.internal.telephony;



import static android.os.PowerWhitelistManager.REASON_EVENT_MMS;

import static android.os.PowerWhitelistManager.REASON_EVENT_SMS;

import static android.os.PowerWhitelistManager.TEMPORARY_ALLOWLIST_TYPE_FOREGROUND_SERVICE_ALLOWED;

import static android.provider.Telephony.Sms.Intents.RESULT_SMS_DATABASE_ERROR;

import static android.provider.Telephony.Sms.Intents.RESULT_SMS_DISPATCH_FAILURE;

import static android.provider.Telephony.Sms.Intents.RESULT_SMS_INVALID_URI;
@@ -1392,12 +1389,9 @@ public abstract class InboundSmsHandler extends StateMachine { 
            bundle = bopts.toBundle();

        }

        long duration = mPowerWhitelistManager.whitelistAppTemporarilyForEvent(

                pkgName, PowerWhitelistManager.EVENT_SMS, REASON_EVENT_SMS, reason);

                pkgName, PowerWhitelistManager.EVENT_SMS, reason);

        if (bopts == null) bopts = BroadcastOptions.makeBasic();

        bopts.setTemporaryAppAllowlist(duration,

                TEMPORARY_ALLOWLIST_TYPE_FOREGROUND_SERVICE_ALLOWED,

                REASON_EVENT_SMS,

                "");

        bopts.setTemporaryAppWhitelistDuration(duration);

        bundle = bopts.toBundle();



        return bundle;
@@ -1661,13 +1655,9 @@ public abstract class InboundSmsHandler extends StateMachine { 
                long duration = mPowerWhitelistManager.whitelistAppTemporarilyForEvent(

                        mContext.getPackageName(),

                        PowerWhitelistManager.EVENT_MMS,

                        REASON_EVENT_MMS,

                        "mms-broadcast");

                BroadcastOptions bopts = BroadcastOptions.makeBasic();

                bopts.setTemporaryAppAllowlist(duration,

                        TEMPORARY_ALLOWLIST_TYPE_FOREGROUND_SERVICE_ALLOWED,

                        REASON_EVENT_MMS,

                        "");

                bopts.setTemporaryAppWhitelistDuration(duration);

                Bundle options = bopts.toBundle();



                String mimeType = intent.getType();

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

+3 −11
Original line number Diff line number Diff line
@@ -16,9 +16,6 @@ 


package com.android.internal.telephony;



import static android.os.PowerWhitelistManager.REASON_EVENT_MMS;

import static android.os.PowerWhitelistManager.TEMPORARY_ALLOWLIST_TYPE_FOREGROUND_SERVICE_ALLOWED;



import static com.google.android.mms.pdu.PduHeaders.MESSAGE_TYPE_NOTIFICATION_IND;



import android.annotation.NonNull;
@@ -372,8 +369,7 @@ public class WapPushOverSms implements ServiceConnection { 
                } else {

                    synchronized (this) {

                        mPowerWhitelistManager.whitelistAppTemporarilyForEvent(

                                mWapPushManagerPackage, PowerWhitelistManager.EVENT_MMS,

                                REASON_EVENT_MMS, "mms-mgr");

                                mWapPushManagerPackage, PowerWhitelistManager.EVENT_MMS, "mms-mgr");

                    }



                    Intent intent = new Intent();
@@ -433,13 +429,9 @@ public class WapPushOverSms implements ServiceConnection { 
            if (DBG) Rlog.v(TAG, "Delivering MMS to: " + componentName.getPackageName() +

                    " " + componentName.getClassName());

            long duration = mPowerWhitelistManager.whitelistAppTemporarilyForEvent(

                    componentName.getPackageName(), PowerWhitelistManager.EVENT_MMS,

                    REASON_EVENT_MMS, "mms-app");

                    componentName.getPackageName(), PowerWhitelistManager.EVENT_MMS, "mms-app");

            BroadcastOptions bopts = BroadcastOptions.makeBasic();

            bopts.setTemporaryAppAllowlist(duration,

                    TEMPORARY_ALLOWLIST_TYPE_FOREGROUND_SERVICE_ALLOWED,

                    REASON_EVENT_MMS,

                    "");

            bopts.setTemporaryAppWhitelistDuration(duration);

            options = bopts.toBundle();

        }