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

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

Add drawable for Apdu Services, fix build. 

Change-Id: I7c138adb60b2efe19377b58b35360cd234628424
parent fb2f8337

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -289,6 +289,7 @@ package android { 
    field public static final deprecated int animationResolution = 16843546; // 0x101031a

    field public static final int antialias = 16843034; // 0x101011a

    field public static final int anyDensity = 16843372; // 0x101026c

    field public static final int apduServiceBanner = 16843755; // 0x10103eb

    field public static final int apiKey = 16843281; // 0x1010211

    field public static final int author = 16843444; // 0x10102b4

    field public static final int authorities = 16842776; // 0x1010018

core/java/android/nfc/cardemulation/HostApduService.java

+2 −2
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ public abstract class HostApduService extends Service { 
     * currently active on the logical channel).

     *

     * <p>Note that this next AID may still be resolved to this

     * service, in which case {@link #processCommandApdu(byte[], int)}

     * service, in which case {@link #processCommandApdu(byte[], Bundle)}

     * will be called again.

     */

    public static final int DEACTIVATION_DESELECTED = 1;
@@ -248,7 +248,7 @@ public abstract class HostApduService extends Service { 
     * transaction.

     *

     * <p>Note: this method may be called anywhere between

     *    the first {@link #processCommandApdu(byte[], int)}

     *    the first {@link #processCommandApdu(byte[], Bundle)}

     *    call and a {@link #onDeactivated(int)} call.

     */

    public final void notifyUnhandled() {

core/res/res/values/attrs.xml

+6 −0
Original line number Diff line number Diff line
@@ -2611,6 +2611,9 @@ 
        <!-- Whether the device must be unlocked before routing data to this service.

             The default is false.-->

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

        <!-- A drawable that can be rendered in Android's system UI for representing

             the service. -->

        <attr name="apduServiceBanner" format="reference"/>

    </declare-styleable>



    <!-- Use <code>offhost-apdu-service</code> as the root tag of the XML resource that
@@ -2621,6 +2624,9 @@ 
        <!-- Short description of the functionality the service implements. This attribute

             is mandatory.-->

        <attr name="description" />

        <!-- A drawable that can be rendered in Android's system UI for representing

             the service. -->

        <attr name="apduServiceBanner"/>

    </declare-styleable>



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

core/res/res/values/public.xml

+1 −0
Original line number Diff line number Diff line
@@ -2074,5 +2074,6 @@ 
  <public type="attr" name="autoMirrored" />

  <public type="attr" name="supportsSwitchingToNextInputMethod" />

  <public type="attr" name="requireDeviceUnlock" />

  <public type="attr" name="apduServiceBanner" />



</resources>