PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fallback to AOSP eSOS settings page if OEM impl fails" into sc-dev am: 9086ed36a8

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13828690

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3636c58d85d3df9945418203333f62ec20ced928
This commit is contained in:
TreeHugger Robot
2021-03-11 23:14:48 +00:00
committed by Automerger Merge Worker
parent 73fd0ea929 9086ed36a8
commit 1f657a95ae
4 changed files with 123 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/robotests/src/com/android/settings/emergency/EmergencyGestureEntrypointPreferenceControllerTest.java
View File

@@ -105,7 +105,7 @@ public class EmergencyGestureEntrypointPreferenceControllerTest {
}
@Test
public void getAvailabilityStatus_noSuitableIntent_shouldReturnUnsupported() {
public void getAvailabilityStatus_noSuitableIntent_shouldReturnAvailable() {
SettingsShadowResources.overrideResource(
R.bool.config_show_emergency_gesture_settings,
Boolean.TRUE);
@@ -117,7 +117,8 @@ public class EmergencyGestureEntrypointPreferenceControllerTest {
EmergencyGestureEntrypointPreferenceController controller =
new EmergencyGestureEntrypointPreferenceController(mContext, PREF_KEY);
assertThat(controller.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
assertThat(controller.getAvailabilityStatus()).isEqualTo(AVAILABLE);
assertThat(controller.mIntent).isNull();
}
private void prepareCustomIntent() {