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

Commit 2c2d48a6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add support for NFC associated role services" into main am: 88142e1c 

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



Change-Id: I2e0832070a408c79f14f805acb10964bea323374
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 98c63690 88142e1c

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -1492,6 +1492,7 @@ 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

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -10542,6 +10542,7 @@ 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.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;

core/res/res/values/attrs.xml

+7 −0
Original line number Diff line number Diff line
@@ -4803,6 +4803,12 @@ 
        <!-- Whether the device should default to observe mode when this service is

             default or in the foreground. -->

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

        <!-- Whether this service should share the same AID routing priority as the role

             owner. This package and the role owner must have the same signature, and the

             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"/>

    </declare-styleable>















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










@@ -4830,6 +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"/>















    </declare-styleable>





























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

































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



+2
−0




























Original line number
Diff line number
Diff line








@@ -118,6 +118,8 @@













    <public name="languageSettingsActivity"/>















    <!-- @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"/>















  </staging-public-group>































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

































nfc/api/current.txt



+1
−0




























Original line number
Diff line number
Diff line








@@ -233,6 +233,7 @@ package android.nfc.cardemulation {













    field @FlaggedApi("android.nfc.nfc_event_listener") public static final int NFC_INTERNAL_ERROR_NFC_CRASH_RESTART = 1; // 0x1















    field @FlaggedApi("android.nfc.nfc_event_listener") public static final int NFC_INTERNAL_ERROR_NFC_HARDWARE_ERROR = 2; // 0x2















    field @FlaggedApi("android.nfc.nfc_event_listener") public static final int NFC_INTERNAL_ERROR_UNKNOWN = 0; // 0x0













    field @FlaggedApi("android.nfc.nfc_associated_role_services") public static final String PROPERTY_ALLOW_SHARED_ROLE_PRIORITY = "android.nfc.cardemulation.PROPERTY_ALLOW_SHARED_ROLE_PRIORITY";















    field @FlaggedApi("android.nfc.nfc_override_recover_routing_table") public static final int PROTOCOL_AND_TECHNOLOGY_ROUTE_DEFAULT = 3; // 0x3















    field @FlaggedApi("android.nfc.nfc_override_recover_routing_table") public static final int PROTOCOL_AND_TECHNOLOGY_ROUTE_DH = 0; // 0x0















    field @FlaggedApi("android.nfc.nfc_override_recover_routing_table") public static final int PROTOCOL_AND_TECHNOLOGY_ROUTE_ESE = 1; // 0x1