commit 0c35fbcf08085545fbcbbbf155bb998e981cae36
author Junda Liu <junda@google.com> Tue Jan 19 23:20:15 2016 -0800
committer Junda Liu <junda@google.com> Tue Feb 02 14:50:39 2016 -0800
tree bf5f2da68fa3c79865cd5625817c9eddb05a83d2
parent 0cb57c399163aff7026afd9b808ad08819615113

Add strings/setting for carrier app install dialog.

Bug: b/22863855
Change-Id: I34e2ff5997e14afe70a64edb055dc876e26d7946

core/java/android/provider/Settings.java

diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 1561d46..5535eaa 100755
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -6895,6 +6895,15 @@
        public static final String TETHER_DUN_APN = "tether_dun_apn";
 
        /**
+        * List of carrier apps which are whitelisted to prompt the user for install when
+        * a sim card with matching uicc carrier privilege rules is inserted.
+        *
+        * The value is "package1;package2;..."
+        * @hide
+        */
+       public static final String CARRIER_APP_WHITELIST = "carrier_app_whitelist";
+
+       /**
         * USB Mass Storage Enabled
         */
        public static final String USB_MASS_STORAGE_ENABLED = "usb_mass_storage_enabled";