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

Update settings together with frameworks/base

Browse Source 
Bug: 169459906
Test: Builds

Exempt-From-Owner-Approval: Name change

Change-Id: I453d743fe29c33776a784942863dcba19c67c26a
This commit is contained in:
Kevin Chyn
2020-09-28 10:02:13 -07:00
parent 8d63b98272
commit 587bd62dff
5 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/robotests/src/com/android/settings/testutils/shadow/ShadowFingerprintManager.java
View File

@@ -18,20 +18,19 @@ package com.android.settings.testutils.shadow;
import android.hardware.fingerprint.Fingerprint;
import android.hardware.fingerprint.FingerprintManager;
import android.hardware.fingerprint.FingerprintSensorProperties;
import android.hardware.fingerprint.FingerprintSensorPropertiesInternal;
import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements;
import java.util.ArrayList;
import java.util.List;
@Implements(FingerprintManager.class)
public class ShadowFingerprintManager extends org.robolectric.shadows.ShadowFingerprintManager {
private static List<FingerprintSensorProperties> sFingerprintSensorProperties;
private static List<FingerprintSensorPropertiesInternal> sFingerprintSensorProperties;
public static void setSensorProperties(List<FingerprintSensorProperties> props) {
public static void setSensorProperties(List<FingerprintSensorPropertiesInternal> props) {
sFingerprintSensorProperties = props;
}
@@ -41,7 +40,7 @@ public class ShadowFingerprintManager extends org.robolectric.shadows.ShadowFing
}
@Implementation
protected List<FingerprintSensorProperties> getSensorProperties() {
protected List<FingerprintSensorPropertiesInternal> getSensorPropertiesInternal() {
return sFingerprintSensorProperties;
}
}