Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Initial udfps vibration should always play" into sc-qpr1-dev am: 8b5f287dcb

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15675980

Change-Id: Ibddbc9758169d8e201083085a900e4b38c4cf62f
This commit is contained in:
Android Build Prod User
2021-08-27 03:47:55 +00:00
committed by Automerger Merge Worker
parent 699dcf2037 8b5f287dcb
commit b62fbaf42d
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java
View File

@@ -163,7 +163,8 @@ public class UdfpsController implements DozeReceiver {
public static final AudioAttributes VIBRATION_SONIFICATION_ATTRIBUTES = public static final AudioAttributes VIBRATION_SONIFICATION_ATTRIBUTES =
new AudioAttributes.Builder() new AudioAttributes.Builder()
.setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION) .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
.setUsage(AudioAttributes.USAGE_ASSISTANCE_SONIFICATION) // vibration will bypass battery saver mode:
.setUsage(AudioAttributes.USAGE_ASSISTANCE_ACCESSIBILITY)
.build(); .build();
public static final VibrationEffect EFFECT_CLICK = public static final VibrationEffect EFFECT_CLICK =

7
packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsControllerTest.java
View File

@@ -16,6 +16,8 @@
package com.android.systemui.biometrics; package com.android.systemui.biometrics;
import static android.media.AudioAttributes.USAGE_ASSISTANCE_ACCESSIBILITY;
import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertEquals;
import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.any;
@@ -563,5 +565,10 @@ public class UdfpsControllerTest extends SysuiTestCase {
eq(mUdfpsController.EFFECT_CLICK), eq(mUdfpsController.EFFECT_CLICK),
eq("udfps-onStart"), eq("udfps-onStart"),
eq(UdfpsController.VIBRATION_SONIFICATION_ATTRIBUTES)); eq(UdfpsController.VIBRATION_SONIFICATION_ATTRIBUTES));
// THEN make sure vibration attributes has so that it always will play the haptic,
// even in battery saver mode
assertEquals(USAGE_ASSISTANCE_ACCESSIBILITY,
UdfpsController.VIBRATION_SONIFICATION_ATTRIBUTES.getUsage());
} }
} }