commit 9fdceaea784d7599ca167b7b6236e8a4e2fbfd2a
author Fan Zhang <zhfan@google.com> Wed Mar 10 21:45:19 2021 +0000
committer Fan Zhang <zhfan@google.com> Thu Mar 11 20:30:55 2021 +0000
tree c96768be218adde8ce340592a2bd7024a497e231
parent bf182903ed4eb0518d247ae7d7f84caca286974d

Fallback to AOSP eSOS settings page if OEM impl fails

When OEM eSOS implementation fails for any reason (app disabled,
misconfigured, etc), Emergency SOS settings should fallack to the
default settings page (rather than hiding the setting entirely)

Bug: 180959553
Test: robotests
Change-Id: I31c08449eff3f01d4c33bf827023f17beade93c2

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6ac1ac9..7cc6155 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2902,6 +2902,12 @@
             android:grantUriPermissions="true"
             android:exported="false"/>
 
+        <provider
+            android:name=".emergency.EmergencyActionContentProvider"
+            android:authorities="com.android.settings.emergency"
+            android:permission="android.permission.CALL_PRIVILEGED"
+            android:exported="true"/>
+
         <activity
             android:name=".wifi.RequestToggleWiFiActivity"
             android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.Alert"