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

Merge "incidentd: Moving fingerprint.proto to server directory."

Browse Source
This commit is contained in:
TreeHugger Robot
2017-10-26 23:30:06 +00:00
committed by Android (Google) Code Review
parent 68533018e7 fd257d6090
commit 11df5436ed
3 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,24 +20,24 @@ option java_outer_classname = "IncidentProtoMetadata";
import "frameworks/base/libs/incident/proto/android/privacy.proto";
import "frameworks/base/libs/incident/proto/android/section.proto";
import "frameworks/base/core/proto/android/providers/settings.proto";
import "frameworks/base/core/proto/android/os/incidentheader.proto";
import "frameworks/base/core/proto/android/os/kernelwake.proto";
import "frameworks/base/core/proto/android/os/pagetypeinfo.proto";
import "frameworks/base/core/proto/android/os/procrank.proto";
import "frameworks/base/core/proto/android/server/activitymanagerservice.proto";
import "frameworks/base/core/proto/android/server/alarmmanagerservice.proto";
import "frameworks/base/core/proto/android/server/fingerprint.proto";
import "frameworks/base/core/proto/android/server/powermanagerservice.proto";
import "frameworks/base/core/proto/android/service/appwidget.proto";
import "frameworks/base/core/proto/android/service/battery.proto";
import "frameworks/base/core/proto/android/service/batterystats.proto";
import "frameworks/base/core/proto/android/service/fingerprint.proto";
import "frameworks/base/core/proto/android/service/diskstats.proto";
import "frameworks/base/core/proto/android/service/netstats.proto";
import "frameworks/base/core/proto/android/service/notification.proto";
import "frameworks/base/core/proto/android/service/package.proto";
import "frameworks/base/core/proto/android/service/print.proto";
import "frameworks/base/core/proto/android/service/procstats.proto";
import "frameworks/base/core/proto/android/server/activitymanagerservice.proto";
import "frameworks/base/core/proto/android/server/alarmmanagerservice.proto";
import "frameworks/base/core/proto/android/providers/settings.proto";
import "frameworks/base/core/proto/android/os/incidentheader.proto";
import "frameworks/base/core/proto/android/os/kernelwake.proto";
import "frameworks/base/core/proto/android/os/pagetypeinfo.proto";
import "frameworks/base/core/proto/android/os/procrank.proto";
package android.os;
@@ -69,7 +69,7 @@ message IncidentProto {
// System Services
optional android.service.fingerprint.FingerprintServiceDumpProto fingerprint = 3000 [
optional com.android.server.fingerprint.FingerprintServiceDumpProto fingerprint = 3000 [
(section).type = SECTION_DUMPSYS,
(section).args = "fingerprint --proto --incident"
];

11
core/proto/android/service/fingerprint.proto → core/proto/android/server/fingerprint.proto
View File

@@ -15,7 +15,7 @@
*/
syntax = "proto2";
package android.service.fingerprint;
package com.android.server.fingerprint;
option java_multiple_files = true;
option java_outer_classname = "FingerprintServiceProto";
@@ -33,14 +33,15 @@ message FingerprintUserStatsProto {
optional int32 num_fingerprints = 2;
// Normal fingerprint authentications (e.g. lockscreen).
optional FingerprintActionStatsProto normal = 3;
optional PerformanceStatsProto normal = 3;
// Crypto authentications (e.g. to unlock password storage, make secure
// purchases, etc).
optional FingerprintActionStatsProto crypto = 4;
optional PerformanceStatsProto crypto = 4;
}
message FingerprintActionStatsProto {
// A com.android.server.fingerprint.FingerpintService.PerformanceStats object.
message PerformanceStatsProto {
// Number of accepted fingerprints.
optional int32 accept = 1;
@@ -55,5 +56,5 @@ message FingerprintActionStatsProto {
optional int32 lockout = 4;
// Total number of permanent lockouts.
optional int32 lockout_permanent = 5;
optional int32 permanent_lockout = 5;
}

23
services/core/java/com/android/server/fingerprint/FingerprintService.java
View File

@@ -59,9 +59,6 @@ import android.os.SystemClock;
import android.os.UserHandle;
import android.os.UserManager;
import android.security.KeyStore;
import android.service.fingerprint.FingerprintActionStatsProto;
import android.service.fingerprint.FingerprintServiceDumpProto;
import android.service.fingerprint.FingerprintUserStatsProto;
import android.util.Slog;
import android.util.SparseBooleanArray;
import android.util.SparseIntArray;
@@ -1374,11 +1371,11 @@ public class FingerprintService extends SystemService implements IHwBinder.Death
final PerformanceStats normal = mPerformanceMap.get(userId);
if (normal != null) {
final long countsToken = proto.start(FingerprintUserStatsProto.NORMAL);
proto.write(FingerprintActionStatsProto.ACCEPT, normal.accept);
proto.write(FingerprintActionStatsProto.REJECT, normal.reject);
proto.write(FingerprintActionStatsProto.ACQUIRE, normal.acquire);
proto.write(FingerprintActionStatsProto.LOCKOUT, normal.lockout);
proto.write(FingerprintActionStatsProto.LOCKOUT_PERMANENT, normal.permanentLockout);
proto.write(PerformanceStatsProto.ACCEPT, normal.accept);
proto.write(PerformanceStatsProto.REJECT, normal.reject);
proto.write(PerformanceStatsProto.ACQUIRE, normal.acquire);
proto.write(PerformanceStatsProto.LOCKOUT, normal.lockout);
proto.write(PerformanceStatsProto.PERMANENT_LOCKOUT, normal.permanentLockout);
proto.end(countsToken);
}
@@ -1387,11 +1384,11 @@ public class FingerprintService extends SystemService implements IHwBinder.Death
final PerformanceStats crypto = mCryptoPerformanceMap.get(userId);
if (crypto != null) {
final long countsToken = proto.start(FingerprintUserStatsProto.CRYPTO);
proto.write(FingerprintActionStatsProto.ACCEPT, crypto.accept);
proto.write(FingerprintActionStatsProto.REJECT, crypto.reject);
proto.write(FingerprintActionStatsProto.ACQUIRE, crypto.acquire);
proto.write(FingerprintActionStatsProto.LOCKOUT, crypto.lockout);
proto.write(FingerprintActionStatsProto.LOCKOUT_PERMANENT, crypto.permanentLockout);
proto.write(PerformanceStatsProto.ACCEPT, crypto.accept);
proto.write(PerformanceStatsProto.REJECT, crypto.reject);
proto.write(PerformanceStatsProto.ACQUIRE, crypto.acquire);
proto.write(PerformanceStatsProto.LOCKOUT, crypto.lockout);
proto.write(PerformanceStatsProto.PERMANENT_LOCKOUT, crypto.permanentLockout);
proto.end(countsToken);
}