Merge "Migrate 2 missed-out usages of Log.* to LogBuffer" into tm-qpr-dev (2445176b) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java

+4 −5

Original line number	Diff line number	Diff line
		@@ -87,7 +87,6 @@ import android.telephony.SubscriptionManager.OnSubscriptionsChangedListener;
		import android.telephony.TelephonyCallback;
		import android.telephony.TelephonyManager;
		import android.text.TextUtils;
		import android.util.Log;
		import android.util.SparseArray;
		import android.util.SparseBooleanArray;

		@@ -730,7 +729,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
		private void handleFingerprintAuthFailed() {
		Assert.isMainThread();
		if (mHandler.hasCallbacks(mFpCancelNotReceived)) {
		Log.d(TAG, "handleFingerprintAuthFailed()"
		mLogger.d("handleFingerprintAuthFailed()"
		+ " triggered while waiting for cancellation, removing watchdog");
		mHandler.removeCallbacks(mFpCancelNotReceived);
		}
		@@ -765,7 +764,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
		private void handleFingerprintAuthenticated(int authUserId, boolean isStrongBiometric) {
		Trace.beginSection("KeyGuardUpdateMonitor#handlerFingerPrintAuthenticated");
		if (mHandler.hasCallbacks(mFpCancelNotReceived)) {
		Log.d(TAG, "handleFingerprintAuthenticated()"
		mLogger.d("handleFingerprintAuthenticated()"
		+ " triggered while waiting for cancellation, removing watchdog");
		mHandler.removeCallbacks(mFpCancelNotReceived);
		}
		@@ -840,7 +839,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab

		if (msgId == FingerprintManager.FINGERPRINT_ERROR_HW_UNAVAILABLE
		\|\| 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);
		}

		@@ -3418,7 +3417,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
		mHandler.sendMessage(mHandler.obtainMessage(MSG_ASSISTANT_STACK_CHANGED,
		info.visible));
		} catch (RemoteException e) {
		Log.e(TAG, "unable to check task stack", e);
		mLogger.logException(e, "unable to check task stack ");
		}
		}
		};

packages/SystemUI/src/com/android/keyguard/logging/KeyguardUpdateMonitorLogger.kt

+10 −1

Original line number	Diff line number	Diff line
		@@ -198,6 +198,15 @@ class KeyguardUpdateMonitorLogger @Inject constructor(
		{ "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) {
		logBuffer.log(TAG, WARNING,
		{ int1 = retryCount },
		@@ -270,12 +279,12 @@ class KeyguardUpdateMonitorLogger @Inject constructor(
		{ str1 = newTimeFormat },
		{ "handleTimeFormatUpdate timeFormat=$str1" })
		}

		fun logUdfpsPointerDown(sensorId: Int) {
		logBuffer.log(TAG, DEBUG,
		{ int1 = sensorId },
		{ "onUdfpsPointerDown, sensorId: $int1" })
		}

		fun logUdfpsPointerUp(sensorId: Int) {
		logBuffer.log(TAG, DEBUG,
		{ int1 = sensorId },