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

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

Merge "[framework] Pass in package name when change reader option." into main... 

Merge "[framework] Pass in package name when change reader option." into main am: 4cc8f565 am: 86bcddba

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



Change-Id: I8b06c70bd36b1fc88aa878a4a8a23f47d35e81c9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c0ffcc4e 86bcddba

nfc/java/android/nfc/INfcAdapter.aidl

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ interface INfcAdapter 
    boolean isReaderOptionEnabled();

    boolean isReaderOptionSupported();

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

    boolean enableReaderOption(boolean enable);

    boolean enableReaderOption(boolean enable, in String pkg);

    boolean isObserveModeSupported();

    boolean isObserveModeEnabled();

    boolean setObserveMode(boolean enabled, String pkg);

nfc/java/android/nfc/NfcAdapter.java

+2 −1
Original line number Diff line number Diff line
@@ -2011,7 +2011,8 @@ public final class NfcAdapter { 
        if (!sHasNfcFeature) {

            throw new UnsupportedOperationException();

        }

        return callServiceReturn(() ->  sService.enableReaderOption(enable), false);

        return callServiceReturn(() ->

                sService.enableReaderOption(enable, mContext.getPackageName()), false);



    }