summaryrefslogtreecommitdiffstats
path: root/core/java/android/content
diff options
context:
space:
mode:
authorAnthony Hugh <ahugh@google.com>2015-09-29 16:50:35 -0700
committerAnthony Hugh <ahugh@google.com>2015-10-08 16:34:28 -0700
commit979b81ac33c2ba678414c5350c19fc78dbac724a (patch)
tree7b8d6bebe2d5cb0196fc120f29cc93a146443840 /core/java/android/content
parent235a6911b0939adc598e4135e1f1c6fcda9ff169 (diff)
downloadframeworks_base-979b81ac33c2ba678414c5350c19fc78dbac724a.zip
frameworks_base-979b81ac33c2ba678414c5350c19fc78dbac724a.tar.gz
frameworks_base-979b81ac33c2ba678414c5350c19fc78dbac724a.tar.bz2
Give Android Wear system apps default permission
This change grants Android Wear system components default permission. I have also added a new Intent category to help identify the main Home handler on Wear. BUG: 23419042 Change-Id: Ie669a9908bd3b03498f75c5ca22c0fddf52a5203
Diffstat (limited to 'core/java/android/content')
-rw-r--r--core/java/android/content/Intent.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
index 6bbee56..7173591 100644
--- a/core/java/android/content/Intent.java
+++ b/core/java/android/content/Intent.java
@@ -3157,6 +3157,13 @@ public class Intent implements Parcelable, Cloneable {
@SdkConstant(SdkConstantType.INTENT_CATEGORY)
public static final String CATEGORY_HOME = "android.intent.category.HOME";
/**
+ * This is the home activity that is displayed when the device is finished setting up and ready
+ * for use.
+ * @hide
+ */
+ @SdkConstant(SdkConstantType.INTENT_CATEGORY)
+ public static final String CATEGORY_HOME_MAIN = "android.intent.category.HOME_MAIN";
+ /**
* This is the setup wizard activity, that is the first activity that is displayed
* when the user sets up the device for the first time.
* @hide