Merge Android 12L

Bug: 222710654
Merged-In: I08d1df9ce847a1973d75e21bee7103cc77132baf
Change-Id: I6e4e8ccfddd50c430ef1dfdbbc4b1d447753fcf7
This commit is contained in:
Xin Li 2022-03-08 00:18:39 +00:00
commit d36a4710b1

View file

@ -80,6 +80,18 @@ typedef enum {
WIFI_POWER_SCENARIO_ON_BODY_HOTSPOT_BT = 10, WIFI_POWER_SCENARIO_ON_BODY_HOTSPOT_BT = 10,
WIFI_POWER_SCENARIO_ON_BODY_HOTSPOT_MMW = 11, WIFI_POWER_SCENARIO_ON_BODY_HOTSPOT_MMW = 11,
WIFI_POWER_SCENARIO_ON_BODY_HOTSPOT_BT_MMW = 12, WIFI_POWER_SCENARIO_ON_BODY_HOTSPOT_BT_MMW = 12,
WIFI_POWER_SCENARIO_ON_HEAD_CELL_OFF_UNFOLDED = 13,
WIFI_POWER_SCENARIO_ON_HEAD_CELL_ON_UNFOLDED = 14,
WIFI_POWER_SCENARIO_ON_HEAD_HOTSPOT_UNFOLDED = 15,
WIFI_POWER_SCENARIO_ON_HEAD_HOTSPOT_MMW_UNFOLDED = 16,
WIFI_POWER_SCENARIO_ON_BODY_CELL_OFF_UNFOLDED = 17,
WIFI_POWER_SCENARIO_ON_BODY_BT_UNFOLDED = 18,
WIFI_POWER_SCENARIO_ON_BODY_CELL_ON_UNFOLDED = 19,
WIFI_POWER_SCENARIO_ON_BODY_CELL_ON_BT_UNFOLDED = 20,
WIFI_POWER_SCENARIO_ON_BODY_HOTSPOT_UNFOLDED = 21,
WIFI_POWER_SCENARIO_ON_BODY_HOTSPOT_BT_UNFOLDED = 22,
WIFI_POWER_SCENARIO_ON_BODY_HOTSPOT_MMW_UNFOLDED = 23,
WIFI_POWER_SCENARIO_ON_BODY_HOTSPOT_BT_MMW_UNFOLDED = 24,
} wifi_power_scenario; } wifi_power_scenario;
typedef enum { typedef enum {