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

Commit 776bb064 authored by Brad Lassey's avatar Brad Lassey
Browse files

Rename defaultToObserveMode to shouldDefaultToObserveMode 

Bug: b/326419514
Test: Updated and ran the CTS test
Change-Id: If7b5935bd531a824ecb3f938d0e8f63de24dba10
parent 0491bba4

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -691,7 +691,6 @@ package android { 
    field public static final int defaultHeight = 16844021; // 0x10104f5

    field @FlaggedApi("android.content.res.default_locale") public static final int defaultLocale;

    field public static final int defaultToDeviceProtectedStorage = 16844036; // 0x1010504

    field @FlaggedApi("android.nfc.Flags.FLAG_OBSERVE_MODE") public static final int defaultToObserveMode;

    field public static final int defaultValue = 16843245; // 0x10101ed

    field public static final int defaultWidth = 16844020; // 0x10104f4

    field public static final int delay = 16843212; // 0x10101cc
@@ -1501,6 +1500,7 @@ package android { 
    field public static final int shortcutId = 16844072; // 0x1010528

    field public static final int shortcutLongLabel = 16844074; // 0x101052a

    field public static final int shortcutShortLabel = 16844073; // 0x1010529

    field @FlaggedApi("android.nfc.Flags.FLAG_OBSERVE_MODE") public static final int shouldDefaultToObserveMode;

    field public static final int shouldDisableView = 16843246; // 0x10101ee

    field public static final int shouldUseDefaultUnfoldTransition = 16844364; // 0x101064c

    field public static final int showAsAction = 16843481; // 0x10102d9

core/api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -10422,7 +10422,6 @@ package android.nfc.cardemulation { 
  @FlaggedApi("android.nfc.enable_nfc_mainline") public final class ApduServiceInfo implements android.os.Parcelable {

    ctor @FlaggedApi("android.nfc.enable_nfc_mainline") public ApduServiceInfo(@NonNull android.content.pm.PackageManager, @NonNull android.content.pm.ResolveInfo, boolean) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;

    method @FlaggedApi("android.nfc.nfc_read_polling_loop") public void addPollingLoopFilter(@NonNull String, boolean);

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

    method @FlaggedApi("android.nfc.enable_nfc_mainline") public int describeContents();

    method @FlaggedApi("android.nfc.enable_nfc_mainline") public void dump(@NonNull android.os.ParcelFileDescriptor, @NonNull java.io.PrintWriter, @NonNull String[]);

    method @FlaggedApi("android.nfc.enable_nfc_mainline") public void dumpDebug(@NonNull android.util.proto.ProtoOutputStream);
@@ -10452,9 +10451,10 @@ package android.nfc.cardemulation { 
    method @FlaggedApi("android.nfc.enable_nfc_mainline") public boolean requiresUnlock();

    method @FlaggedApi("android.nfc.enable_nfc_mainline") public void resetOffHostSecureElement();

    method @FlaggedApi("android.nfc.enable_nfc_mainline") public void setCategoryOtherServiceEnabled(boolean);

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

    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_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

+2 −2
Original line number Diff line number Diff line
@@ -4409,7 +4409,7 @@ 
        <attr name="requireDeviceScreenOn" format="boolean"/>

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

             default or in the foreground. -->

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

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

    </declare-styleable>















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









@@ -4436,7 +4436,7 @@













        <attr name="requireDeviceScreenOn"/>















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















             default or in the foreground. -->













        <attr name="defaultToObserveMode"/>













        <attr name="shouldDefaultToObserveMode"/>















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








@@ -160,7 +160,7 @@













    <!-- @FlaggedApi("android.view.inputmethod.connectionless_handwriting") -->















    <public name="supportsConnectionlessStylusHandwriting" />















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













    <public name="defaultToObserveMode"/>













    <public name="shouldDefaultToObserveMode"/>















    <!-- @FlaggedApi("android.security.asm_restrictions_enabled") -->















    <public name="allowCrossUidActivitySwitchFromBelow"/>















    <!-- @FlaggedApi("com.android.text.flags.use_bounds_for_width") -->

































nfc/api/current.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -206,9 +206,9 @@ package android.nfc.cardemulation {













    method public boolean registerAidsForService(android.content.ComponentName, String, java.util.List<java.lang.String>);















    method @FlaggedApi("android.nfc.nfc_read_polling_loop") public boolean registerPollingLoopFilterForService(@NonNull android.content.ComponentName, @NonNull String, boolean);















    method public boolean removeAidsForService(android.content.ComponentName, String);













    method @FlaggedApi("android.nfc.nfc_observe_mode") public boolean setDefaultToObserveModeForService(@NonNull android.content.ComponentName, boolean);















    method @NonNull @RequiresPermission(android.Manifest.permission.NFC) public boolean setOffHostForService(@NonNull android.content.ComponentName, @NonNull String);















    method public boolean setPreferredService(android.app.Activity, android.content.ComponentName);













    method @FlaggedApi("android.nfc.nfc_observe_mode") public boolean setShouldDefaultToObserveModeForService(@NonNull android.content.ComponentName, boolean);















    method public boolean supportsAidPrefixRegistration();















    method @NonNull @RequiresPermission(android.Manifest.permission.NFC) public boolean unsetOffHostForService(@NonNull android.content.ComponentName);















    method public boolean unsetPreferredService(android.app.Activity);