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

Commit d55def89 authored by Martijn Coenen's avatar Martijn Coenen
Browse files

Fix API review comments, add remove callback. 

Bug: 28148561
Bug: 26426491
Change-Id: I5917ea5d8fe0d3195b407643ec271ab4eb8b30b7
parent 46dc79ce

Android.mk

+1 −0
Original line number Original line Diff line number Diff line
@@ -214,6 +214,7 @@ LOCAL_SRC_FILES += \ 
	core/java/android/nfc/INfcCardEmulation.aidl \

	core/java/android/nfc/INfcCardEmulation.aidl \

	core/java/android/nfc/INfcFCardEmulation.aidl \

	core/java/android/nfc/INfcFCardEmulation.aidl \

	core/java/android/nfc/INfcUnlockHandler.aidl \

	core/java/android/nfc/INfcUnlockHandler.aidl \

	core/java/android/nfc/ITagRemovedCallback.aidl \

	core/java/android/os/IBatteryPropertiesListener.aidl \

	core/java/android/os/IBatteryPropertiesListener.aidl \

	core/java/android/os/IBatteryPropertiesRegistrar.aidl \

	core/java/android/os/IBatteryPropertiesRegistrar.aidl \

	core/java/android/os/ICancellationSignal.aidl \

	core/java/android/os/ICancellationSignal.aidl \

api/current.txt

+5 −1
Original line number Original line Diff line number Diff line
@@ -25001,6 +25001,7 @@ package android.nfc { 
    method public deprecated void enableForegroundNdefPush(android.app.Activity, android.nfc.NdefMessage);

    method public deprecated void enableForegroundNdefPush(android.app.Activity, android.nfc.NdefMessage);

    method public void enableReaderMode(android.app.Activity, android.nfc.NfcAdapter.ReaderCallback, int, android.os.Bundle);

    method public void enableReaderMode(android.app.Activity, android.nfc.NfcAdapter.ReaderCallback, int, android.os.Bundle);

    method public static android.nfc.NfcAdapter getDefaultAdapter(android.content.Context);

    method public static android.nfc.NfcAdapter getDefaultAdapter(android.content.Context);

    method public boolean ignore(android.nfc.Tag, int, android.nfc.NfcAdapter.OnTagRemovedListener, android.os.Handler);

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

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

    method public boolean isEnabled();

    method public boolean isEnabled();

    method public boolean isNdefPushEnabled();

    method public boolean isNdefPushEnabled();
@@ -25043,6 +25044,10 @@ package android.nfc { 
    method public abstract void onNdefPushComplete(android.nfc.NfcEvent);

    method public abstract void onNdefPushComplete(android.nfc.NfcEvent);

  }

  }




















  public static abstract interface NfcAdapter.OnTagRemovedListener {














    method public abstract void onTagRemoved();














  }
























  public static abstract interface NfcAdapter.ReaderCallback {







  public static abstract interface NfcAdapter.ReaderCallback {











    method public abstract void onTagDiscovered(android.nfc.Tag);







    method public abstract void onTagDiscovered(android.nfc.Tag);











  }







  }









