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

This commit is contained in:
TreeHugger Robot
2017-08-04 02:31:41 +00:00
committed by Android (Google) Code Review

View File

@@ -1371,25 +1371,21 @@ public class RadioInfo extends Activity {
OnClickListener mCarrierProvisioningButtonHandler = new OnClickListener() { OnClickListener mCarrierProvisioningButtonHandler = new OnClickListener() {
public void onClick(View v) { public void onClick(View v) {
final Intent intent = new Intent(); final Intent intent = new Intent("com.android.settings.CARRIER_PROVISIONING");
final ComponentName serviceComponent = new ComponentName("com.android.omadm.service", final ComponentName serviceComponent = ComponentName.unflattenFromString(
"DMIntentReceiver"); "com.android.omadm.service/.DMIntentReceiver");
intent.setComponent(serviceComponent); intent.setComponent(serviceComponent);
intent.setAction("com.android.settings.CARRIER_PROVISIONING"); sendBroadcast(intent);
getApplicationContext().sendBroadcast(
intent, android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE);
} }
}; };
OnClickListener mTriggerCarrierProvisioningButtonHandler = new OnClickListener() { OnClickListener mTriggerCarrierProvisioningButtonHandler = new OnClickListener() {
public void onClick(View v) { public void onClick(View v) {
final Intent intent = new Intent(); final Intent intent = new Intent("com.android.settings.TRIGGER_CARRIER_PROVISIONING");
final ComponentName serviceComponent = new ComponentName("com.android.omadm.service", final ComponentName serviceComponent = ComponentName.unflattenFromString(
"DMIntentReceiver"); "com.android.omadm.service/.DMIntentReceiver");
intent.setComponent(serviceComponent); intent.setComponent(serviceComponent);
intent.setAction("com.android.settings.TRIGGER_CARRIER_PROVISIONING"); sendBroadcast(intent);
getApplicationContext().sendBroadcast(
intent, android.Manifest.permission.MODIFY_PHONE_STATE);
} }
}; };