commit e11a3b798bd57636a01fc38b4432bceec58b6bef
author Ihab Awad <ihab@google.com> Mon Sep 15 22:01:41 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Sep 15 22:01:41 2014 +0000
tree 2c620f32a74e88fa8e478ef295038c3c122832b2
parent 5e699ca6a17e8103dba2209e3469eeee822dea57
parent de4e52aa49b10a6271d5616392860a176833381e

am 336c84c3: Merge "Add system feature for ConnectionService API support (1/3)" into lmp-dev

* commit '336c84c35722e221cb3ec5d99c3876a5e5015e2a':
  Add system feature for ConnectionService API support (1/3)

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 3c081a9..d5b4f70 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -8744,6 +8744,7 @@
     field public static final java.lang.String FEATURE_CAMERA_FLASH = "android.hardware.camera.flash";
     field public static final java.lang.String FEATURE_CAMERA_FRONT = "android.hardware.camera.front";
     field public static final java.lang.String FEATURE_CAMERA_LEVEL_FULL = "android.hardware.camera.level.full";
+    field public static final java.lang.String FEATURE_CONNECTION_SERVICE = "android.software.connectionservice";
     field public static final java.lang.String FEATURE_CONSUMER_IR = "android.hardware.consumerir";
     field public static final java.lang.String FEATURE_DEVICE_ADMIN = "android.software.device_admin";
     field public static final java.lang.String FEATURE_FAKETOUCH = "android.hardware.faketouch";

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

diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java
index 3fc9b67..e5191630 100644
--- a/core/java/android/content/pm/PackageManager.java
+++ b/core/java/android/content/pm/PackageManager.java
@@ -1296,12 +1296,18 @@
 
     /**
      * Feature for {@link #getSystemAvailableFeatures} and
+     * {@link #hasSystemFeature}: The Connection Service API is enabled on the device.
+     */
+    @SdkConstant(SdkConstantType.FEATURE)
+    public static final String FEATURE_CONNECTION_SERVICE = "android.software.connectionservice";
+
+    /**
+     * Feature for {@link #getSystemAvailableFeatures} and
      * {@link #hasSystemFeature}: The device's display has a touch screen.
      */
     @SdkConstant(SdkConstantType.FEATURE)
     public static final String FEATURE_TOUCHSCREEN = "android.hardware.touchscreen";
 
-
     /**
      * Feature for {@link #getSystemAvailableFeatures} and
      * {@link #hasSystemFeature}: The device's touch screen supports
@@ -1754,7 +1760,7 @@
      * @return A fully-qualified {@link Intent} that can be used to launch the
      * main activity in the package. Returns <code>null</code> if the package
      * does not contain such an activity, or if <em>packageName</em> is not
-     * recognized. 
+     * recognized.
      */
     public abstract Intent getLaunchIntentForPackage(String packageName);
 
@@ -3810,7 +3816,7 @@
      */
     public abstract KeySet getKeySetByAlias(String packageName, String alias);
 
-    /** Return the signing {@link KeySet} for this application. 
+    /** Return the signing {@link KeySet} for this application.
      * @hide
      */
     public abstract KeySet getSigningKeySet(String packageName);