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

Commit 09c57569 authored by Gabriel Biren's avatar Gabriel Biren Committed by Android (Google) Code Review
Browse files

Merge "Corrections to the USD Vendor AIDL interface." into main

parents 26768fab 5d5f5c20
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -86,8 +86,8 @@ interface ISupplicantStaIfaceCallback {
  oneway void onUsdSubscribeStarted(in int cmdId, in int subscribeId);
  oneway void onUsdPublishConfigFailed(in int cmdId);
  oneway void onUsdSubscribeConfigFailed(in int cmdId);
  oneway void onUsdPublishTerminated(in int publishId, in android.hardware.wifi.supplicant.UsdReasonCode reasonCode);
  oneway void onUsdSubscribeTerminated(in int subscribeId, in android.hardware.wifi.supplicant.UsdReasonCode reasonCode);
  oneway void onUsdPublishTerminated(in int publishId, in android.hardware.wifi.supplicant.UsdTerminateReasonCode reasonCode);
  oneway void onUsdSubscribeTerminated(in int subscribeId, in android.hardware.wifi.supplicant.UsdTerminateReasonCode reasonCode);
  oneway void onUsdPublishReplied(in android.hardware.wifi.supplicant.UsdServiceDiscoveryInfo info);
  oneway void onUsdServiceDiscovered(in android.hardware.wifi.supplicant.UsdServiceDiscoveryInfo info);
  oneway void onUsdMessageReceived(in android.hardware.wifi.supplicant.UsdMessageInfo messageInfo);
+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ parcelable UsdBaseConfig {
  android.hardware.wifi.supplicant.UsdServiceProtoType serviceProtoType;
  byte[] serviceSpecificInfo;
  @nullable byte[] txMatchFilter;
  @nullable byte[] rxMatchfilter;
  @nullable byte[] rxMatchFilter;
  int ttlSec;
  int defaultFreqMhz;
  int[] freqsMhz;
+0 −41
Original line number Diff line number Diff line
/*
 * Copyright (C) 2024 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
///////////////////////////////////////////////////////////////////////////////
// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
///////////////////////////////////////////////////////////////////////////////

// This file is a snapshot of an AIDL file. Do not edit it manually. There are
// two cases:
// 1). this is a frozen version file - do not edit this in any case.
// 2). this is a 'current' file. If you make a backwards compatible change to
//     the interface (from the latest frozen version), the build system will
//     prompt you to update this file with `m <name>-update-api`.
//
// You must not make a backward incompatible change to any AIDL file built
// with the aidl_interface module type with versions property set. The module
// type is used to build AIDL files in a way that they can be used across
// independently updatable components of the system. If a device is shipped
// with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules.

package android.hardware.wifi.supplicant;
@Backing(type="int") @VintfStability
enum UsdReasonCode {
  FAILURE_UNKNOWN = 0,
  TIMEOUT = 1,
  USER_REQUESTED = 2,
  INVALID_ARGS = 3,
}
+3 −3
Original line number Diff line number Diff line
@@ -37,8 +37,8 @@ import android.hardware.wifi.supplicant.StaIfaceCallbackState;
import android.hardware.wifi.supplicant.StaIfaceReasonCode;
import android.hardware.wifi.supplicant.SupplicantStateChangeData;
import android.hardware.wifi.supplicant.UsdMessageInfo;
import android.hardware.wifi.supplicant.UsdReasonCode;
import android.hardware.wifi.supplicant.UsdServiceDiscoveryInfo;
import android.hardware.wifi.supplicant.UsdTerminateReasonCode;
import android.hardware.wifi.supplicant.WpsConfigError;
import android.hardware.wifi.supplicant.WpsErrorIndication;

@@ -462,7 +462,7 @@ oneway interface ISupplicantStaIfaceCallback {
     * @param publishId Identifier for the publish session.
     * @param reasonCode Code indicating the reason for the session cancellation.
     */
    void onUsdPublishTerminated(in int publishId, in UsdReasonCode reasonCode);
    void onUsdPublishTerminated(in int publishId, in UsdTerminateReasonCode reasonCode);

    /**
     * Called in response to |ISupplicantStaIface.cancelUsdSubscribe| to indicate that the session
@@ -472,7 +472,7 @@ oneway interface ISupplicantStaIfaceCallback {
     * @param subscribeId Identifier for the subscribe session.
     * @param reasonCode Code indicating the reason for the session cancellation.
     */
    void onUsdSubscribeTerminated(in int subscribeId, in UsdReasonCode reasonCode);
    void onUsdSubscribeTerminated(in int subscribeId, in UsdTerminateReasonCode reasonCode);

    /**
     * Indicates that the publisher sent solicited publish message to the subscriber.
+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ parcelable UsdBaseConfig {
     * Max length: |UsdCapabilities.maxMatchFilterLength|.
     * NAN Spec: matching_filter_rx
     */
    @nullable byte[] rxMatchfilter;
    @nullable byte[] rxMatchFilter;

    /**
     * Time interval (in seconds) that a USD session will be alive.
Loading