diff options
| author | Todd Kennedy <toddke@google.com> | 2015-04-22 22:42:13 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-22 22:42:14 +0000 |
| commit | acf4698ce6a053582eff90abb911dfae3a4cb70a (patch) | |
| tree | 284a958491813f2f6032690abe1d00d6cdd364f6 | |
| parent | 463cb818ba2df8cf934494d1655731c4a26acc1d (diff) | |
| parent | 7f95a00ec0ed9d48579e758249e7ffb06371b2b8 (diff) | |
| download | frameworks_base-acf4698ce6a053582eff90abb911dfae3a4cb70a.zip frameworks_base-acf4698ce6a053582eff90abb911dfae3a4cb70a.tar.gz frameworks_base-acf4698ce6a053582eff90abb911dfae3a4cb70a.tar.bz2 | |
Merge "Add hardware feature describing a car"
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 15 |
3 files changed, 17 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index f829b07..3ed8e9c 100644 --- a/api/current.txt +++ b/api/current.txt @@ -9311,6 +9311,7 @@ package android.content.pm { field public static final java.lang.String FEATURE_APP_WIDGETS = "android.software.app_widgets"; field public static final java.lang.String FEATURE_AUDIO_LOW_LATENCY = "android.hardware.audio.low_latency"; field public static final java.lang.String FEATURE_AUDIO_OUTPUT = "android.hardware.audio.output"; + field public static final java.lang.String FEATURE_AUTOMOTIVE = "android.hardware.type.automotive"; field public static final java.lang.String FEATURE_BACKUP = "android.software.backup"; field public static final java.lang.String FEATURE_BLUETOOTH = "android.hardware.bluetooth"; field public static final java.lang.String FEATURE_BLUETOOTH_LE = "android.hardware.bluetooth_le"; diff --git a/api/system-current.txt b/api/system-current.txt index 96547ea..d9124a1 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -9570,6 +9570,7 @@ package android.content.pm { field public static final java.lang.String FEATURE_APP_WIDGETS = "android.software.app_widgets"; field public static final java.lang.String FEATURE_AUDIO_LOW_LATENCY = "android.hardware.audio.low_latency"; field public static final java.lang.String FEATURE_AUDIO_OUTPUT = "android.hardware.audio.output"; + field public static final java.lang.String FEATURE_AUTOMOTIVE = "android.hardware.type.automotive"; field public static final java.lang.String FEATURE_BACKUP = "android.software.backup"; field public static final java.lang.String FEATURE_BLUETOOTH = "android.hardware.bluetooth"; field public static final java.lang.String FEATURE_BLUETOOTH_LE = "android.hardware.bluetooth_le"; diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index a0cec50..e4108b1 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -1574,6 +1574,21 @@ public abstract class PackageManager { /** * Feature for {@link #getSystemAvailableFeatures} and * {@link #hasSystemFeature}: This is a device dedicated to showing UI + * on a vehicle headunit. A headunit here is defined to be inside a + * vehicle that may or may not be moving. A headunit uses either a + * primary display in the center console and/or additional displays in + * the instrument cluster or elsewhere in the vehicle. Headunit display(s) + * have limited size and resolution. The user will likely be focused on + * driving so limiting driver distraction is a primary concern. User input + * can be a variety of hard buttons, touch, rotary controllers and even mouse- + * like interfaces. + */ + @SdkConstant(SdkConstantType.FEATURE) + public static final String FEATURE_AUTOMOTIVE = "android.hardware.type.automotive"; + + /** + * Feature for {@link #getSystemAvailableFeatures} and + * {@link #hasSystemFeature}: This is a device dedicated to showing UI * on a television. Television here is defined to be a typical living * room television experience: displayed on a big screen, where the user * is sitting far away from it, and the dominant form of input will be |