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

Commit 932f590a authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

Fix issue #21626564: MMS should be receivied while Dozing 

Uses new APIs to put apps on the whitelist as needed.

Change-Id: I24bf0c00f2a7dca64590e7fc0dd6ec036e9bd2bf
parent 3b748493

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

+9 −8
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import static android.telephony.TelephonyManager.PHONE_TYPE_CDMA; 
import android.app.Activity;

import android.app.ActivityManagerNative;

import android.app.AppOpsManager;

import android.app.BroadcastOptions;

import android.app.PendingIntent;

import android.app.PendingIntent.CanceledException;

import android.content.BroadcastReceiver;
@@ -42,6 +43,7 @@ import android.net.Uri; 
import android.os.AsyncResult;

import android.os.Binder;

import android.os.Build;

import android.os.Bundle;

import android.os.Message;

import android.os.PowerManager;

import android.os.RemoteException;
@@ -814,7 +816,7 @@ public abstract class InboundSmsHandler extends StateMachine { 
     * @param user user to deliver the intent to

     */

    protected void dispatchIntent(Intent intent, String permission, int appOp,

            BroadcastReceiver resultReceiver, UserHandle user) {

            Bundle opts, BroadcastReceiver resultReceiver, UserHandle user) {

        intent.addFlags(Intent.FLAG_RECEIVER_NO_ABORT);

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

        if (user.equals(UserHandle.ALL)) {
@@ -843,14 +845,13 @@ public abstract class InboundSmsHandler extends StateMachine { 
                    }

                }

                // Only pass in the resultReceiver when the USER_OWNER is processed.

                mContext.sendOrderedBroadcastAsUser(intent, targetUser, permission, appOp,

                mContext.sendOrderedBroadcastAsUser(intent, targetUser, permission, appOp, opts,

                        users[i] == UserHandle.USER_OWNER ? resultReceiver : null,

                        getHandler(), Activity.RESULT_OK, null, null);

            }

        } else {

            mContext.sendOrderedBroadcastAsUser(intent, user, permission, appOp,

                    resultReceiver,

                    getHandler(), Activity.RESULT_OK, null, null);

            mContext.sendOrderedBroadcastAsUser(intent, user, permission, appOp, opts,

                    resultReceiver, getHandler(), Activity.RESULT_OK, null, null);

        }

    }
@@ -911,7 +912,7 @@ public abstract class InboundSmsHandler extends StateMachine { 
        }



        dispatchIntent(intent, android.Manifest.permission.RECEIVE_SMS,

                AppOpsManager.OP_RECEIVE_SMS, resultReceiver, UserHandle.OWNER);

                AppOpsManager.OP_RECEIVE_SMS, null, resultReceiver, UserHandle.OWNER);

    }



    /**
@@ -1041,7 +1042,7 @@ public abstract class InboundSmsHandler extends StateMachine { 
                intent.setComponent(null);

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

                dispatchIntent(intent, android.Manifest.permission.RECEIVE_SMS,

                        AppOpsManager.OP_RECEIVE_SMS, this, UserHandle.ALL);

                        AppOpsManager.OP_RECEIVE_SMS, null, this, UserHandle.ALL);

            } else if (action.equals(Intents.WAP_PUSH_DELIVER_ACTION)) {

                // Now dispatch the notification only intent

                intent.setAction(Intents.WAP_PUSH_RECEIVED_ACTION);
@@ -1049,7 +1050,7 @@ public abstract class InboundSmsHandler extends StateMachine { 
                // Only the primary user will receive notification of incoming mms.

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

                dispatchIntent(intent, android.Manifest.permission.RECEIVE_SMS,

                        AppOpsManager.OP_RECEIVE_SMS, this, UserHandle.OWNER);

                        AppOpsManager.OP_RECEIVE_SMS, null, this, UserHandle.OWNER);

            } else {

                // Now that the intents have been deleted we can clean up the PDU data.

                if (!Intents.DATA_SMS_RECEIVED_ACTION.equals(action)

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

+24 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import static com.google.android.mms.pdu.PduHeaders.MESSAGE_TYPE_NOTIFICATION_IN 
import static com.google.android.mms.pdu.PduHeaders.MESSAGE_TYPE_READ_ORIG_IND;

import android.app.Activity;

import android.app.AppOpsManager;

import android.app.BroadcastOptions;

import android.content.BroadcastReceiver;

import android.content.ComponentName;

import android.content.ContentValues;
@@ -34,7 +35,9 @@ import android.database.sqlite.SqliteWrapper; 
import android.net.Uri;

import android.os.Bundle;

import android.os.IBinder;

import android.os.IDeviceIdleController;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.UserHandle;

import android.provider.Telephony;

import android.provider.Telephony.Sms.Intents;
@@ -60,9 +63,12 @@ import com.google.android.mms.pdu.ReadOrigInd; 
 */

