From 1c87deaacf06099efcddc5e21270b61f22008245 Mon Sep 17 00:00:00 2001 From: Amit Mahajan Date: Fri, 13 Mar 2020 10:44:27 -0700 Subject: [PATCH] Remove @SystemApi from some constants for R. These were exposed for telephony mainline. Will be revisited in S. Test: basic sanity Bug: 148171847 Bug: 148171388 Merged-in: Ibdcac557cf35e723f09a7b7a2e59c7deae1fc94e Change-Id: Ibdcac557cf35e723f09a7b7a2e59c7deae1fc94e (cherry picked from commit c55b01552e72f2c908e0b99f74a3aecfacb6a9f9) --- api/system-current.txt | 2 -- core/java/android/content/pm/PackageManager.java | 1 - core/java/android/provider/Settings.java | 1 - 3 files changed, 4 deletions(-) diff --git a/api/system-current.txt b/api/system-current.txt index f7d3a45205f51..c79c1fd0ba4a4 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -1900,7 +1900,6 @@ package android.content.pm { field @Deprecated public static final int MASK_PERMISSION_FLAGS = 255; // 0xff field public static final int MATCH_ANY_USER = 4194304; // 0x400000 field public static final int MATCH_FACTORY_ONLY = 2097152; // 0x200000 - field public static final int MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS = 536870912; // 0x20000000 field public static final int MATCH_INSTANT = 8388608; // 0x800000 field public static final int RESTRICTION_HIDE_FROM_SUGGESTIONS = 1; // 0x1 field public static final int RESTRICTION_HIDE_NOTIFICATIONS = 2; // 0x2 @@ -6790,7 +6789,6 @@ package android.provider { 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"; diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 66f9ac0fb53ff..a2a5469cb6532 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -548,7 +548,6 @@ public abstract class PackageManager { * Internal {@link PackageInfo} flag used to indicate that a package is a hidden system app. * @hide */ - @SystemApi public static final int MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS = 0x20000000; /** diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index de30bced50fc4..7923b586ada52 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -8612,7 +8612,6 @@ public final class Settings { * * @hide */ - @SystemApi public static final String CARRIER_APPS_HANDLED = "carrier_apps_handled"; /**