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

Commit 3acb7780 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7002350 from f4b43cd1 to sc-release

Change-Id: I3251b57dfcf44c1040df3269636f7add2243a770
parents acdfe47f f4b43cd1
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ cc_defaults {
        "libxml2",
    ],
    shared_libs: [
        "audioclient-types-aidl-unstable-cpp",
        "libaudioclient_aidl_conversion",
        "libbinder",
        "libfmq",
    ],
+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ enum Tag {
  MIN_SECONDS_BETWEEN_OPS = 805306771,
  MAX_USES_PER_BOOT = 805306772,
  USER_ID = 805306869,
  USER_SECURE_ID = 1073742326,
  USER_SECURE_ID = -1610612234,
  NO_AUTH_REQUIRED = 1879048695,
  USER_AUTH_TYPE = 268435960,
  AUTH_TIMEOUT = 805306873,
+1 −1
Original line number Diff line number Diff line
@@ -355,7 +355,7 @@ enum Tag {
     *
     * Must be hardware-enforced.
     */
    USER_SECURE_ID = (4 << 28) | 502, /* TagType:UINT_REP */
    USER_SECURE_ID = (10 << 28) | 502, /* TagType:ULONG_REP */

    /**
     * Tag::NO_AUTH_REQUIRED specifies that no authentication is required to use this key.  This tag
+2 −2
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ TEST_P(VibratorAidl, OnThenOffBeforeTimeout) {
}

TEST_P(VibratorAidl, OnWithCallback) {
    if (!(capabilities & IVibrator::CAP_PERFORM_CALLBACK)) return;
    if (!(capabilities & IVibrator::CAP_ON_CALLBACK)) return;

    std::promise<void> completionPromise;
    std::future<void> completionFuture{completionPromise.get_future()};
@@ -130,7 +130,7 @@ TEST_P(VibratorAidl, OnWithCallback) {
}

TEST_P(VibratorAidl, OnCallbackNotSupported) {
    if (!(capabilities & IVibrator::CAP_PERFORM_CALLBACK)) {
    if (!(capabilities & IVibrator::CAP_ON_CALLBACK)) {
        sp<CompletionCallback> callback = new CompletionCallback([] {});
        EXPECT_EQ(Status::EX_UNSUPPORTED_OPERATION, vibrator->on(250, callback).exceptionCode());
    }
+52 −2
Original line number Diff line number Diff line
@@ -71,8 +71,7 @@ interface ISupplicantStaIface extends @1.3::ISupplicantStaIface {
     *         |SupplicantStatusCode.FAILURE_UNKNOWN|,
     *         |SupplicantStatusCode.FAILURE_IFACE_INVALID|
     */
    initiateVenueUrlAnqpQuery(MacAddress macAddress)
        generates (SupplicantStatus status);
    initiateVenueUrlAnqpQuery(MacAddress macAddress) generates (SupplicantStatus status);

    /**
     * Get wpa driver capabilities.
@@ -84,4 +83,55 @@ interface ISupplicantStaIface extends @1.3::ISupplicantStaIface {
     */
    getWpaDriverCapabilities_1_4() generates (SupplicantStatus status,
        bitfield<WpaDriverCapabilitiesMask> driverCapabilitiesMask);

    /**
     * Generates DPP bootstrap information: Bootstrap ID, DPP URI and listen
     * channel for responder mode.
     *
     * @param MacAddress MAC address of the interface for the DPP operation.
     * @param deviceInfo Device specific information.
     *        As per DPP Specification V1.0 section 5.2,
     *        allowed Range of ASCII characters in deviceInfo - %x20-7E
     *        semicolon is not allowed.
     * @param DppCurve Elliptic curve cryptography type used to generate DPP
     * public/private key pair.
     * @return status of operation and bootstrap info.
     *         Possible status codes:
     *         |SupplicantStatusCode.SUCCESS|,
     *         |SupplicantStatusCode.FAILURE_IFACE_INVALID|,
     *         |SupplicantStatusCode.FAILURE_UNKNOWN|
     *         |SupplicantStatusCode.FAILURE_UNSUPPORTED|
     */
    generateDppBootstrapInfoForResponder(MacAddress macAddress, string deviceInfo, DppCurve curve)
        generates (SupplicantStatus status, DppResponderBootstrapInfo bootstrapInfo);

    /**
     * Start DPP in Enrollee-Responder mode.
     * Framework must first call |generateDppBootstrapInfoForResponder| to generate
     * the bootstrapping information: Bootstrap ID, DPP URI and the listen channel.
     * Then call this API with derived listen channel to start listening for
     * authentication request from Peer initiator.
     *
     * @param listenChannel DPP listen channel.
     * @return status Status of the operation.
     *         Possible status codes:
     *         |SupplicantStatusCode.SUCCESS|,
     *         |SupplicantStatusCode.FAILURE_UNKNOWN|,
     *         |SupplicantStatusCode.FAILURE_IFACE_INVALID|
     *         |SupplicantStatusCode.FAILURE_UNSUPPORTED|
     */
    startDppEnrolleeResponder(uint32_t listenChannel) generates (SupplicantStatus status);

    /**
     * Stop DPP Responder operation - Remove the bootstrap code and stop listening.
     *
     * @param ownBootstrapId Local device's URI ID obtained through
     *        |generateDppBootstrapInfoForResponder| call.
     * @return status Status of the operation.
     *         Possible status codes:
     *         |SupplicantStatusCode.SUCCESS|,
     *         |SupplicantStatusCode.FAILURE_IFACE_INVALID|
     *         |SupplicantStatusCode.FAILURE_UNSUPPORTED|
     */
    stopDppResponder(uint32_t ownBootstrapId) generates (SupplicantStatus status);
};
Loading