am c98e7fa3: am 07e3cbc3: am 4cfdcf5b: Touch, wake and unlock (b4d4cc9d) · Commits · e / os / android_frameworks_base

Android.mk

+1 −1

Original line number	Original line	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/appwidget/IAppWidgetHost.aidl \
	core/java/com/android/internal/backup/IBackupTransport.aidl \		core/java/com/android/internal/backup/IBackupTransport.aidl \
	core/java/com/android/internal/backup/IObbBackupService.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/IKeyguardExitCallback.aidl \
	core/java/com/android/internal/policy/IKeyguardService.aidl \		core/java/com/android/internal/policy/IKeyguardService.aidl \
	core/java/com/android/internal/policy/IKeyguardStateCallback.aidl \		core/java/com/android/internal/policy/IKeyguardStateCallback.aidl \

+14 −2

Original line number	Original line	Diff line number	Diff line
	@@ -321,6 +321,14 @@ public class FingerprintManager {
	* Called when a fingerprint is valid but not recognized.		* Called when a fingerprint is valid but not recognized.
	*/		*/
	public void onAuthenticationFailed() { }		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) {		private void sendAcquiredResult(long deviceId, int acquireInfo) {
			if (mAuthenticationCallback != null) {
			mAuthenticationCallback.onAuthenticationAcquired(acquireInfo);
			}
	final String msg = getAcquiredString(acquireInfo);		final String msg = getAcquiredString(acquireInfo);
	if (msg == null) return;		if (msg == null) {
			return;
			}
	if (mEnrollmentCallback != null) {		if (mEnrollmentCallback != null) {
	mEnrollmentCallback.onEnrollmentHelp(acquireInfo, msg);		mEnrollmentCallback.onEnrollmentHelp(acquireInfo, msg);
	} else if (mAuthenticationCallback != null) {		} else if (mAuthenticationCallback != null) {

+2 −2

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

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

+8 −2

Original line number	Original line	Diff line number	Diff line
	@@ -15,7 +15,7 @@
	*/		*/
	package com.android.internal.policy;		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.IKeyguardStateCallback;
	import com.android.internal.policy.IKeyguardExitCallback;		import com.android.internal.policy.IKeyguardExitCallback;

	@@ -57,7 +57,13 @@ oneway interface IKeyguardService {
	/**		/**
	* Called when the device has started waking up.		* 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 setKeyguardEnabled(boolean enabled);
	void onSystemReady();		void onSystemReady();
	void doKeyguardTimeout(in Bundle options);		void doKeyguardTimeout(in Bundle options);

+1 −0

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