Merge "Removing very verbose face auth logs from KeyguardUpdateMonitor" into udc-dev am: db1b28df98
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23103370 Change-Id: I8baedb98972a569aa02879bc28d6163791971299 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -1235,7 +1235,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
|
|||||||
*/
|
*/
|
||||||
private void handleFaceAcquired(int acquireInfo) {
|
private void handleFaceAcquired(int acquireInfo) {
|
||||||
Assert.isMainThread();
|
Assert.isMainThread();
|
||||||
mLogger.logFaceAcquired(acquireInfo);
|
|
||||||
for (int i = 0; i < mCallbacks.size(); i++) {
|
for (int i = 0; i < mCallbacks.size(); i++) {
|
||||||
KeyguardUpdateMonitorCallback cb = mCallbacks.get(i).get();
|
KeyguardUpdateMonitorCallback cb = mCallbacks.get(i).get();
|
||||||
if (cb != null) {
|
if (cb != null) {
|
||||||
@@ -1288,7 +1287,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
Assert.isMainThread();
|
Assert.isMainThread();
|
||||||
mLogger.logFaceAuthHelpMsg(msgId, helpString);
|
|
||||||
for (int i = 0; i < mCallbacks.size(); i++) {
|
for (int i = 0; i < mCallbacks.size(); i++) {
|
||||||
KeyguardUpdateMonitorCallback cb = mCallbacks.get(i).get();
|
KeyguardUpdateMonitorCallback cb = mCallbacks.get(i).get();
|
||||||
if (cb != null) {
|
if (cb != null) {
|
||||||
|
|||||||
@@ -95,10 +95,6 @@ constructor(@KeyguardUpdateMonitorLog private val logBuffer: LogBuffer) {
|
|||||||
logBuffer.log(TAG, ERROR, {}, { logMsg }, exception = ex)
|
logBuffer.log(TAG, ERROR, {}, { logMsg }, exception = ex)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun logFaceAcquired(acquireInfo: Int) {
|
|
||||||
logBuffer.log(TAG, DEBUG, { int1 = acquireInfo }, { "Face acquired acquireInfo=$int1" })
|
|
||||||
}
|
|
||||||
|
|
||||||
fun logFaceAuthDisabledForUser(userId: Int) {
|
fun logFaceAuthDisabledForUser(userId: Int) {
|
||||||
logBuffer.log(
|
logBuffer.log(
|
||||||
TAG,
|
TAG,
|
||||||
@@ -128,18 +124,6 @@ constructor(@KeyguardUpdateMonitorLog private val logBuffer: LogBuffer) {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun logFaceAuthHelpMsg(msgId: Int, helpMsg: String?) {
|
|
||||||
logBuffer.log(
|
|
||||||
TAG,
|
|
||||||
DEBUG,
|
|
||||||
{
|
|
||||||
int1 = msgId
|
|
||||||
str1 = helpMsg
|
|
||||||
},
|
|
||||||
{ "Face help received, msgId: $int1 msg: $str1" }
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun logFaceAuthRequested(reason: String?) {
|
fun logFaceAuthRequested(reason: String?) {
|
||||||
logBuffer.log(TAG, DEBUG, { str1 = reason }, { "requestFaceAuth() reason=$str1" })
|
logBuffer.log(TAG, DEBUG, { str1 = reason }, { "requestFaceAuth() reason=$str1" })
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user