Merge "Hide the fingerprint API for now. DO NOT MERGE" into lmp-preview-dev (a4b882f6) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −31

Original line number	Diff line number	Diff line
		@@ -6992,7 +6992,6 @@ package android.content {
		field public static final java.lang.String DISPLAY_SERVICE = "display";
		field public static final java.lang.String DOWNLOAD_SERVICE = "download";
		field public static final java.lang.String DROPBOX_SERVICE = "dropbox";
		field public static final java.lang.String FINGERPRINT_SERVICE = "fingerprint";
		field public static final java.lang.String HDMI_CEC_SERVICE = "hdmi_cec";
		field public static final java.lang.String HDMI_CONTROL_SERVICE = "hdmi_control";
		field public static final java.lang.String INPUT_METHOD_SERVICE = "input_method";
		@@ -26016,36 +26015,6 @@ package android.service.dreams {

		}

		package android.service.fingerprint {

		public class FingerprintManager {
		ctor public FingerprintManager(android.content.Context);
		method public void enroll(long);
		method public boolean enrolledAndEnabled();
		method public void remove(int);
		method public void startListening(android.service.fingerprint.FingerprintManagerReceiver);
		method public void stopListening();
		field public static final int FINGERPRINT_ERROR = -1; // 0xffffffff
		field public static final int FINGERPRINT_ERROR_BAD_CAPTURE = 2; // 0x2
		field public static final int FINGERPRINT_ERROR_HW_UNAVAILABLE = 1; // 0x1
		field public static final int FINGERPRINT_ERROR_NO_RECEIVER = -10; // 0xfffffff6
		field public static final int FINGERPRINT_ERROR_NO_SPACE = 4; // 0x4
		field public static final int FINGERPRINT_ERROR_TIMEOUT = 3; // 0x3
		field public static final int FINGERPRINT_SCANNED = 1; // 0x1
		field public static final int FINGERPRINT_TEMPLATE_ENROLLING = 2; // 0x2
		field public static final int FINGERPRINT_TEMPLATE_REMOVED = 4; // 0x4
		}

		public class FingerprintManagerReceiver {
		ctor public FingerprintManagerReceiver();
		method public void onEnrollResult(int, int);
		method public void onError(int);
		method public void onRemoved(int);
		method public void onScanned(int, int);
		}

		}

		package android.service.notification {

		public abstract class NotificationListenerService extends android.app.Service {

core/java/android/content/Context.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -2461,6 +2461,7 @@ public abstract class Context {
		*
		* @see #getSystemService
		* @see android.app.FingerprintManager
		* @hide
		*/
		public static final String FINGERPRINT_SERVICE = "fingerprint";

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@ import android.util.Log;

		/**
		* A class that coordinates access to the fingerprint hardware.
		* @hide
		*/

		public class FingerprintManager {

core/java/android/service/fingerprint/FingerprintManagerReceiver.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -13,6 +13,7 @@ package android.service.fingerprint;
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		* @hide
		*/

		public class FingerprintManagerReceiver {