Merge the android-9.0.0_r60 release tag
Android 9.0.0 release 60
* tag 'android-9.0.0_r60':
Restrict access to the resolution PendingIntent created by EuiccController to EuiccResolutionUiDispatcherActivity
Specify the component for the ACTION_SHOW_ECM_EXIT_DIALOG Intent
Change-Id: Ibfd83b9773426d5a388b75323abea8c9ebcce544
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f92c305..33cd319 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -443,6 +443,9 @@
Handler for EuiccManager's resolution intents. These are locked down so that only
privileged processes can start them, which means we can trust the Intent used to start
it (which contains a description of the next step to perform after resolution).
+
+ If modified, also change EuiccController#RESOLUTION_ACTIVITY_PACKAGE_NAME and
+ EuiccController#RESOLUTION_ACTIVITY_CLASS_NAME
-->
<activity android:name=".euicc.EuiccResolutionUiDispatcherActivity"
android:permission="android.permission.CALL_PRIVILEGED">
diff --git a/src/com/android/phone/EmergencyCallbackModeService.java b/src/com/android/phone/EmergencyCallbackModeService.java
index a07f7aa..86f8fe6 100644
--- a/src/com/android/phone/EmergencyCallbackModeService.java
+++ b/src/com/android/phone/EmergencyCallbackModeService.java
@@ -189,8 +189,10 @@
// PendingIntent to launch Emergency Callback Mode Exit activity if the user selects
// this notification
- PendingIntent contentIntent = PendingIntent.getActivity(this, 0,
- new Intent(EmergencyCallbackModeExitDialog.ACTION_SHOW_ECM_EXIT_DIALOG), 0);
+ Intent intent = new Intent(this, EmergencyCallbackModeExitDialog.class);
+ intent.setAction(EmergencyCallbackModeExitDialog.ACTION_SHOW_ECM_EXIT_DIALOG);
+ PendingIntent contentIntent = PendingIntent.getActivity(this, 0, intent,
+ PendingIntent.FLAG_IMMUTABLE);
builder.setContentIntent(contentIntent);
// Format notification string