commit 96ec0a9ade40e8d50831d99a65ca9da67696004b
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Aug 04 02:31:41 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 04 02:31:41 2017 +0000
tree 48357734d87e4f6ce7b3ff57780645800e54e07e
parent be2246bee734263970b4f6a5c393b72fccbdea2a
parent a04449b88a0b0d19783a92c40b1510c017f7fae1

Merge "RadioInfo: fix OMADM buttons" into oc-mr1-dev

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);
         }
     };