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

Commit 3506385e authored by James Willcox's avatar James Willcox Committed by Android (Google) Code Review
Browse files

Merge "Pass package name to `NfcService.setObserveMode()`" into main

parents 6bc9cc17 04a1f21b

nfc/java/android/nfc/INfcAdapter.aidl

+1 −1
Original line number Original line Diff line number Diff line
@@ -91,7 +91,7 @@ interface INfcAdapter 
    boolean enableReaderOption(boolean enable);

    boolean enableReaderOption(boolean enable);

    boolean isObserveModeSupported();

    boolean isObserveModeSupported();

    boolean isObserveModeEnabled();

    boolean isObserveModeEnabled();

    boolean setObserveMode(boolean enabled);

    boolean setObserveMode(boolean enabled, String pkg);





    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS)")

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS)")

    boolean setWlcEnabled(boolean enable);

    boolean setWlcEnabled(boolean enable);

nfc/java/android/nfc/NfcAdapter.java

+5 −1
Original line number Original line Diff line number Diff line
@@ -1268,8 +1268,12 @@ public final class NfcAdapter { 




    @FlaggedApi(Flags.FLAG_NFC_OBSERVE_MODE)

    @FlaggedApi(Flags.FLAG_NFC_OBSERVE_MODE)

    public boolean setObserveModeEnabled(boolean enabled) {

    public boolean setObserveModeEnabled(boolean enabled) {

        if (mContext == null) {

            throw new UnsupportedOperationException("You need a context on NfcAdapter to use the "

                    + " observe mode APIs");

        }

        try {

        try {

            return sService.setObserveMode(enabled);

            return sService.setObserveMode(enabled, mContext.getPackageName());

        } catch (RemoteException e) {

        } catch (RemoteException e) {

            attemptDeadServiceRecovery(e);

            attemptDeadServiceRecovery(e);

            return false;

            return false;