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

Commit 6f263046 authored by Songchun Fan's avatar Songchun Fan Committed by Automerger Merge Worker
Browse files

Merge "Remove @TestApi and @Readable for NFC_PAYMENT_DEFAULT_COMPONENT" into... 

Merge "Remove @TestApi and @Readable for NFC_PAYMENT_DEFAULT_COMPONENT" into sc-dev am: 3172fe26 am: c4ab6f20

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15235116

Change-Id: I71f1ab37715523575ece3afb3cc38844509e3b55
parents 716bcee1 c4ab6f20

core/api/test-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -2173,7 +2173,6 @@ package android.provider { 
    field @Deprecated public static final String ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES = "enabled_notification_policy_access_packages";

    field public static final String ENABLED_VR_LISTENERS = "enabled_vr_listeners";

    field public static final String IMMERSIVE_MODE_CONFIRMATIONS = "immersive_mode_confirmations";

    field public static final String NFC_PAYMENT_DEFAULT_COMPONENT = "nfc_payment_default_component";

    field public static final String NOTIFICATION_BADGING = "notification_badging";

    field public static final String NOTIFICATION_BUBBLES = "notification_bubbles";

    field public static final String POWER_MENU_LOCKED_SHOW_CONTENT = "power_menu_locked_show_content";

core/java/android/provider/Settings.java

+0 −2
Original line number Diff line number Diff line
@@ -8747,8 +8747,6 @@ public final class Settings { 
         * @hide

         */

        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

        @TestApi

        @Readable

        public static final String NFC_PAYMENT_DEFAULT_COMPONENT = "nfc_payment_default_component";















        /**