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

Commit 7fba1002 authored by Anthony Stange's avatar Anthony Stange
Browse files

Refine ContextHub HAL API updates 

Makes the NAN session request / state updates a parceable to make it
easier to add parameters to the APIs that use them over time.

Fixes: 271435739
Test: presubmits
Change-Id: I96592742095fd01a45c9fc245516304249b7434f
parent cb34a1dc

contexthub/aidl/aidl_api/android.hardware.contexthub/current/android/hardware/contexthub/IContextHub.aidl

+2 −2
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ interface IContextHub { 
  void onHostEndpointConnected(in android.hardware.contexthub.HostEndpointInfo hostEndpointInfo);

  void onHostEndpointDisconnected(char hostEndpointId);

  long[] getPreloadedNanoappIds();

  void onNanSessionStateChanged(in boolean state);

  void onNanSessionStateChanged(in android.hardware.contexthub.NanSessionStateUpdate update);

  void setTestMode(in boolean enable);

  const int EX_CONTEXT_HUB_UNSPECIFIED = (-1);

  const int EX_CONTEXT_HUB_UNSPECIFIED = (-1) /* -1 */;

}

contexthub/aidl/aidl_api/android.hardware.contexthub/current/android/hardware/contexthub/IContextHubCallback.aidl

+1 −1
Original line number Diff line number Diff line
@@ -38,6 +38,6 @@ interface IContextHubCallback { 
  void handleContextHubMessage(in android.hardware.contexthub.ContextHubMessage msg, in String[] msgContentPerms);

  void handleContextHubAsyncEvent(in android.hardware.contexthub.AsyncEventType evt);

  void handleTransactionResult(in int transactionId, in boolean success);

  void handleNanSessionRequest(in boolean enable);

  void handleNanSessionRequest(in android.hardware.contexthub.NanSessionRequest request);

  const int CONTEXTHUB_NAN_TRANSACTION_TIMEOUT_MS = 10000;

}

contexthub/aidl/aidl_api/android.hardware.contexthub/current/android/hardware/contexthub/NanSessionRequest.aidl

0 → 100644
+38 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 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.contexthub;

@VintfStability

parcelable NanSessionRequest {

  boolean enable;

}

contexthub/aidl/aidl_api/android.hardware.contexthub/current/android/hardware/contexthub/NanSessionStateUpdate.aidl

0 → 100644
+38 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 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.contexthub;

@VintfStability

parcelable NanSessionStateUpdate {

  boolean state;

}

contexthub/aidl/aidl_api/android.hardware.contexthub/current/android/hardware/contexthub/NanoappBinary.aidl

+3 −3
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ parcelable NanoappBinary { 
  byte targetChreApiMajorVersion;

  byte targetChreApiMinorVersion;

  byte[] customBinary;

  const int FLAG_SIGNED = (1 << 0);

  const int FLAG_ENCRYPTED = (1 << 1);

  const int FLAG_TCM_CAPABLE = (1 << 2);

  const int FLAG_SIGNED = (1 << 0) /* 1 */;

  const int FLAG_ENCRYPTED = (1 << 1) /* 2 */;

  const int FLAG_TCM_CAPABLE = (1 << 2) /* 4 */;

}