commit 5a4ec31b04d50996218e8ea9303323002a81722c
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jan 23 23:05:38 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jan 23 23:05:38 2020 +0000
tree 68806398f4b4857098e39fb22606933fd327bb0d
parent 156a854c721d4256b5ff4bc4c06918403a4b1349
parent eb7dddb9ab785686f7b3d9d8a27cb3fed94cc19a

Merge "Expose CARRIER_APPS_HANDLED as system API" am: eb7dddb9ab

Change-Id: I26b62ee0613191cff39e975f145bda8e7b54fe87

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index 9c4d8e4..6f20cd1 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -6965,6 +6965,7 @@
     field public static final String AUTOFILL_USER_DATA_MAX_USER_DATA_SIZE = "autofill_user_data_max_user_data_size";
     field public static final String AUTOFILL_USER_DATA_MAX_VALUE_LENGTH = "autofill_user_data_max_value_length";
     field public static final String AUTOFILL_USER_DATA_MIN_VALUE_LENGTH = "autofill_user_data_min_value_length";
+    field public static final String CARRIER_APPS_HANDLED = "carrier_apps_handled";
     field public static final String COMPLETED_CATEGORY_PREFIX = "suggested.completed_category.";
     field public static final String DOZE_ALWAYS_ON = "doze_always_on";
     field public static final String HUSH_GESTURE_USED = "hush_gesture_used";

core/java/android/provider/Settings.java

diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index cf697f7..7beb487 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -8600,6 +8600,7 @@
          *
          * @hide
          */
+        @SystemApi
         public static final String CARRIER_APPS_HANDLED = "carrier_apps_handled";
 
         /**