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

1/n: Move fingerprint-service related code to biometrics/fingerprint

Browse Source 
Bug: 109900227

Test: builds
Change-Id: I973c816d75c48ed838c1638c45d728b9df4d11ef
This commit is contained in:
Kevin Chyn
2018-06-11 11:58:15 -07:00
parent 6e735fe16e
commit 95d628ef86
14 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/proto/android/os/incident.proto
View File

@@ -182,7 +182,7 @@ message IncidentProto {
];
// System Services
optional com.android.server.fingerprint.FingerprintServiceDumpProto fingerprint = 3000 [
optional com.android.server.biometrics.fingerprint.FingerprintServiceDumpProto fingerprint = 3000 [
(section).type = SECTION_DUMPSYS,
(section).args = "fingerprint --proto --incident"
];

4
core/proto/android/server/fingerprint.proto
View File

@@ -15,7 +15,7 @@
*/
syntax = "proto2";
package com.android.server.fingerprint;
package com.android.server.biometrics.fingerprint;
import "frameworks/base/libs/incident/proto/android/privacy.proto";
@@ -46,7 +46,7 @@ message FingerprintUserStatsProto {
optional PerformanceStatsProto crypto = 4;
}
// A com.android.server.fingerprint.FingerpintService.PerformanceStats object.
// A com.android.server.biometrics.fingerprint.FingerpintService.PerformanceStats object.
message PerformanceStatsProto {
option (.android.msg_privacy).dest = DEST_AUTOMATIC;

1
core/res/AndroidManifest.xml
View File

@@ -598,6 +598,7 @@
<protected-broadcast android:name="android.app.action.AFFILIATED_PROFILE_TRANSFER_OWNERSHIP_COMPLETE" />
<protected-broadcast android:name="android.app.action.DATA_SHARING_RESTRICTION_CHANGED" />
<protected-broadcast android:name="android.app.action.STATSD_STARTED" />
<protected-broadcast android:name="com.android.server.biometrics.fingerprint.ACTION_LOCKOUT_RESET" />
<!-- For IdleController -->
<protected-broadcast android:name="android.intent.action.DOCK_IDLE" />

2
services/core/java/com/android/server/fingerprint/AuthenticationClient.java → services/core/java/com/android/server/biometrics/fingerprint/AuthenticationClient.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.server.fingerprint;
package com.android.server.biometrics.fingerprint;
import android.content.Context;
import android.hardware.biometrics.fingerprint.V2_1.IBiometricsFingerprint;

2
services/core/java/com/android/server/fingerprint/ClientMonitor.java → services/core/java/com/android/server/biometrics/fingerprint/ClientMonitor.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.server.fingerprint;
package com.android.server.biometrics.fingerprint;
import android.Manifest;
import android.content.Context;

2
services/core/java/com/android/server/fingerprint/EnrollClient.java → services/core/java/com/android/server/biometrics/fingerprint/EnrollClient.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.server.fingerprint;
package com.android.server.biometrics.fingerprint;
import android.content.Context;
import android.hardware.biometrics.fingerprint.V2_1.IBiometricsFingerprint;

2
services/core/java/com/android/server/fingerprint/EnumerateClient.java → services/core/java/com/android/server/biometrics/fingerprint/EnumerateClient.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.server.fingerprint;
package com.android.server.biometrics.fingerprint;
import android.content.Context;
import android.hardware.biometrics.fingerprint.V2_1.IBiometricsFingerprint;

4
services/core/java/com/android/server/fingerprint/FingerprintService.java → services/core/java/com/android/server/biometrics/fingerprint/FingerprintService.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.server.fingerprint;
package com.android.server.biometrics.fingerprint;
import static android.Manifest.permission.INTERACT_ACROSS_USERS;
import static android.Manifest.permission.MANAGE_FINGERPRINT;
@@ -107,7 +107,7 @@ public class FingerprintService extends SystemService implements IHwBinder.Death
private static final String FP_DATA_DIR = "fpdata";
private static final int MSG_USER_SWITCHING = 10;
private static final String ACTION_LOCKOUT_RESET =
"com.android.server.fingerprint.ACTION_LOCKOUT_RESET";
"com.android.server.biometrics.fingerprint.ACTION_LOCKOUT_RESET";
private static final String KEY_LOCKOUT_RESET_USER = "lockout_reset_user";
private class PerformanceStats {

2
services/core/java/com/android/server/fingerprint/FingerprintUtils.java → services/core/java/com/android/server/biometrics/fingerprint/FingerprintUtils.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.server.fingerprint;
package com.android.server.biometrics.fingerprint;
import android.content.Context;
import android.hardware.fingerprint.Fingerprint;

2
services/core/java/com/android/server/fingerprint/FingerprintsUserState.java → services/core/java/com/android/server/biometrics/fingerprint/FingerprintsUserState.java
View File

@@ -14,7 +14,7 @@
* limitations under the License
*/
package com.android.server.fingerprint;
package com.android.server.biometrics.fingerprint;
import android.content.Context;
import android.hardware.fingerprint.Fingerprint;

2
services/core/java/com/android/server/fingerprint/InternalEnumerateClient.java → services/core/java/com/android/server/biometrics/fingerprint/InternalEnumerateClient.java
View File

@@ -14,7 +14,7 @@
* limitations under the License
*/
package com.android.server.fingerprint;
package com.android.server.biometrics.fingerprint;
import android.content.Context;
import android.hardware.fingerprint.Fingerprint;

4
services/core/java/com/android/server/fingerprint/InternalRemovalClient.java → services/core/java/com/android/server/biometrics/fingerprint/InternalRemovalClient.java
View File

@@ -14,12 +14,12 @@
* limitations under the License
*/
package com.android.server.fingerprint;
package com.android.server.biometrics.fingerprint;
import android.content.Context;
import android.os.IBinder;
import android.hardware.fingerprint.IFingerprintServiceReceiver;
import com.android.server.fingerprint.RemovalClient;
import com.android.server.biometrics.fingerprint.RemovalClient;
public abstract class InternalRemovalClient extends RemovalClient {

3
services/core/java/com/android/server/fingerprint/RemovalClient.java → services/core/java/com/android/server/biometrics/fingerprint/RemovalClient.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.server.fingerprint;
package com.android.server.biometrics.fingerprint;
import android.content.Context;
import android.hardware.biometrics.fingerprint.V2_1.IBiometricsFingerprint;
@@ -22,7 +22,6 @@ import android.hardware.fingerprint.FingerprintManager;
import android.hardware.fingerprint.IFingerprintServiceReceiver;
import android.os.IBinder;
import android.os.RemoteException;
import android.os.UserHandle;
import android.util.Slog;
import com.android.internal.logging.MetricsLogger;

2
services/java/com/android/server/SystemServer.java
View File

@@ -75,7 +75,7 @@ import com.android.server.display.ColorDisplayService;
import com.android.server.display.DisplayManagerService;
import com.android.server.dreams.DreamManagerService;
import com.android.server.emergency.EmergencyAffordanceService;
import com.android.server.fingerprint.FingerprintService;
import com.android.server.biometrics.fingerprint.FingerprintService;
import com.android.server.hdmi.HdmiControlService;
import com.android.server.input.InputManagerService;
import com.android.server.job.JobSchedulerService;