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

Commit 9a0aa782 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topics... 

Merge changes from topics "cherrypicker-L18900030008374535:N55600030140665819", "cherrypicker-L78800030008299249:N92100030138810027" into main am: 28d627c7

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



Change-Id: I2f2de55ed9b5f807c61f2979ad83d7bcb4732630
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8abcb18e 28d627c7

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -1492,7 +1492,6 @@ package android { 
    field public static final int shadowRadius = 16843108; // 0x1010164

    field public static final int shape = 16843162; // 0x101019a

    field public static final int shareInterpolator = 16843195; // 0x10101bb

    field @FlaggedApi("android.nfc.nfc_associated_role_services") public static final int shareRolePriority;

    field @Deprecated public static final int sharedUserId = 16842763; // 0x101000b

    field @Deprecated public static final int sharedUserLabel = 16843361; // 0x1010261

    field public static final int sharedUserMaxSdkVersion = 16844365; // 0x101064d
@@ -1856,6 +1855,7 @@ package android { 
    field public static final int wallpaperIntraOpenExitAnimation = 16843416; // 0x1010298

    field public static final int wallpaperOpenEnterAnimation = 16843411; // 0x1010293

    field public static final int wallpaperOpenExitAnimation = 16843412; // 0x1010294

    field @FlaggedApi("android.nfc.nfc_associated_role_services") public static final int wantsRoleHolderPriority;

    field public static final int webTextViewStyle = 16843449; // 0x10102b9

    field public static final int webViewStyle = 16842885; // 0x1010085

    field public static final int weekDayTextAppearance = 16843592; // 0x1010348

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -10542,8 +10542,8 @@ package android.nfc.cardemulation { 
    method @FlaggedApi("android.nfc.enable_nfc_mainline") public void setDynamicAidGroup(@NonNull android.nfc.cardemulation.AidGroup);

    method @FlaggedApi("android.nfc.enable_nfc_mainline") public void setOffHostSecureElement(@NonNull String);

    method @FlaggedApi("android.nfc.nfc_observe_mode") public void setShouldDefaultToObserveMode(boolean);

    method @FlaggedApi("android.nfc.nfc_associated_role_services") public boolean shareRolePriority();

    method @FlaggedApi("android.nfc.nfc_observe_mode") public boolean shouldDefaultToObserveMode();

    method @FlaggedApi("android.nfc.nfc_associated_role_services") public boolean wantsRoleHolderPriority();

    method @FlaggedApi("android.nfc.enable_nfc_mainline") public void writeToParcel(@NonNull android.os.Parcel, int);

    field @FlaggedApi("android.nfc.enable_nfc_mainline") @NonNull public static final android.os.Parcelable.Creator<android.nfc.cardemulation.ApduServiceInfo> CREATOR;

    field @FlaggedApi("android.permission.flags.wallet_role_icon_property_enabled") public static final String PROPERTY_WALLET_PREFERRED_BANNER_AND_LABEL = "android.nfc.cardemulation.PROPERTY_WALLET_PREFERRED_BANNER_AND_LABEL";

core/res/res/values/attrs.xml

+2 −2
Original line number Diff line number Diff line
@@ -4808,7 +4808,7 @@ 
             role owner must opt into this behavior by using the property named by

             {@link android.nfc.cardemulation.CardEmulation.PROPERTY_ALLOW_SHARED_ROLE_PRIORITY }

             in the <code>&lt;application&rt;</code> tag. -->

        <attr name="shareRolePriority" format="boolean"/>

        <attr name="wantsRoleHolderPriority" format="boolean"/>

    </declare-styleable>















    <!-- Use <code>offhost-apdu-service</code> as the root tag of the XML resource that










@@ -4836,7 +4836,7 @@













        <!-- Whether the device should default to observe mode when this service is















             default or in the foreground. -->















        <attr name="shouldDefaultToObserveMode"/>













        <attr name="shareRolePriority"/>













        <attr name="wantsRoleHolderPriority"/>















    </declare-styleable>





























    <!-- Specify one or more <code>aid-group</code> elements inside a

































core/res/res/values/public-staging.xml



+1
−1




























Original line number
Diff line number
Diff line








@@ -119,7 +119,7 @@













    <!-- @FlaggedApi("android.service.controls.flags.Flags.FLAG_HOME_PANEL_DREAM") -->















    <public name="dreamCategory"/>















    <!-- @FlaggedApi(android.nfc.Flags.FLAG_NFC_ASSOCIATED_ROLE_SERVICES) -->













    <public name="shareRolePriority"/>













    <public name="wantsRoleHolderPriority"/>















  </staging-public-group>































  <staging-public-group type="id" first-id="0x01b60000">

































nfc/java/android/nfc/cardemulation/ApduServiceInfo.java



+7
−7




























Original line number
Diff line number
Diff line








@@ -174,7 +174,7 @@ public final class ApduServiceInfo implements Parcelable {













     * Whether or not this service wants to share the same routing priority as the















     * Wallet role owner.















     */













    private boolean mShareRolePriority;













    private boolean mWantsRoleHolderPriority;































    /**















     * @hide










@@ -314,8 +314,8 @@ public final class ApduServiceInfo implements Parcelable {













                        R.styleable.HostApduService_shouldDefaultToObserveMode,















                        false);















                if (Flags.nfcAssociatedRoleServices()) {













                    mShareRolePriority = sa.getBoolean(













                            R.styleable.HostApduService_shareRolePriority,













                    mWantsRoleHolderPriority = sa.getBoolean(













                            R.styleable.HostApduService_wantsRoleHolderPriority,















                            false















                    );















                }










@@ -350,8 +350,8 @@ public final class ApduServiceInfo implements Parcelable {













                }















                mStaticOffHostName = mOffHostName;















                if (Flags.nfcAssociatedRoleServices()) {













                    mShareRolePriority = sa.getBoolean(













                            R.styleable.OffHostApduService_shareRolePriority,













                    mWantsRoleHolderPriority = sa.getBoolean(













                            R.styleable.OffHostApduService_wantsRoleHolderPriority,















                            false















                    );















                }










@@ -752,8 +752,8 @@ public final class ApduServiceInfo implements Parcelable {













     * @return whether or not this service wants to share priority















     */















    @FlaggedApi(Flags.FLAG_NFC_ASSOCIATED_ROLE_SERVICES)













    public boolean shareRolePriority() {













        return mShareRolePriority;













    public boolean wantsRoleHolderPriority() {













        return mWantsRoleHolderPriority;















    }































    /**