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

Merge "Migrate 2 missed-out usages of Log.* to LogBuffer" into tm-qpr-dev am: 2445176bac

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19537649

Change-Id: Id95c7851067d4db04eaef40f2fe881c1f941b148
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chandru S
2022-08-13 08:24:15 +00:00
committed by Automerger Merge Worker
parent 0bcbbcc147 2445176bac
commit 492f2bd3b7
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
View File

@@ -87,7 +87,6 @@ import android.telephony.SubscriptionManager.OnSubscriptionsChangedListener;
import android.telephony.TelephonyCallback; import android.telephony.TelephonyCallback;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log;
import android.util.SparseArray; import android.util.SparseArray;
import android.util.SparseBooleanArray; import android.util.SparseBooleanArray;
@@ -730,7 +729,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
private void handleFingerprintAuthFailed() { private void handleFingerprintAuthFailed() {
Assert.isMainThread(); Assert.isMainThread();
if (mHandler.hasCallbacks(mFpCancelNotReceived)) { if (mHandler.hasCallbacks(mFpCancelNotReceived)) {
Log.d(TAG, "handleFingerprintAuthFailed()" mLogger.d("handleFingerprintAuthFailed()"
+ " triggered while waiting for cancellation, removing watchdog"); + " triggered while waiting for cancellation, removing watchdog");
mHandler.removeCallbacks(mFpCancelNotReceived); mHandler.removeCallbacks(mFpCancelNotReceived);
} }
@@ -765,7 +764,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
private void handleFingerprintAuthenticated(int authUserId, boolean isStrongBiometric) { private void handleFingerprintAuthenticated(int authUserId, boolean isStrongBiometric) {
Trace.beginSection("KeyGuardUpdateMonitor#handlerFingerPrintAuthenticated"); Trace.beginSection("KeyGuardUpdateMonitor#handlerFingerPrintAuthenticated");
if (mHandler.hasCallbacks(mFpCancelNotReceived)) { if (mHandler.hasCallbacks(mFpCancelNotReceived)) {
Log.d(TAG, "handleFingerprintAuthenticated()" mLogger.d("handleFingerprintAuthenticated()"
+ " triggered while waiting for cancellation, removing watchdog"); + " triggered while waiting for cancellation, removing watchdog");
mHandler.removeCallbacks(mFpCancelNotReceived); mHandler.removeCallbacks(mFpCancelNotReceived);
} }
@@ -840,7 +839,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
if (msgId == FingerprintManager.FINGERPRINT_ERROR_HW_UNAVAILABLE if (msgId == FingerprintManager.FINGERPRINT_ERROR_HW_UNAVAILABLE
|| msgId == FingerprintManager.BIOMETRIC_ERROR_POWER_PRESSED) { || msgId == FingerprintManager.BIOMETRIC_ERROR_POWER_PRESSED) {
Log.d(TAG, "Fingerprint retrying auth due to(" + msgId + ") -> " + errString); mLogger.logRetryAfterFpError(msgId, errString);
mHandler.postDelayed(mRetryFingerprintAuthentication, HAL_ERROR_RETRY_TIMEOUT); mHandler.postDelayed(mRetryFingerprintAuthentication, HAL_ERROR_RETRY_TIMEOUT);
} }
@@ -3418,7 +3417,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
mHandler.sendMessage(mHandler.obtainMessage(MSG_ASSISTANT_STACK_CHANGED, mHandler.sendMessage(mHandler.obtainMessage(MSG_ASSISTANT_STACK_CHANGED,
info.visible)); info.visible));
} catch (RemoteException e) { } catch (RemoteException e) {
Log.e(TAG, "unable to check task stack", e); mLogger.logException(e, "unable to check task stack ");
} }
} }
}; };

11
packages/SystemUI/src/com/android/keyguard/logging/KeyguardUpdateMonitorLogger.kt
View File

@@ -198,6 +198,15 @@ class KeyguardUpdateMonitorLogger @Inject constructor(
{ "Retrying face after HW unavailable, attempt $int1" }) { "Retrying face after HW unavailable, attempt $int1" })
} }
fun logRetryAfterFpError(msgId: Int, errString: String?) {
logBuffer.log(TAG, DEBUG, {
int1 = msgId
str1 = "$errString"
}, {
"Fingerprint retrying auth due to($int1) -> $str1"
})
}
fun logRetryAfterFpHwUnavailable(retryCount: Int) { fun logRetryAfterFpHwUnavailable(retryCount: Int) {
logBuffer.log(TAG, WARNING, logBuffer.log(TAG, WARNING,
{ int1 = retryCount }, { int1 = retryCount },
@@ -270,12 +279,12 @@ class KeyguardUpdateMonitorLogger @Inject constructor(
{ str1 = newTimeFormat }, { str1 = newTimeFormat },
{ "handleTimeFormatUpdate timeFormat=$str1" }) { "handleTimeFormatUpdate timeFormat=$str1" })
} }
fun logUdfpsPointerDown(sensorId: Int) { fun logUdfpsPointerDown(sensorId: Int) {
logBuffer.log(TAG, DEBUG, logBuffer.log(TAG, DEBUG,
{ int1 = sensorId }, { int1 = sensorId },
{ "onUdfpsPointerDown, sensorId: $int1" }) { "onUdfpsPointerDown, sensorId: $int1" })
} }
fun logUdfpsPointerUp(sensorId: Int) { fun logUdfpsPointerUp(sensorId: Int) {
logBuffer.log(TAG, DEBUG, logBuffer.log(TAG, DEBUG,
{ int1 = sensorId }, { int1 = sensorId },