Merge "Add FEATURE_FINGERPRINT to PackageManager's feature list" into mnc-dev (abd35bfc) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −1

api/system-current.txt

+2 −1

core/java/android/content/pm/PackageManager.java

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1512,6 +1512,13 @@ public abstract class PackageManager {
	@SdkConstant(SdkConstantType.FEATURE)		@SdkConstant(SdkConstantType.FEATURE)
	public static final String FEATURE_FAKETOUCH_MULTITOUCH_JAZZHAND = "android.hardware.faketouch.multitouch.jazzhand";		public static final String FEATURE_FAKETOUCH_MULTITOUCH_JAZZHAND = "android.hardware.faketouch.multitouch.jazzhand";

			/**
			* Feature for {@link #getSystemAvailableFeatures} and
			* {@link #hasSystemFeature}: The device has biometric hardware to detect a fingerprint.
			*/
			@SdkConstant(SdkConstantType.FEATURE)
			public static final String FEATURE_FINGERPRINT = "android.hardware.fingerprint";

	/**		/**
	* Feature for {@link #getSystemAvailableFeatures} and		* Feature for {@link #getSystemAvailableFeatures} and
	* {@link #hasSystemFeature}: The device supports portrait orientation		* {@link #hasSystemFeature}: The device supports portrait orientation

Original line number	Original line	Diff line number	Diff line
	@@ -9314,6 +9314,7 @@ package android.content.pm {
	field public static final java.lang.String FEATURE_FAKETOUCH = "android.hardware.faketouch";		field public static final java.lang.String FEATURE_FAKETOUCH = "android.hardware.faketouch";
	field public static final java.lang.String FEATURE_FAKETOUCH_MULTITOUCH_DISTINCT = "android.hardware.faketouch.multitouch.distinct";		field public static final java.lang.String FEATURE_FAKETOUCH_MULTITOUCH_DISTINCT = "android.hardware.faketouch.multitouch.distinct";
	field public static final java.lang.String FEATURE_FAKETOUCH_MULTITOUCH_JAZZHAND = "android.hardware.faketouch.multitouch.jazzhand";		field public static final java.lang.String FEATURE_FAKETOUCH_MULTITOUCH_JAZZHAND = "android.hardware.faketouch.multitouch.jazzhand";
			field public static final java.lang.String FEATURE_FINGERPRINT = "android.hardware.fingerprint";
	field public static final java.lang.String FEATURE_GAMEPAD = "android.hardware.gamepad";		field public static final java.lang.String FEATURE_GAMEPAD = "android.hardware.gamepad";
	field public static final java.lang.String FEATURE_HIFI_SENSORS = "android.hardware.sensor.hifi_sensors";		field public static final java.lang.String FEATURE_HIFI_SENSORS = "android.hardware.sensor.hifi_sensors";
	field public static final java.lang.String FEATURE_HOME_SCREEN = "android.software.home_screen";		field public static final java.lang.String FEATURE_HOME_SCREEN = "android.software.home_screen";
	@@ -28827,11 +28828,11 @@ package android.service.voice {
	method public void onHandleAssist(android.os.Bundle, android.app.assist.AssistStructure, android.app.assist.AssistContent);		method public void onHandleAssist(android.os.Bundle, android.app.assist.AssistStructure, android.app.assist.AssistContent);
	method public void onHandleScreenshot(android.graphics.Bitmap);		method public void onHandleScreenshot(android.graphics.Bitmap);
	method public void onHide();		method public void onHide();
	method public void onLockscreenShown();
	method public boolean onKeyDown(int, android.view.KeyEvent);		method public boolean onKeyDown(int, android.view.KeyEvent);
	method public boolean onKeyLongPress(int, android.view.KeyEvent);		method public boolean onKeyLongPress(int, android.view.KeyEvent);
	method public boolean onKeyMultiple(int, int, android.view.KeyEvent);		method public boolean onKeyMultiple(int, int, android.view.KeyEvent);
	method public boolean onKeyUp(int, android.view.KeyEvent);		method public boolean onKeyUp(int, android.view.KeyEvent);
			method public void onLockscreenShown();
	method public void onLowMemory();		method public void onLowMemory();
	method public void onRequestAbortVoice(android.service.voice.VoiceInteractionSession.AbortVoiceRequest);		method public void onRequestAbortVoice(android.service.voice.VoiceInteractionSession.AbortVoiceRequest);
	method public void onRequestCommand(android.service.voice.VoiceInteractionSession.CommandRequest);		method public void onRequestCommand(android.service.voice.VoiceInteractionSession.CommandRequest);

Original line number	Original line	Diff line number	Diff line
	@@ -9608,6 +9608,7 @@ package android.content.pm {
	field public static final java.lang.String FEATURE_FAKETOUCH = "android.hardware.faketouch";		field public static final java.lang.String FEATURE_FAKETOUCH = "android.hardware.faketouch";
	field public static final java.lang.String FEATURE_FAKETOUCH_MULTITOUCH_DISTINCT = "android.hardware.faketouch.multitouch.distinct";		field public static final java.lang.String FEATURE_FAKETOUCH_MULTITOUCH_DISTINCT = "android.hardware.faketouch.multitouch.distinct";
	field public static final java.lang.String FEATURE_FAKETOUCH_MULTITOUCH_JAZZHAND = "android.hardware.faketouch.multitouch.jazzhand";		field public static final java.lang.String FEATURE_FAKETOUCH_MULTITOUCH_JAZZHAND = "android.hardware.faketouch.multitouch.jazzhand";
			field public static final java.lang.String FEATURE_FINGERPRINT = "android.hardware.fingerprint";
	field public static final java.lang.String FEATURE_GAMEPAD = "android.hardware.gamepad";		field public static final java.lang.String FEATURE_GAMEPAD = "android.hardware.gamepad";
	field public static final java.lang.String FEATURE_HIFI_SENSORS = "android.hardware.sensor.hifi_sensors";		field public static final java.lang.String FEATURE_HIFI_SENSORS = "android.hardware.sensor.hifi_sensors";
	field public static final java.lang.String FEATURE_HOME_SCREEN = "android.software.home_screen";		field public static final java.lang.String FEATURE_HOME_SCREEN = "android.software.home_screen";
	@@ -30979,11 +30980,11 @@ package android.service.voice {
	method public void onHandleAssist(android.os.Bundle, android.app.assist.AssistStructure, android.app.assist.AssistContent);		method public void onHandleAssist(android.os.Bundle, android.app.assist.AssistStructure, android.app.assist.AssistContent);
	method public void onHandleScreenshot(android.graphics.Bitmap);		method public void onHandleScreenshot(android.graphics.Bitmap);
	method public void onHide();		method public void onHide();
	method public void onLockscreenShown();
	method public boolean onKeyDown(int, android.view.KeyEvent);		method public boolean onKeyDown(int, android.view.KeyEvent);
	method public boolean onKeyLongPress(int, android.view.KeyEvent);		method public boolean onKeyLongPress(int, android.view.KeyEvent);
	method public boolean onKeyMultiple(int, int, android.view.KeyEvent);		method public boolean onKeyMultiple(int, int, android.view.KeyEvent);
	method public boolean onKeyUp(int, android.view.KeyEvent);		method public boolean onKeyUp(int, android.view.KeyEvent);
			method public void onLockscreenShown();
	method public void onLowMemory();		method public void onLowMemory();
	method public void onRequestAbortVoice(android.service.voice.VoiceInteractionSession.AbortVoiceRequest);		method public void onRequestAbortVoice(android.service.voice.VoiceInteractionSession.AbortVoiceRequest);
	method public void onRequestCommand(android.service.voice.VoiceInteractionSession.CommandRequest);		method public void onRequestCommand(android.service.voice.VoiceInteractionSession.CommandRequest);