From d4e0fe7f93c2e33b15bf070538974427e8c432a1 Mon Sep 17 00:00:00 2001 From: Meng Wang Date: Thu, 3 Aug 2017 14:34:35 -0700 Subject: [PATCH] RadioInfo: fix OMADM buttons 1. Use activity context instead of application context to send broadcast - the activity is in phone process 2. Fix the target receiver component name 3. Remove receiver permission restrict since it's explict broadcast Bug: 37993019 Test: manual Change-Id: I8cf0772f4bb51617c2164aa530daaa4fdec117d2 --- src/com/android/settings/RadioInfo.java | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/com/android/settings/RadioInfo.java b/src/com/android/settings/RadioInfo.java index 406d293b0f8..db1f01d761b 100644 --- a/src/com/android/settings/RadioInfo.java +++ b/src/com/android/settings/RadioInfo.java @@ -1365,25 +1365,21 @@ public class RadioInfo extends Activity { OnClickListener mCarrierProvisioningButtonHandler = new OnClickListener() { public void onClick(View v) { - final Intent intent = new Intent(); - final ComponentName serviceComponent = new ComponentName("com.android.omadm.service", - "DMIntentReceiver"); + final Intent intent = new Intent("com.android.settings.CARRIER_PROVISIONING"); + final ComponentName serviceComponent = ComponentName.unflattenFromString( + "com.android.omadm.service/.DMIntentReceiver"); intent.setComponent(serviceComponent); - intent.setAction("com.android.settings.CARRIER_PROVISIONING"); - getApplicationContext().sendBroadcast( - intent, android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE); + sendBroadcast(intent); } }; OnClickListener mTriggerCarrierProvisioningButtonHandler = new OnClickListener() { public void onClick(View v) { - final Intent intent = new Intent(); - final ComponentName serviceComponent = new ComponentName("com.android.omadm.service", - "DMIntentReceiver"); + final Intent intent = new Intent("com.android.settings.TRIGGER_CARRIER_PROVISIONING"); + final ComponentName serviceComponent = ComponentName.unflattenFromString( + "com.android.omadm.service/.DMIntentReceiver"); intent.setComponent(serviceComponent); - intent.setAction("com.android.settings.TRIGGER_CARRIER_PROVISIONING"); - getApplicationContext().sendBroadcast( - intent, android.Manifest.permission.MODIFY_PHONE_STATE); + sendBroadcast(intent); } };