Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c87deaa authored by Amit Mahajan's avatar Amit Mahajan
Browse files

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 c55b0155)
parent 954f3d78
Loading
Loading
Loading
Loading
+0 −2
Original line number Original line Diff line number Diff line
@@ -1900,7 +1900,6 @@ package android.content.pm {
    field @Deprecated public static final int MASK_PERMISSION_FLAGS = 255; // 0xff
    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_ANY_USER = 4194304; // 0x400000
    field public static final int MATCH_FACTORY_ONLY = 2097152; // 0x200000
    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 MATCH_INSTANT = 8388608; // 0x800000
    field public static final int RESTRICTION_HIDE_FROM_SUGGESTIONS = 1; // 0x1
    field public static final int RESTRICTION_HIDE_FROM_SUGGESTIONS = 1; // 0x1
    field public static final int RESTRICTION_HIDE_NOTIFICATIONS = 2; // 0x2
    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_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_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 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 COMPLETED_CATEGORY_PREFIX = "suggested.completed_category.";
    field public static final String DOZE_ALWAYS_ON = "doze_always_on";
    field public static final String DOZE_ALWAYS_ON = "doze_always_on";
    field public static final String HUSH_GESTURE_USED = "hush_gesture_used";
    field public static final String HUSH_GESTURE_USED = "hush_gesture_used";
+0 −1
Original line number Original line Diff line number Diff line
@@ -548,7 +548,6 @@ public abstract class PackageManager {
     * Internal {@link PackageInfo} flag used to indicate that a package is a hidden system app.
     * Internal {@link PackageInfo} flag used to indicate that a package is a hidden system app.
     * @hide
     * @hide
     */
     */
    @SystemApi
    public static final int MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS =  0x20000000;
    public static final int MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS =  0x20000000;


    /**
    /**
+0 −1
Original line number Original line Diff line number Diff line
@@ -8612,7 +8612,6 @@ public final class Settings {
         *
         *
         * @hide
         * @hide
         */
         */
        @SystemApi
        public static final String CARRIER_APPS_HANDLED = "carrier_apps_handled";
        public static final String CARRIER_APPS_HANDLED = "carrier_apps_handled";
        /**
        /**