public class WapPushOverSms implements ServiceConnection {

    private static final String TAG = "WAP PUSH";

    private static final boolean DBG = true;

    private static final boolean DBG = false;



    private final Context mContext;

    IDeviceIdleController mDeviceIdleController;



    private String mWapPushManagerPackage;



    /** Assigned from ServiceConnection callback on main threaad. */

    private volatile IWapPushManager mWapPushManager;
@@ -81,12 +87,15 @@ public class WapPushOverSms implements ServiceConnection { 


    public WapPushOverSms(Context context) {

        mContext = context;

        mDeviceIdleController = IDeviceIdleController.Stub.asInterface(

                ServiceManager.getService(Context.DEVICE_IDLE_CONTROLLER));

        Intent intent = new Intent(IWapPushManager.class.getName());

        ComponentName comp = intent.resolveSystemService(context.getPackageManager(), 0);

        intent.setComponent(comp);

        if (comp == null || !context.bindService(intent, this, Context.BIND_AUTO_CREATE)) {

            Rlog.e(TAG, "bindService() for wappush manager failed");

        } else {

            mWapPushManagerPackage = comp.getPackageName();

            if (DBG) Rlog.v(TAG, "bindService() for wappush manager succeeded");

        }

    }
@@ -230,6 +239,9 @@ public class WapPushOverSms implements ServiceConnection { 
                    if (wapPushMan == null) {

                        if (DBG) Rlog.w(TAG, "wap push manager not found!");

                    } else {

                        mDeviceIdleController.addPowerSaveTempWhitelistAppForMms(

                                mWapPushManagerPackage, 0, "mms-mgr");



                        Intent intent = new Intent();

                        intent.putExtra("transactionId", transactionId);

                        intent.putExtra("pduType", pduType);
@@ -283,14 +295,24 @@ public class WapPushOverSms implements ServiceConnection { 
            // Direct the intent to only the default MMS app. If we can't find a default MMS app

            // then sent it to all broadcast receivers.

            ComponentName componentName = SmsApplication.getDefaultMmsApplication(mContext, true);

            Bundle options = null;

            if (componentName != null) {

                // Deliver MMS message only to this receiver

                intent.setComponent(componentName);

                if (DBG) Rlog.v(TAG, "Delivering MMS to: " + componentName.getPackageName() +

                        " " + componentName.getClassName());

                long duration = 0;

                try {

                    duration = mDeviceIdleController.addPowerSaveTempWhitelistAppForMms(

                            componentName.getPackageName(), 0, "mms-app");

                    BroadcastOptions bopts = BroadcastOptions.makeBasic();

                    bopts.setTemporaryAppWhitelistDuration(duration);

                    options = bopts.toBundle();

                } catch (RemoteException e) {

                }

            }



            handler.dispatchIntent(intent, permission, appOp, receiver, UserHandle.OWNER);

            handler.dispatchIntent(intent, permission, appOp, options, receiver, UserHandle.OWNER);

            return Activity.RESULT_OK;

        } catch (ArrayIndexOutOfBoundsException aie) {

            // 0-byte WAP PDU or other unexpected WAP PDU contents can easily throw this;