From 9fdceaea784d7599ca167b7b6236e8a4e2fbfd2a Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Wed, 10 Mar 2021 21:45:19 +0000 Subject: [PATCH] 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 | 6 + .../EmergencyActionContentProvider.java | 112 ++++++++++++++++++ ...GestureEntrypointPreferenceController.java | 4 +- ...ureEntrypointPreferenceControllerTest.java | 5 +- 4 files changed, 123 insertions(+), 4 deletions(-) create mode 100644 src/com/android/settings/emergency/EmergencyActionContentProvider.java diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 6ac1ac9d1b1..7cc6155b42a 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -2902,6 +2902,12 @@ android:grantUriPermissions="true" android:exported="false"/> + +