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

Commit 5256cea5 authored by Etan Cohen's avatar Etan Cohen
Browse files

resolve merge conflicts of 3718363c to master 

Test: builds
Change-Id: I9e3bcca3e22c0787ca621b6229cbcfd750220698
parents 67a00d40 3718363c

current.txt

+1 −0
Original line number Diff line number Diff line
@@ -196,6 +196,7 @@ e822cb7f4a1bdd45689c5e92ccd19a2201c20b771bd4b2ec1ae627e324591f9d android.hardwar 
6e69adb24d7c0b0ca3a54a38c49a5625b161b3f5d5f7d6fda0befdbbfc8e9e06 android.hardware.radio@1.0::IRadioResponse

28e929b453df3d9f5060af2764e6cdb123ddb893e3e86923c877f6ff7e5f02c9 android.hardware.wifi@1.0::types

bfd81bcafa3c97519cd56ad29e9fa48e23d1d323b89dbcc85899282a8c628194 android.hardware.automotive.vehicle@2.0::types

df1d7b27e644bfed0a4f606a8c44d35d45cafce82c7c648494c8a25c7cd4a949 android.hardware.wifi@1.0::types



# HALs released in Android O MR1

wifi/1.0/types.hal

+2 −2
Original line number Diff line number Diff line
@@ -1355,8 +1355,8 @@ struct NanCapabilities { 
   */

  uint32_t maxNdiInterfaces;

  /**

   * Maximum number of data paths (NDP) which can be created concurrently on each individual

   * data interface (NDI).

   * Maximum number of data paths (NDP) which can be created concurrently on the device, across all

   * data interfaces (NDI).

   */

  uint32_t maxNdpSessions;

  /**