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

Commit dc0a5403 authored by xinhe's avatar xinhe Committed by Android (Google) Code Review
Browse files

Merge "CMAS opt-out setting does not work when switching from Secondary user... 

Merge "CMAS opt-out setting does not work when switching from Secondary user to Device owner" into lmp-mr1-dev
parents 5a9c232c feca8c83

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

+3 −2
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.app.AppOpsManager; 
import android.content.Context;

import android.content.Intent;

import android.os.Message;

import android.os.UserHandle;

import android.provider.Telephony;

import android.telephony.SubscriptionManager;

import android.telephony.SmsCbMessage;
@@ -91,7 +92,7 @@ public class CellBroadcastHandler extends WakeLockStateMachine { 
        }

        intent.putExtra("message", message);

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

        mContext.sendOrderedBroadcast(intent, receiverPermission, appOp, mReceiver,

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

        mContext.sendOrderedBroadcastAsUser(intent, UserHandle.ALL, receiverPermission, appOp,

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

    }

}