Merge "Touch, wake and unlock" into mnc-dev (c1244a29) · Commits · e / os / android_frameworks_base

Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -285,7 +285,7 @@ LOCAL_SRC_FILES += \
		core/java/com/android/internal/appwidget/IAppWidgetHost.aidl \
		core/java/com/android/internal/backup/IBackupTransport.aidl \
		core/java/com/android/internal/backup/IObbBackupService.aidl \
		core/java/com/android/internal/policy/IKeyguardShowCallback.aidl \
		core/java/com/android/internal/policy/IKeyguardDrawnCallback.aidl \
		core/java/com/android/internal/policy/IKeyguardExitCallback.aidl \
		core/java/com/android/internal/policy/IKeyguardService.aidl \
		core/java/com/android/internal/policy/IKeyguardStateCallback.aidl \

+14 −2

Original line number	Diff line number	Diff line
		@@ -321,6 +321,14 @@ public class FingerprintManager {
		* Called when a fingerprint is valid but not recognized.
		*/
		public void onAuthenticationFailed() { }

		/**
		* Called when a fingerprint image has been acquired, but wasn't processed yet.
		*
		* @param acquireInfo one of FINGERPRINT_ACQUIRED_* constants
		* @hide
		*/
		public void onAuthenticationAcquired(int acquireInfo) {}
		};

		/**
		@@ -737,9 +745,13 @@ public class FingerprintManager {
		}

		private void sendAcquiredResult(long deviceId, int acquireInfo) {
		if (mAuthenticationCallback != null) {
		mAuthenticationCallback.onAuthenticationAcquired(acquireInfo);
		}
		final String msg = getAcquiredString(acquireInfo);
		if (msg == null) return;

		if (msg == null) {
		return;
		}
		if (mEnrollmentCallback != null) {
		mEnrollmentCallback.onEnrollmentHelp(acquireInfo, msg);
		} else if (mAuthenticationCallback != null) {

+2 −2

Original line number	Diff line number	Diff line
		@@ -15,6 +15,6 @@
		*/
		package com.android.internal.policy;

		oneway interface IKeyguardShowCallback {
		void onShown(IBinder windowToken);
		oneway interface IKeyguardDrawnCallback {
		void onDrawn();
		}

+8 −2

Original line number	Diff line number	Diff line
		@@ -15,7 +15,7 @@
		*/
		package com.android.internal.policy;

		import com.android.internal.policy.IKeyguardShowCallback;
		import com.android.internal.policy.IKeyguardDrawnCallback;
		import com.android.internal.policy.IKeyguardStateCallback;
		import com.android.internal.policy.IKeyguardExitCallback;

		@@ -57,7 +57,13 @@ oneway interface IKeyguardService {
		/**
		* Called when the device has started waking up.
		*/
		void onStartedWakingUp(IKeyguardShowCallback callback);
		void onStartedWakingUp();

		/**
		* Called when the device screen is turning on.
		*/
		void onScreenTurningOn(IKeyguardDrawnCallback callback);

		void setKeyguardEnabled(boolean enabled);
		void onSystemReady();
		void doKeyguardTimeout(in Bundle options);

+1 −0

Original line number	Diff line number	Diff line
		@@ -27,4 +27,5 @@ public class KeyguardConstants {
		*/
		public static final boolean DEBUG = false;
		public static final boolean DEBUG_SIM_STATES = false;
		public static final boolean DEBUG_FP_WAKELOCK = true;
		}