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

Commit e8ba6317 authored by Roshan Pius's avatar Roshan Pius Committed by Gerrit Code Review
Browse files

Merge "Nfc AIdl interface updated following" into main

parents 95b0e8be fabd4874

nfc/aidl/aidl_api/android.hardware.nfc/current/android/hardware/nfc/NfcConfig.aidl

+1 −0
Original line number Original line Diff line number Diff line
@@ -49,4 +49,5 @@ parcelable NfcConfig { 
  byte[] offHostRouteUicc;

  byte[] offHostRouteUicc;

  byte[] offHostRouteEse;

  byte[] offHostRouteEse;

  byte defaultIsoDepRoute;

  byte defaultIsoDepRoute;

  byte[] offHostSimPipeIds = {};

}
 
}

nfc/aidl/android/hardware/nfc/NfcConfig.aidl

+4 −0
Original line number Original line Diff line number Diff line
@@ -86,4 +86,8 @@ parcelable NfcConfig { 
     * Default IsoDep route. 0x00 if there aren't any. Refer to NCI spec.

     * Default IsoDep route. 0x00 if there aren't any. Refer to NCI spec.

     */

     */

    byte defaultIsoDepRoute;

    byte defaultIsoDepRoute;

    /**

     * Pipe IDs for UICC. Empty if not available

     */

    byte[] offHostSimPipeIds = {};

}
 
}

nfc/aidl/vts/functional/VtsAidlHalNfcTargetTest.cpp

+5 −0
Original line number Original line Diff line number Diff line
@@ -423,6 +423,11 @@ TEST_P(NfcAidl, CheckGetConfigValues) { 
        EXPECT_GE((uint8_t)configValue.defaultIsoDepRoute, MIN_OFFHOST_ROUTE_ID);

        EXPECT_GE((uint8_t)configValue.defaultIsoDepRoute, MIN_OFFHOST_ROUTE_ID);

        EXPECT_LE((uint8_t)configValue.defaultIsoDepRoute, MAX_OFFHOST_ROUTE_ID);

        EXPECT_LE((uint8_t)configValue.defaultIsoDepRoute, MAX_OFFHOST_ROUTE_ID);

    }

    }

    for (auto simPipeId : configValue.offHostSimPipeIds) {

        LOG(INFO) << StringPrintf("offHostSimPipeId= %x", simPipeId);

        EXPECT_GE(simPipeId, MIN_OFFHOST_ROUTE_ID);

        EXPECT_LE(simPipeId, MAX_OFFHOST_ROUTE_ID);

    }

}

}





/*

/*