commit a04449b88a0b0d19783a92c40b1510c017f7fae1
author Meng Wang <mewan@google.com> Thu Aug 03 14:34:35 2017 -0700
committer Meng Wang <mewan@google.com> Thu Aug 03 22:47:53 2017 +0000
tree ec0fae21fd0ad7dbddeb0e2b8cfe4fcae387088e
parent 975d9a18f15c2e0a4141d8f2d4f9870569f5bd87

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

diff --git a/src/com/android/settings/RadioInfo.java b/src/com/android/settings/RadioInfo.java
index e0ddbcc..776e3b2 100644
--- a/src/com/android/settings/RadioInfo.java
+++ b/src/com/android/settings/RadioInfo.java
@@ -1371,25 +1371,21 @@
 
     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);
         }
     };