Merge "Fallback to AOSP emergency info if the original intent is broken" into rvc-dev am: afbf9e60c0 am: 8f39c1380c am: bafc52f0f0 am: 5e159c017c

Change-Id: I9ce7751d0ae92ba6dc13c8204a5882364a62fb0c
This commit is contained in:
TreeHugger Robot
2020-04-16 16:55:33 +00:00
committed by Automerger Merge Worker
3 changed files with 50 additions and 16 deletions

View File

@@ -220,10 +220,21 @@
<!-- Settings intelligence interaction log intent action -->
<string name="config_settingsintelligence_log_action" translatable="false"></string>
<!-- AOSP Emergency app package name -->
<string name="config_aosp_emergency_package_name" translatable="false">
com.android.emergency
</string>
<!-- AOSP Emergency app intent action -->
<string name="config_aosp_emergency_intent_action" translatable="false">
android.settings.EDIT_EMERGENCY_INFO
</string>
<!-- Emergency app package name -->
<string name="config_emergency_package_name" translatable="false">
com.android.emergency
</string>
<!-- Emergency app intent action -->
<string name="config_emergency_intent_action" translatable="false">
android.settings.EDIT_EMERGENCY_INFO