Merge "Hide IFingerprintService and IFingerprintServiceReceiver" (05d38d28) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −17

Original line number	Diff line number	Diff line
		@@ -26037,7 +26037,6 @@ package android.service.dreams {
		package android.service.fingerprint {

		public class FingerprintManager {
		ctor public FingerprintManager(android.content.Context, android.service.fingerprint.IFingerprintService);
		method public void enroll(long);
		method public void enrollCancel();
		method public boolean enrolledAndEnabled();
		@@ -26078,22 +26077,6 @@ package android.service.fingerprint {
		method public static boolean removeFingerprintIdForUser(int, android.content.ContentResolver, int);
		}

		public abstract interface IFingerprintService implements android.os.IInterface {
		method public abstract void enroll(android.os.IBinder, long, int) throws android.os.RemoteException;
		method public abstract void enrollCancel(android.os.IBinder, int) throws android.os.RemoteException;
		method public abstract void remove(android.os.IBinder, int, int) throws android.os.RemoteException;
		method public abstract void startListening(android.os.IBinder, android.service.fingerprint.IFingerprintServiceReceiver, int) throws android.os.RemoteException;
		method public abstract void stopListening(android.os.IBinder, int) throws android.os.RemoteException;
		}

		public abstract interface IFingerprintServiceReceiver implements android.os.IInterface {
		method public abstract void onAcquired(int) throws android.os.RemoteException;
		method public abstract void onEnrollResult(int, int) throws android.os.RemoteException;
		method public abstract void onError(int) throws android.os.RemoteException;
		method public abstract void onProcessed(int) throws android.os.RemoteException;
		method public abstract void onRemoved(int) throws android.os.RemoteException;
		}

		}

		package android.service.notification {

core/java/android/app/ContextImpl.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -697,8 +697,8 @@ class ContextImpl extends Context {

		registerService(FINGERPRINT_SERVICE, new ServiceFetcher() {
		public Object createService(ContextImpl ctx) {
		IBinder b = ServiceManager.getService(FINGERPRINT_SERVICE);
		IFingerprintService service = IFingerprintService.Stub.asInterface(b);
		IBinder binder = ServiceManager.getService(FINGERPRINT_SERVICE);
		IFingerprintService service = IFingerprintService.Stub.asInterface(binder);
		return new FingerprintManager(ctx.getOuterContext(), service);
		}
		});

core/java/android/service/fingerprint/FingerprintManager.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -96,6 +96,9 @@ public class FingerprintManager {
		}
		};

		/**
		* @hide
		*/
		public FingerprintManager(Context context, IFingerprintService service) {
		mContext = context;
		mService = service;

services/java/com/android/server/SystemServer.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -44,7 +44,6 @@ import android.os.SystemClock;
		import android.os.SystemProperties;
		import android.os.UserHandle;
		import android.service.dreams.DreamService;
		import android.service.fingerprint.FingerprintManager;
		import android.util.DisplayMetrics;
		import android.util.EventLog;
		import android.util.Log;