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

Commit 28d627c7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topics... 

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

* changes:
  Rename ApduServiceInfo.shareRolePriority()
  Adding a flag for improved wallet role icon and description fetching.
parents c04c1151 6aaa1374

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -1491,7 +1491,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
@@ -1855,6 +1854,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

+2 −1
Original line number Diff line number Diff line
@@ -10463,10 +10463,11 @@ 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";

  }















  @FlaggedApi("android.nfc.enable_nfc_mainline") public final class NfcFServiceInfo implements android.os.Parcelable {

























core/java/android/permission/flags.aconfig



+8
−0




























Original line number
Diff line number
Diff line








@@ -231,3 +231,11 @@ flag {













    description: "This fixed read-only flag is used to enable new ranging permission for all ranging use cases."















    bug: "370977414"















}



























flag {













    name: "wallet_role_icon_property_enabled"













    is_exported: true













    namespace: "wallet_integration"













    description: "This flag is used to enabled the Wallet Role s icon fetching from manifest property"













    bug: "349942654"













}
























core/res/res/values/attrs.xml



+2
−2




























Original line number
Diff line number
Diff line








@@ -4465,7 +4465,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










@@ -4493,7 +4493,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">