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

Merge "Add config value for fingerprint gesture support" into pi-dev

Browse Source
This commit is contained in:
Phil Weaver
2018-04-25 17:35:28 +00:00
committed by Android (Google) Code Review
parent 0e90cf29c7 466b71e1a2
commit 3f9aaad4dc
6 changed files with 61 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/accessibilityservice/AccessibilityServiceInfo.java
View File

@@ -302,7 +302,16 @@ public class AccessibilityServiceInfo implements Parcelable {
/**
* This flag requests that all fingerprint gestures be sent to the accessibility service.
* It is handled in {@link FingerprintGestureController}
* <p>
* Services that want to set this flag have to declare the capability
* to retrieve window content in their meta-data by setting the attribute
* {@link android.R.attr#canRequestFingerprintGestures} to
* true, otherwise this flag will be ignored. For how to declare the meta-data
* of a service refer to {@value AccessibilityService#SERVICE_META_DATA}.
* </p>
*
* @see android.R.styleable#AccessibilityService_canRequestFingerprintGestures
* @see AccessibilityService#getFingerprintGestureController()
*/
public static final int FLAG_REQUEST_FINGERPRINT_GESTURES = 0x00000200;

3
core/res/res/values/config.xml
View File

@@ -2853,6 +2853,9 @@
<!-- For performance and storage reasons, limit the number of fingerprints per user -->
<integer name="config_fingerprintMaxTemplatesPerUser">5</integer>
<!-- Specify if the fingerprint hardware support gestures-->
<bool name="config_fingerprintSupportsGestures">false</bool>
<!-- This config is used to force VoiceInteractionService to start on certain low ram devices.
It declares the package name of VoiceInteractionService that should be started. -->
<string translatable="false" name="config_forceVoiceInteractionServicePackage"></string>

1
core/res/res/values/symbols.xml
View File

@@ -2407,6 +2407,7 @@
<!-- Fingerprint config -->
<java-symbol type="integer" name="config_fingerprintMaxTemplatesPerUser"/>
<java-symbol type="bool" name="config_fingerprintSupportsGestures"/>
<!-- From various Material changes -->
<java-symbol type="attr" name="titleTextAppearance" />

2
services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
View File

@@ -2232,7 +2232,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
}
if (service != null) {
mFingerprintGestureDispatcher = new FingerprintGestureDispatcher(
service, mLock);
service, mContext.getResources(), mLock);
break;
}
}

19
services/accessibility/java/com/android/server/accessibility/FingerprintGestureDispatcher.java
View File