@@ -25059,7 +25064,6 @@ package android.nfc {

























  public final class Tag implements android.os.Parcelable {







  public final class Tag implements android.os.Parcelable {











    method public int describeContents();







    method public int describeContents();











    method public boolean done(int);














    method public byte[] getId();







    method public byte[] getId();











    method public java.lang.String[] getTechList();







    method public java.lang.String[] getTechList();











    method public void writeToParcel(android.os.Parcel, int);







    method public void writeToParcel(android.os.Parcel, int);

























api/system-current.txt



+5
−1




























Original line number
Original line
Diff line number
Diff line








@@ -27228,6 +27228,7 @@ package android.nfc {









    method public boolean enableNdefPush();







    method public boolean enableNdefPush();











    method public void enableReaderMode(android.app.Activity, android.nfc.NfcAdapter.ReaderCallback, int, android.os.Bundle);







    method public void enableReaderMode(android.app.Activity, android.nfc.NfcAdapter.ReaderCallback, int, android.os.Bundle);











    method public static android.nfc.NfcAdapter getDefaultAdapter(android.content.Context);







    method public static android.nfc.NfcAdapter getDefaultAdapter(android.content.Context);














    method public boolean ignore(android.nfc.Tag, int, android.nfc.NfcAdapter.OnTagRemovedListener, android.os.Handler);











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







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











    method public boolean isEnabled();







    method public boolean isEnabled();











    method public boolean isNdefPushEnabled();







    method public boolean isNdefPushEnabled();










@@ -27277,6 +27278,10 @@ package android.nfc {









    method public abstract void onNdefPushComplete(android.nfc.NfcEvent);







    method public abstract void onNdefPushComplete(android.nfc.NfcEvent);











  }







  }






























  public static abstract interface NfcAdapter.OnTagRemovedListener {














    method public abstract void onTagRemoved();














  }
























  public static abstract interface NfcAdapter.ReaderCallback {







  public static abstract interface NfcAdapter.ReaderCallback {











    method public abstract void onTagDiscovered(android.nfc.Tag);







    method public abstract void onTagDiscovered(android.nfc.Tag);











  }







  }









@@ -27293,7 +27298,6 @@ package android.nfc {

























  public final class Tag implements android.os.Parcelable {







  public final class Tag implements android.os.Parcelable {











    method public int describeContents();







    method public int describeContents();











    method public boolean done(int);














    method public byte[] getId();







    method public byte[] getId();











    method public java.lang.String[] getTechList();







    method public java.lang.String[] getTechList();











    method public void writeToParcel(android.os.Parcel, int);







    method public void writeToParcel(android.os.Parcel, int);

























api/test-current.txt



+5
−1




























Original line number
Original line
Diff line number
Diff line








@@ -25069,6 +25069,7 @@ package android.nfc {









    method public deprecated void enableForegroundNdefPush(android.app.Activity, android.nfc.NdefMessage);







    method public deprecated void enableForegroundNdefPush(android.app.Activity, android.nfc.NdefMessage);











    method public void enableReaderMode(android.app.Activity, android.nfc.NfcAdapter.ReaderCallback, int, android.os.Bundle);







    method public void enableReaderMode(android.app.Activity, android.nfc.NfcAdapter.ReaderCallback, int, android.os.Bundle);











    method public static android.nfc.NfcAdapter getDefaultAdapter(android.content.Context);







    method public static android.nfc.NfcAdapter getDefaultAdapter(android.content.Context);














    method public boolean ignore(android.nfc.Tag, int, android.nfc.NfcAdapter.OnTagRemovedListener, android.os.Handler);











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







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











    method public boolean isEnabled();







    method public boolean isEnabled();











    method public boolean isNdefPushEnabled();







    method public boolean isNdefPushEnabled();










@@ -25111,6 +25112,10 @@ package android.nfc {









    method public abstract void onNdefPushComplete(android.nfc.NfcEvent);







    method public abstract void onNdefPushComplete(android.nfc.NfcEvent);











  }







  }






























  public static abstract interface NfcAdapter.OnTagRemovedListener {














    method public abstract void onTagRemoved();














  }
























  public static abstract interface NfcAdapter.ReaderCallback {







  public static abstract interface NfcAdapter.ReaderCallback {











    method public abstract void onTagDiscovered(android.nfc.Tag);







    method public abstract void onTagDiscovered(android.nfc.Tag);











  }







  }









@@ -25127,7 +25132,6 @@ package android.nfc {

























  public final class Tag implements android.os.Parcelable {







  public final class Tag implements android.os.Parcelable {











    method public int describeContents();







    method public int describeContents();











    method public boolean done(int);














    method public byte[] getId();







    method public byte[] getId();











    method public java.lang.String[] getTechList();







    method public java.lang.String[] getTechList();











    method public void writeToParcel(android.os.Parcel, int);







    method public void writeToParcel(android.os.Parcel, int);

























core/java/android/nfc/INfcAdapter.aidl



+3
−0




























Original line number
Original line
Diff line number
Diff line








@@ -28,6 +28,7 @@ import android.nfc.INfcTag;









import android.nfc.INfcCardEmulation;







import android.nfc.INfcCardEmulation;











import android.nfc.INfcFCardEmulation;







import android.nfc.INfcFCardEmulation;











import android.nfc.INfcUnlockHandler;







import android.nfc.INfcUnlockHandler;














import android.nfc.ITagRemovedCallback;











import android.os.Bundle;







import android.os.Bundle;































/**







/**










@@ -55,6 +56,8 @@ interface INfcAdapter









    oneway void invokeBeam();







    oneway void invokeBeam();











    oneway void invokeBeamInternal(in BeamShareData shareData);







    oneway void invokeBeamInternal(in BeamShareData shareData);


































    boolean ignore(int nativeHandle, int debounceMs, ITagRemovedCallback callback);


























    void dispatch(in Tag tag);







    void dispatch(in Tag tag);































    void setReaderMode (IBinder b, IAppCallback callback, int flags, in Bundle extras);







    void setReaderMode (IBinder b, IAppCallback callback, int flags, in Bundle extras);