summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorChristopher Tate <ctate@google.com>2013-09-19 12:48:19 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-09-19 12:48:19 -0700
commit654aad21609642f7d0891962d72c0dfd4077fb94 (patch)
treebf45b765b038f77f58a5933112d441a08c3a119f /core
parentcc8dc0139ef11e8f34a22dfeb5073921030ccf98 (diff)
parent9c5cc571e5abf97a816fea2b04cd1e711e83564c (diff)
downloadframeworks_base-654aad21609642f7d0891962d72c0dfd4077fb94.zip
frameworks_base-654aad21609642f7d0891962d72c0dfd4077fb94.tar.gz
frameworks_base-654aad21609642f7d0891962d72c0dfd4077fb94.tar.bz2
am 9c5cc571: Merge "Support for "not the home app you\'re looking for" metadata" into klp-dev
* commit '9c5cc571e5abf97a816fea2b04cd1e711e83564c': Support for "not the home app you're looking for" metadata
Diffstat (limited to 'core')
-rw-r--r--core/java/android/app/ActivityManager.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java
index 2d28280..8a62d18 100644
--- a/core/java/android/app/ActivityManager.java
+++ b/core/java/android/app/ActivityManager.java
@@ -68,6 +68,13 @@ public class ActivityManager {
private final Handler mHandler;
/**
+ * <meta-data> string for a 'home' Activity that names a package that is to be
+ * uninstalled in lieu of the declaring one. The package named here must be
+ * signed with the same certificate as the one declaring the <meta-data>.
+ */
+ public static final String META_HOME_ALTERNATE = "android.app.home.alternate";
+
+ /**
* Result for IActivityManager.startActivity: an error where the
* start had to be canceled.
* @hide