@@ -17,6 +17,7 @@
package com.android.server.accessibility;
import android.accessibilityservice.FingerprintGestureController;
import android.content.res.Resources;
import android.hardware.fingerprint.IFingerprintClientActiveCallback;
import android.hardware.fingerprint.IFingerprintService;
import android.os.Binder;
@@ -42,6 +43,7 @@ public class FingerprintGestureDispatcher extends IFingerprintClientActiveCallba
private final Object mLock;
private final IFingerprintService mFingerprintService;
private final Handler mHandler;
private final boolean mHardwareSupportsGestures;
// This field is ground truth for whether or not we are registered. Only write to it in handler.
private boolean mRegisteredReadOnlyExceptInHandler;
@@ -50,8 +52,11 @@ public class FingerprintGestureDispatcher extends IFingerprintClientActiveCallba
* @param fingerprintService The system's fingerprint service
* @param lock A lock to use when managing internal state
*/
public FingerprintGestureDispatcher(IFingerprintService fingerprintService, Object lock) {
public FingerprintGestureDispatcher(IFingerprintService fingerprintService,
Resources resources, Object lock) {
mFingerprintService = fingerprintService;
mHardwareSupportsGestures = resources.getBoolean(
com.android.internal.R.bool.config_fingerprintSupportsGestures);
mLock = lock;
mHandler = new Handler(this);
}
@@ -61,9 +66,11 @@ public class FingerprintGestureDispatcher extends IFingerprintClientActiveCallba
* @param lock A lock to use when managing internal state
* @param handler A handler to use internally. Used for testing.
*/
public FingerprintGestureDispatcher(IFingerprintService fingerprintService, Object lock,
Handler handler) {
public FingerprintGestureDispatcher(IFingerprintService fingerprintService,
Resources resources, Object lock, Handler handler) {
mFingerprintService = fingerprintService;
mHardwareSupportsGestures = resources.getBoolean(
com.android.internal.R.bool.config_fingerprintSupportsGestures);
mLock = lock;
mHandler = handler;
}
@@ -74,6 +81,8 @@ public class FingerprintGestureDispatcher extends IFingerprintClientActiveCallba
* @param clientList The list of potential clients.
*/
public void updateClientList(List<? extends FingerprintGestureClient> clientList) {
if (!mHardwareSupportsGestures) return;
synchronized (mLock) {
mCapturingClients.clear();
for (int i = 0; i < clientList.size(); i++) {
@@ -96,6 +105,8 @@ public class FingerprintGestureDispatcher extends IFingerprintClientActiveCallba
@Override
public void onClientActiveChanged(boolean nonGestureFingerprintClientActive) {
if (!mHardwareSupportsGestures) return;
synchronized (mLock) {
for (int i = 0; i < mCapturingClients.size(); i++) {
mCapturingClients.get(i).onFingerprintGestureDetectionActiveChanged(
@@ -105,6 +116,8 @@ public class FingerprintGestureDispatcher extends IFingerprintClientActiveCallba
}
public boolean isFingerprintGestureDetectionAvailable() {
if (!mHardwareSupportsGestures) return false;
long identity = Binder.clearCallingIdentity();
try {
return !mFingerprintService.isClientActive();

33
services/tests/servicestests/src/com/android/server/accessibility/FingerprintGestureDispatcherTest.java
View File

@@ -17,14 +17,17 @@
package com.android.server.accessibility;
import android.accessibilityservice.FingerprintGestureController;
import android.content.res.Resources;
import android.hardware.fingerprint.IFingerprintService;
import android.os.Handler;
import android.os.Looper;
import android.os.Message;
import android.view.KeyEvent;
import com.android.server.accessibility.FingerprintGestureDispatcher.FingerprintGestureClient;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
@@ -49,16 +52,27 @@ public class FingerprintGestureDispatcherTest {
private @Mock IFingerprintService mMockFingerprintService;
private @Mock FingerprintGestureClient mNonGestureCapturingClient;
private @Mock FingerprintGestureClient mGestureCapturingClient;
private @Mock FingerprintGestureDispatcher mFingerprintGestureDispatcher;
private @Mock Resources mMockResources;
private MessageCapturingHandler mMessageCapturingHandler;
private FingerprintGestureDispatcher mFingerprintGestureDispatcher;
@BeforeClass
public static void oneTimeInitialization() {
if (Looper.myLooper() == null) {
Looper.prepare();
}
}
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
// For most tests, we support fingerprint gestures
when(mMockResources.getBoolean(anyInt())).thenReturn(true);
mMessageCapturingHandler = new MessageCapturingHandler(
msg -> mFingerprintGestureDispatcher.handleMessage(msg));
mFingerprintGestureDispatcher = new FingerprintGestureDispatcher(mMockFingerprintService,
new Object(), mMessageCapturingHandler);
mMockResources, new Object(), mMessageCapturingHandler);
when(mNonGestureCapturingClient.isCapturingFingerprintGestures()).thenReturn(false);
when(mGestureCapturingClient.isCapturingFingerprintGestures()).thenReturn(true);
}
@@ -149,10 +163,23 @@ public class FingerprintGestureDispatcherTest {
}
@Test
public void testIsGestureDetectionActive_dependsOnFingerprintService() throws Exception {
public void testIsGestureDetectionAvailable_dependsOnFingerprintService() throws Exception {
when(mMockFingerprintService.isClientActive()).thenReturn(true);
assertFalse(mFingerprintGestureDispatcher.isFingerprintGestureDetectionAvailable());
when(mMockFingerprintService.isClientActive()).thenReturn(false);
assertTrue(mFingerprintGestureDispatcher.isFingerprintGestureDetectionAvailable());
}
@Test
public void ifGestureDectionNotSupported_neverSaysAvailable() throws Exception {
when(mMockResources.getBoolean(anyInt())).thenReturn(false);
// Need to create a new dispatcher, since it picks up the resource value in its
// constructor. This is fine since hardware config values don't change dynamically.
FingerprintGestureDispatcher fingerprintGestureDispatcher =
new FingerprintGestureDispatcher(mMockFingerprintService, mMockResources,
new Object(), mMessageCapturingHandler);
when(mMockFingerprintService.isClientActive()).thenReturn(false);
assertFalse(fingerprintGestureDispatcher.isFingerprintGestureDetectionAvailable());
}
}