commit 4e6a25843d7ef14301eb8cb5985c84d54785fbc4
author Peter Wang <tpwang@google.com> Mon May 11 14:31:11 2020 -0700
committer Peter Wang <tpwang@google.com> Wed May 13 21:27:33 2020 +0000
tree 566db9345a3279e9d316d23c3db1291d8338db6e
parent 64fe4bce7830e6a772a02c1b9772c36d17ad1ba4

Restrict access to the resolution PendingIntent created by
EuiccController to EuiccResolutionUiDispatcherActivity

Bug: 156097472
Bug: 155094269
Fix: 156097472
Test: Local, with jpd@'s PoC app
Change-Id: Ifdf81cf9d22bf70a488cca3613bd81e18a576ae1
Merged-In: Ifdf81cf9d22bf70a488cca3613bd81e18a576ae1

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d6c5c17..7e45783 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -500,6 +500,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">