diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2014-05-08 21:33:49 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-08 21:33:49 +0000 |
| commit | 2e58d6de062fc48ad2a032d90d4956cf8041a894 (patch) | |
| tree | 2d232445a4d03714ccb03cd7831373dd7e2a3395 /core/java/android/content | |
| parent | 2235a1772fc3c72b5c1795310e221d613cae01da (diff) | |
| parent | 9131da28e17856fa583d42ea23da211f7689487f (diff) | |
| download | frameworks_base-2e58d6de062fc48ad2a032d90d4956cf8041a894.zip frameworks_base-2e58d6de062fc48ad2a032d90d4956cf8041a894.tar.gz frameworks_base-2e58d6de062fc48ad2a032d90d4956cf8041a894.tar.bz2 | |
Merge "Add android.hardware.camera.external feature."
Diffstat (limited to 'core/java/android/content')
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 52a169b..eb2c11f 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -936,13 +936,21 @@ public abstract class PackageManager { /** * Feature for {@link #getSystemAvailableFeatures} and * {@link #hasSystemFeature}: The device has at least one camera pointing in - * some direction. + * some direction, or can support an external camera being connected to it. */ @SdkConstant(SdkConstantType.FEATURE) public static final String FEATURE_CAMERA_ANY = "android.hardware.camera.any"; /** * Feature for {@link #getSystemAvailableFeatures} and + * {@link #hasSystemFeature}: The device can support having an external camera connected to it. + * The external camera may not always be connected or available to applications to use. + */ + @SdkConstant(SdkConstantType.FEATURE) + public static final String FEATURE_CAMERA_EXTERNAL = "android.hardware.camera.external"; + + /** + * Feature for {@link #getSystemAvailableFeatures} and * {@link #hasSystemFeature}: The device's camera supports flash. */ @SdkConstant(SdkConstantType.FEATURE) |