Snap for 8426163 from d14dc964dfcad22d72136e41fab0224c9458dfe9 to mainline-tzdata2-releaseandroid-mainline-12.0.0_r112aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseaml_tz2_305400100

Change-Id: I7839f3f59a7e2053b5bc979b5379e4e727bd3496

38 files changed, 1 insertions, 1077 deletions

diff --git a/Android.bp b/Android.bp
index d97115f..cbe5e32 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,21 +1,6 @@
 soong_namespace {
 }
 
-package {
-    default_applicable_licenses: ["hardware_google_interfaces_license"],
-}
-
-// Added automatically by a large-scale-change
-// See: http://go/android-license-faq
-license {
-    name: "hardware_google_interfaces_license",
-    visibility: [":__subpackages__"],
-    license_kinds: [
-        "SPDX-license-identifier-Apache-2.0",
-    ],
-    // large-scale-change unable to identify any license_text files
-}
-
 hidl_package_root {
     name: "hardware.google",
 }
diff --git a/METADATA b/METADATA
deleted file mode 100644
index d97975c..0000000
--- a/METADATA
+++ /dev/null
@@ -1,3 +0,0 @@
-third_party {
-  license_type: NOTICE
-}
diff --git a/bluetooth/bt_channel_avoidance/1.0/Android.bp b/bluetooth/bt_channel_avoidance/1.0/Android.bp
deleted file mode 100644
index 5c7e4cc..0000000
--- a/bluetooth/bt_channel_avoidance/1.0/Android.bp
+++ /dev/null
@@ -1,20 +0,0 @@
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "hardware_google_interfaces_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["hardware_google_interfaces_license"],
-}
-
-hidl_interface {
-    name: "hardware.google.bluetooth.bt_channel_avoidance@1.0",
-    root: "hardware.google",
-    srcs: [
-        "IBTChannelAvoidance.hal",
-    ],
-    interfaces: [
-        "android.hidl.base@1.0",
-    ],
-    gen_java: true,
-}
diff --git a/bluetooth/bt_channel_avoidance/1.0/IBTChannelAvoidance.hal b/bluetooth/bt_channel_avoidance/1.0/IBTChannelAvoidance.hal
deleted file mode 100644
index cc80d15..0000000
--- a/bluetooth/bt_channel_avoidance/1.0/IBTChannelAvoidance.hal
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2020 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 is pixel only extension for Bluetooth HAL.
- */
-package hardware.google.bluetooth.bt_channel_avoidance@1.0;
-
-interface IBTChannelAvoidance {
-    /**
-     * API to set Bluetooth channel map.
-     *
-     * This API must be invoked whenever channels map of Bluetooth need to
-     * changed because Bluetooth channels have conflict with wifi or cellular.
-     *
-     * @param channelMap The lower 79 bits of the 80-bit parameterrepresents
-     *        the status of 79 channels. 0 means the channel is bad and 1 means
-     *        unknown. The most significant bit (bit 79) is reserved for future
-     *        use.
-     */
-    oneway setBluetoothChannelStatus(uint8_t[10] channelMap);
-};
diff --git a/bluetooth/ccc/1.0/Android.bp b/bluetooth/ccc/1.0/Android.bp
deleted file mode 100644
index bb789b5..0000000
--- a/bluetooth/ccc/1.0/Android.bp
+++ /dev/null
@@ -1,22 +0,0 @@
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "hardware_google_interfaces_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["hardware_google_interfaces_license"],
-}
-
-hidl_interface {
-    name: "hardware.google.bluetooth.ccc@1.0",
-    root: "hardware.google",
-    srcs: [
-        "IBluetoothCcc.hal",
-        "IBluetoothCccCallback.hal",
-        "types.hal",
-    ],
-    interfaces: [
-        "android.hidl.base@1.0",
-    ],
-    gen_java: true,
-}
diff --git a/bluetooth/ccc/1.0/IBluetoothCcc.hal b/bluetooth/ccc/1.0/IBluetoothCcc.hal
deleted file mode 100644
index 4f7f1e7..0000000
--- a/bluetooth/ccc/1.0/IBluetoothCcc.hal
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2021 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 is pixel only extension for Bluetooth HAL.
- */
-package hardware.google.bluetooth.ccc@1.0;
-
-import IBluetoothCccCallback;
-
-interface IBluetoothCcc {
-   /**
-    * API to monitor Bluetooth and system timestamp for given Bluetooth device when Bluetooth
-    * controller send/receive given LMP events.
-    *
-    * @param callback An instance of the |IBluetoothCccCallback| HIDL interface object.
-    * @param address Bluetooth address to use for monitoring timestamp.
-    * @param lmpEventIds LMP events to use for monitoring timestamp.
-    */
-    registerForLmpEvents(IBluetoothCccCallback callback,
-            Address address, vec<LmpEventId> lmpEventIds);
-
-   /**
-    * API to stop monitor given Bluetooth device.
-    *
-    * @param address Bluetooth device to stop monitoring.
-    */
-    unregisterLmpEvents(Address address);
-};
diff --git a/bluetooth/ccc/1.0/IBluetoothCccCallback.hal b/bluetooth/ccc/1.0/IBluetoothCccCallback.hal
deleted file mode 100644
index bcd0cea..0000000
--- a/bluetooth/ccc/1.0/IBluetoothCccCallback.hal
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2021 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.
- */
-
-package hardware.google.bluetooth.ccc@1.0;
-
-import types;
-
-interface IBluetoothCccCallback {
-    /**
-     * Callback when monitored LMP event involked.
-     *
-     * @param timestamp Timestamp when the LMP event involked
-     * @param address Remote bluetooth address that involke LMP event
-     * @param direction Direction of the involked LMP event
-     * @param lmpEventId LMP event id that bluetooth chip involked
-     * @param connEventCounter counter incremented by one for each new connection event
-     */
-    onEventGenerated(Timestamp timestamp, Address address, Direction direction,
-            LmpEventId lmpEventId, uint16_t connEventCounter);
-};
diff --git a/bluetooth/ccc/1.0/types.hal b/bluetooth/ccc/1.0/types.hal
deleted file mode 100644
index a65f159..0000000
--- a/bluetooth/ccc/1.0/types.hal
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2021 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.
- */
-
-package hardware.google.bluetooth.ccc@1.0;
-
-/**
- * Generic structure to return the timestamp
- */
-struct Timestamp {
-    /**
-     * Timestamp in microsecond since system boot.
-     */
-    uint32_t systemTime;
-    /**
-     * Timestamp in microsecond since Bluetooth controller power up.
-     */
-    uint32_t bluetoothTime;
-};
-
-/**
- * LMP event id to be monitored
- * CONNECT_IND indicator for initiating connection, timestamp will be at the anchor point
- * LL_PHY_UPDATE_IND indicator for PHY update
- */
-enum LmpEventId : uint8_t {
-    CONNECT_IND = 0x00,
-    LL_PHY_UPDATE_IND = 0x01
-};
-
-/**
- * Direction of the LMP event
- */
-enum Direction : uint8_t {
-    TX = 0x00, RX = 0x01
-};
-
-/**
- * Bluetooth Address Type. 6 octest representing bluetooth of a device.
- */
-typedef uint8_t[6] Address;
diff --git a/bluetooth/sar/1.0/Android.bp b/bluetooth/sar/1.0/Android.bp
deleted file mode 100644
index e0b6b24..0000000
--- a/bluetooth/sar/1.0/Android.bp
+++ /dev/null
@@ -1,20 +0,0 @@
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "hardware_google_interfaces_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["hardware_google_interfaces_license"],
-}
-
-hidl_interface {
-    name: "hardware.google.bluetooth.sar@1.0",
-    root: "hardware.google",
-    srcs: [
-        "IBluetoothSar.hal",
-    ],
-    interfaces: [
-        "android.hidl.base@1.0",
-    ],
-    gen_java: true,
-}
diff --git a/bluetooth/sar/1.0/IBluetoothSar.hal b/bluetooth/sar/1.0/IBluetoothSar.hal
deleted file mode 100644
index 5cb96d4..0000000
--- a/bluetooth/sar/1.0/IBluetoothSar.hal
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2020 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 is pixel only extension for Bluetooth HAL.
- */
-package hardware.google.bluetooth.sar@1.0;
-
-interface IBluetoothSar {
-    /**
-     * API to set Bluetooth Tx power cap.
-     *
-     * This API must be invoked whenever maximum Bluetooth Tx power need to
-     * changed for optimising performance purpose in SAR scenarios.
-     *
-     * @param cap Bluetooth Tx cap. Range is between 0 and 80 units,
-     * each unit is 0.25 dBm.
-     */
-    oneway setBluetoothTxPowerCap(int8_t cap);
-
-    /**
-     * API to set Bluetooth Tx power cap of each tech.
-     *
-     * This API must be invoked whenever maximum Bluetooth Tx power for BR, EDR
-     * and BLE need to changed for optimising performance purpose in SAR
-     * scenarios.
-     *
-     * @param brCap Bluetooth Tx cap. Range is between 0 and 80 units,
-     * each unit is 0.25 dBm.
-     * @param edrCap Bluetooth Tx cap. Range is between 0 and 80 units,
-     * each unit is 0.25 dBm.
-     * @param bleCap Bluetooth Tx cap. Range is between 0 and 80 units,
-     * each unit is 0.25 dBm.
-     */
-    oneway setBluetoothTechBasedTxPowerCap(int8_t brCap, int8_t edrCap, int8_t bleCap);
-};
diff --git a/bluetooth/sar/1.1/Android.bp b/bluetooth/sar/1.1/Android.bp
deleted file mode 100644
index 05bdb09..0000000
--- a/bluetooth/sar/1.1/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "hardware_google_interfaces_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["hardware_google_interfaces_license"],
-}
-
-hidl_interface {
-    name: "hardware.google.bluetooth.sar@1.1",
-    root: "hardware.google",
-    srcs: [
-        "IBluetoothSar.hal",
-    ],
-    interfaces: [
-        "hardware.google.bluetooth.sar@1.0",
-        "android.hidl.base@1.0",
-    ],
-    gen_java: true,
-}
diff --git a/bluetooth/sar/1.1/IBluetoothSar.hal b/bluetooth/sar/1.1/IBluetoothSar.hal
deleted file mode 100644
index 2dfca42..0000000
--- a/bluetooth/sar/1.1/IBluetoothSar.hal
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2020 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 is pixel only extension for Bluetooth HAL.
- */
-package hardware.google.bluetooth.sar@1.1;
-import  hardware.google.bluetooth.sar@1.0;
-
-interface IBluetoothSar extends @1.0::IBluetoothSar {
-    /**
-     * API to set Bluetooth Tx power cap of each mode
-     *
-     * This API must be invoke whenever maximum Bluetooth Tx power of each mode, include chain 0,
-     * chain 1 and beamforming mode, need to be changed for optimising performance purpose in SAR
-     * scenarios.
-     *
-     * @param chain0Cap Bluetooth Tx cap of chain 0 mode. Range is between 0 and 80 units, each unit
-     * is 0.25 dBm.
-     * @param chain1Cap Bluetooth Tx cap of chain 1 mode. Range is between 0 and 80 units, each unit
-     * is 0.25 dBm.
-     * @param beamformingCap Bluetooth Tx cap of beamforming mode. Range is between 0 and 80 units,
-     * each unit is 0.25 dBm.
-     */
-     oneway setBluetoothModeBasedTxPowerCap(int8_t[3] chain0Cap,int8_t[3] chain1Cap,
-             int8_t[6] beamformingCap);
-};
\ No newline at end of file
diff --git a/current.txt b/current.txt
index 210c9c7..b0dae6a 100644
--- a/current.txt
+++ b/current.txt
@@ -1,12 +1,3 @@
-# HALs released in Android S
-
-c34fdd31d56ca97aec45eb3eb9b47d62294335e1c880a7998013f2096825397d hardware.google.bluetooth.bt_channel_avoidance@1.0::IBTChannelAvoidance
-8490e311ba249523d0cb6e2dd8b8a863241b428cdf8c98d88689332951e398c8 hardware.google.bluetooth.ccc@1.0::types
-a8a5ea77cf0e11f83a6751186325efb7f18ea1dc2e9f9ad33032980b0e1e3ecd hardware.google.bluetooth.ccc@1.0::IBluetoothCcc
-5287fd8c6f65a1533a9c65bb8036ce0653093cf7f802636732c265b57588f2a8 hardware.google.bluetooth.ccc@1.0::IBluetoothCccCallback
-ffb48792d6e067f012f66b28b526afe46be1aaaacbcf71891969cb0a55a7165c hardware.google.bluetooth.sar@1.0::IBluetoothSar
-a0632be7cbb7e64f8254363b6d000ec0bb03096f7a10a1390701b9ace2ff2c84 hardware.google.bluetooth.sar@1.1::IBluetoothSar
-
 # HALs released in Android P MAR20 QPR
 
 bcaa8ef72b0ebbcbd0873f600a8d2bc45f76a6fb119ad6aeae4c5347a790aedb hardware.google.light@1.1::ILight
diff --git a/display/Android.bp b/display/Android.bp
deleted file mode 100644
index 5b63f65..0000000
--- a/display/Android.bp
+++ /dev/null
@@ -1,36 +0,0 @@
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "hardware_google_interfaces_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["hardware_google_interfaces_license"],
-}
-
-aidl_interface {
-    name: "com.google.hardware.pixel.display",
-    vendor_available: true,
-    srcs: [
-        "com/google/hardware/pixel/display/*.aidl",
-    ],
-
-    stability: "vintf",
-
-    imports: [
-        "android.hardware.common",
-    ],
-
-    backend: {
-        java: {
-            platform_apis: true,
-        },
-        cpp: {
-            enabled: false,
-        },
-    },
-    versions: [
-        "1",
-        "2",
-        "3",
-    ],
-}
diff --git a/display/aidl_api/com.google.hardware.pixel.display/1/.hash b/display/aidl_api/com.google.hardware.pixel.display/1/.hash
deleted file mode 100644
index 08e4043..0000000
--- a/display/aidl_api/com.google.hardware.pixel.display/1/.hash
+++ /dev/null
@@ -1 +0,0 @@
-b8ea6e2c79ac4b3f458cb195c70420250eea6614
diff --git a/display/aidl_api/com.google.hardware.pixel.display/1/com/google/hardware/pixel/display/HbmState.aidl b/display/aidl_api/com.google.hardware.pixel.display/1/com/google/hardware/pixel/display/HbmState.aidl
deleted file mode 100644
index 440a95e..0000000
--- a/display/aidl_api/com.google.hardware.pixel.display/1/com/google/hardware/pixel/display/HbmState.aidl
+++ /dev/null
@@ -1,24 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL interface (or parcelable). Do not try to
-// edit this file. It looks like you are doing that because you have modified
-// an AIDL interface in a backward-incompatible way, e.g., deleting a function
-// from an interface or a field from a parcelable and it broke the build. That
-// breakage is intended.
-//
-// You must not make a backward incompatible changes to the AIDL files 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 com.google.hardware.pixel.display;
-@Backing(type="byte") @VintfStability
-enum HbmState {
-  OFF = 0,
-  HDR = 1,
-  SUNLIGHT = 2,
-}
diff --git a/display/aidl_api/com.google.hardware.pixel.display/1/com/google/hardware/pixel/display/IDisplay.aidl b/display/aidl_api/com.google.hardware.pixel.display/1/com/google/hardware/pixel/display/IDisplay.aidl
deleted file mode 100644
index df43035..0000000
--- a/display/aidl_api/com.google.hardware.pixel.display/1/com/google/hardware/pixel/display/IDisplay.aidl
+++ /dev/null
@@ -1,28 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL interface (or parcelable). Do not try to
-// edit this file. It looks like you are doing that because you have modified
-// an AIDL interface in a backward-incompatible way, e.g., deleting a function
-// from an interface or a field from a parcelable and it broke the build. That
-// breakage is intended.
-//
-// You must not make a backward incompatible changes to the AIDL files 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 com.google.hardware.pixel.display;
-@VintfStability
-interface IDisplay {
-  boolean isHbmSupported();
-  void setHbmState(in com.google.hardware.pixel.display.HbmState state);
-  com.google.hardware.pixel.display.HbmState getHbmState();
-  boolean isLbeSupported();
-  void setLbeState(in com.google.hardware.pixel.display.LbeState state);
-  void setLbeAmbientLight(in int ambientLux);
-  com.google.hardware.pixel.display.LbeState getLbeState();
-}
diff --git a/display/aidl_api/com.google.hardware.pixel.display/1/com/google/hardware/pixel/display/LbeState.aidl b/display/aidl_api/com.google.hardware.pixel.display/1/com/google/hardware/pixel/display/LbeState.aidl
deleted file mode 100644
index 0e4985a..0000000
--- a/display/aidl_api/com.google.hardware.pixel.display/1/com/google/hardware/pixel/display/LbeState.aidl
+++ /dev/null
@@ -1,25 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL interface (or parcelable). Do not try to
-// edit this file. It looks like you are doing that because you have modified
-// an AIDL interface in a backward-incompatible way, e.g., deleting a function
-// from an interface or a field from a parcelable and it broke the build. That
-// breakage is intended.
-//
-// You must not make a backward incompatible changes to the AIDL files 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 com.google.hardware.pixel.display;
-@Backing(type="byte") @VintfStability
-enum LbeState {
-  OFF = 0,
-  NORMAL = 1,
-  HIGH_BRIGHTNESS = 2,
-  POWER_SAVE = 3,
-}
diff --git a/display/aidl_api/com.google.hardware.pixel.display/2/.hash b/display/aidl_api/com.google.hardware.pixel.display/2/.hash
deleted file mode 100644
index 60cb0d0..0000000
--- a/display/aidl_api/com.google.hardware.pixel.display/2/.hash
+++ /dev/null
@@ -1 +0,0 @@
-bcb4f92324798b6f2c70f1757634f670e1da6d36
diff --git a/display/aidl_api/com.google.hardware.pixel.display/2/com/google/hardware/pixel/display/HbmState.aidl b/display/aidl_api/com.google.hardware.pixel.display/2/com/google/hardware/pixel/display/HbmState.aidl
deleted file mode 100644
index 76af8b3..0000000
--- a/display/aidl_api/com.google.hardware.pixel.display/2/com/google/hardware/pixel/display/HbmState.aidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2020 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 com.google.hardware.pixel.display;
-@Backing(type="byte") @VintfStability
-enum HbmState {
-  OFF = 0,
-  HDR = 1,
-  SUNLIGHT = 2,
-}
diff --git a/display/aidl_api/com.google.hardware.pixel.display/2/com/google/hardware/pixel/display/IDisplay.aidl b/display/aidl_api/com.google.hardware.pixel.display/2/com/google/hardware/pixel/display/IDisplay.aidl
deleted file mode 100644
index 9a58417..0000000
--- a/display/aidl_api/com.google.hardware.pixel.display/2/com/google/hardware/pixel/display/IDisplay.aidl
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2021 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 com.google.hardware.pixel.display;
-@VintfStability
-interface IDisplay {
-  boolean isHbmSupported();
-  void setHbmState(in com.google.hardware.pixel.display.HbmState state);
-  com.google.hardware.pixel.display.HbmState getHbmState();
-  boolean isLbeSupported();
-  void setLbeState(in com.google.hardware.pixel.display.LbeState state);
-  void setLbeAmbientLight(in int ambientLux);
-  com.google.hardware.pixel.display.LbeState getLbeState();
-  boolean isLhbmSupported();
-  void setLhbmState(in boolean enabled);
-  boolean getLhbmState();
-}
diff --git a/display/aidl_api/com.google.hardware.pixel.display/2/com/google/hardware/pixel/display/LbeState.aidl b/display/aidl_api/com.google.hardware.pixel.display/2/com/google/hardware/pixel/display/LbeState.aidl
deleted file mode 100644
index 6ad7fb7..0000000
--- a/display/aidl_api/com.google.hardware.pixel.display/2/com/google/hardware/pixel/display/LbeState.aidl
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2020 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 com.google.hardware.pixel.display;
-@Backing(type="byte") @VintfStability
-enum LbeState {
-  OFF = 0,
-  NORMAL = 1,
-  HIGH_BRIGHTNESS = 2,
-  POWER_SAVE = 3,
-}
diff --git a/display/aidl_api/com.google.hardware.pixel.display/3/.hash b/display/aidl_api/com.google.hardware.pixel.display/3/.hash
deleted file mode 100644
index b08a01a..0000000
--- a/display/aidl_api/com.google.hardware.pixel.display/3/.hash
+++ /dev/null
@@ -1 +0,0 @@
-41425d2a0c0f6459d358b330f10ab1166eb09a14
diff --git a/display/aidl_api/com.google.hardware.pixel.display/3/com/google/hardware/pixel/display/HbmState.aidl b/display/aidl_api/com.google.hardware.pixel.display/3/com/google/hardware/pixel/display/HbmState.aidl
deleted file mode 100644
index 76af8b3..0000000
--- a/display/aidl_api/com.google.hardware.pixel.display/3/com/google/hardware/pixel/display/HbmState.aidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2020 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 com.google.hardware.pixel.display;
-@Backing(type="byte") @VintfStability
-enum HbmState {
-  OFF = 0,
-  HDR = 1,
-  SUNLIGHT = 2,
-}
diff --git a/display/aidl_api/com.google.hardware.pixel.display/3/com/google/hardware/pixel/display/IDisplay.aidl b/display/aidl_api/com.google.hardware.pixel.display/3/com/google/hardware/pixel/display/IDisplay.aidl
deleted file mode 100644
index a4e0b06..0000000
--- a/display/aidl_api/com.google.hardware.pixel.display/3/com/google/hardware/pixel/display/IDisplay.aidl
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2021 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 com.google.hardware.pixel.display;
-@VintfStability
-interface IDisplay {
-  boolean isHbmSupported();
-  void setHbmState(in com.google.hardware.pixel.display.HbmState state);
-  com.google.hardware.pixel.display.HbmState getHbmState();
-  boolean isLbeSupported();
-  void setLbeState(in com.google.hardware.pixel.display.LbeState state);
-  void setLbeAmbientLight(in int ambientLux);
-  com.google.hardware.pixel.display.LbeState getLbeState();
-  boolean isLhbmSupported();
-  void setLhbmState(in boolean enabled);
-  boolean getLhbmState();
-  int setCompensationImageHandle(in android.hardware.common.NativeHandle native_handle, in String imageName);
-}
diff --git a/display/aidl_api/com.google.hardware.pixel.display/3/com/google/hardware/pixel/display/LbeState.aidl b/display/aidl_api/com.google.hardware.pixel.display/3/com/google/hardware/pixel/display/LbeState.aidl
deleted file mode 100644
index 6ad7fb7..0000000
--- a/display/aidl_api/com.google.hardware.pixel.display/3/com/google/hardware/pixel/display/LbeState.aidl
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2020 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 com.google.hardware.pixel.display;
-@Backing(type="byte") @VintfStability
-enum LbeState {
-  OFF = 0,
-  NORMAL = 1,
-  HIGH_BRIGHTNESS = 2,
-  POWER_SAVE = 3,
-}
diff --git a/display/aidl_api/com.google.hardware.pixel.display/current/com/google/hardware/pixel/display/HbmState.aidl b/display/aidl_api/com.google.hardware.pixel.display/current/com/google/hardware/pixel/display/HbmState.aidl
deleted file mode 100644
index 76af8b3..0000000
--- a/display/aidl_api/com.google.hardware.pixel.display/current/com/google/hardware/pixel/display/HbmState.aidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2020 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 com.google.hardware.pixel.display;
-@Backing(type="byte") @VintfStability
-enum HbmState {
-  OFF = 0,
-  HDR = 1,
-  SUNLIGHT = 2,
-}
diff --git a/display/aidl_api/com.google.hardware.pixel.display/current/com/google/hardware/pixel/display/IDisplay.aidl b/display/aidl_api/com.google.hardware.pixel.display/current/com/google/hardware/pixel/display/IDisplay.aidl
deleted file mode 100644
index a4e0b06..0000000
--- a/display/aidl_api/com.google.hardware.pixel.display/current/com/google/hardware/pixel/display/IDisplay.aidl
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2021 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 com.google.hardware.pixel.display;
-@VintfStability
-interface IDisplay {
-  boolean isHbmSupported();
-  void setHbmState(in com.google.hardware.pixel.display.HbmState state);
-  com.google.hardware.pixel.display.HbmState getHbmState();
-  boolean isLbeSupported();
-  void setLbeState(in com.google.hardware.pixel.display.LbeState state);
-  void setLbeAmbientLight(in int ambientLux);
-  com.google.hardware.pixel.display.LbeState getLbeState();
-  boolean isLhbmSupported();
-  void setLhbmState(in boolean enabled);
-  boolean getLhbmState();
-  int setCompensationImageHandle(in android.hardware.common.NativeHandle native_handle, in String imageName);
-}
diff --git a/display/aidl_api/com.google.hardware.pixel.display/current/com/google/hardware/pixel/display/LbeState.aidl b/display/aidl_api/com.google.hardware.pixel.display/current/com/google/hardware/pixel/display/LbeState.aidl
deleted file mode 100644
index 6ad7fb7..0000000
--- a/display/aidl_api/com.google.hardware.pixel.display/current/com/google/hardware/pixel/display/LbeState.aidl
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2020 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 com.google.hardware.pixel.display;
-@Backing(type="byte") @VintfStability
-enum LbeState {
-  OFF = 0,
-  NORMAL = 1,
-  HIGH_BRIGHTNESS = 2,
-  POWER_SAVE = 3,
-}
diff --git a/display/com/google/hardware/pixel/display/HbmState.aidl b/display/com/google/hardware/pixel/display/HbmState.aidl
deleted file mode 100644
index 39270a2..0000000
--- a/display/com/google/hardware/pixel/display/HbmState.aidl
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2020 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.
- */
-
-package com.google.hardware.pixel.display;
-
-@VintfStability
-@Backing(type="byte")
-enum HbmState {
-    OFF = 0,
-    HDR = 1,
-    SUNLIGHT = 2,
-}
diff --git a/display/com/google/hardware/pixel/display/IDisplay.aidl b/display/com/google/hardware/pixel/display/IDisplay.aidl
deleted file mode 100644
index bb7ca4b..0000000
--- a/display/com/google/hardware/pixel/display/IDisplay.aidl
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (C) 2021 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.
- */
-
-package com.google.hardware.pixel.display;
-
-import com.google.hardware.pixel.display.HbmState;
-import com.google.hardware.pixel.display.LbeState;
-import android.hardware.common.NativeHandle;
-
-@VintfStability
-interface IDisplay {
-    /**
-     * Query Display High Brightness Mode Supported
-     *
-     * @return true if HBM is supported on this platform.
-     *         If false, HBM is not supported.
-     */
-    boolean isHbmSupported();
-
-    /**
-     * Set Display High Brightness Mode
-     *
-     * @param state to be queried.
-     */
-    void setHbmState(in HbmState state);
-
-    /**
-     * Get Display High Brightness Mode State
-     *
-     * @return state of display high brightness mode
-     */
-    HbmState getHbmState();
-
-    /**
-     * Query Display Local Brightness Enhancement Supported
-     *
-     * @return true if LBE is supported on this platform.
-     *         If false, LBE is not supported.
-     */
-    boolean isLbeSupported();
-
-    /**
-     * Set Display Local Brightness Enhancement
-     *
-     * @param state to be queried.
-     */
-    void setLbeState(in LbeState state);
-
-    /**
-     * Set Display Local Brightness Enhancement Ambient Light
-     *
-     * @param ambientLux the proper ambient light in Lux.
-     *        The value is equal to zero or above zero.
-     */
-    void setLbeAmbientLight(in int ambientLux);
-
-    /**
-     * Get Display Local Brightness Enhancement State
-     *
-     * @return state of display local brightness enhancement
-     */
-    LbeState getLbeState();
-
-    /**
-     * Query Display Local High Brightness Mode Supported
-     *
-     * @return true if LHBM is supported on this platform.
-     *         If false, LHBM is not supported.
-     */
-    boolean isLhbmSupported();
-
-    /**
-     * Set Display Local High Brightness Mode
-     *
-     * @param enabled true if LHBM should be enabled, false otherwise.
-     */
-    void setLhbmState(in boolean enabled);
-
-    /**
-     * Get Display Local High Brightness Mode State
-     *
-     * @return true if LHBM is ON, false otherwise.
-     */
-    boolean getLhbmState();
-
-    /**
-     * Set NativeHandle then server can fill the compensation
-     * image into the native handle
-     *
-     * @param native_handle share the NativeHandle from client.
-     * @param imageName the image name that define in client.
-     * @return errno of setCompensationImageHandle
-     */
-    int setCompensationImageHandle(in NativeHandle native_handle, in String imageName);
-}
diff --git a/display/com/google/hardware/pixel/display/LbeState.aidl b/display/com/google/hardware/pixel/display/LbeState.aidl
deleted file mode 100644
index 810dcc7..0000000
--- a/display/com/google/hardware/pixel/display/LbeState.aidl
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2020 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.
- */
-
-package com.google.hardware.pixel.display;
-
-@VintfStability
-@Backing(type="byte")
-enum LbeState {
-    OFF = 0,
-    NORMAL = 1,
-    HIGH_BRIGHTNESS = 2,
-    POWER_SAVE = 3,
-}
diff --git a/light/1.0/Android.bp b/light/1.0/Android.bp
index c2e0efb..560b3d1 100644
--- a/light/1.0/Android.bp
+++ b/light/1.0/Android.bp
@@ -1,14 +1,5 @@
 // This file is autogenerated by hidl-gen -Landroidbp.
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "hardware_google_interfaces_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["hardware_google_interfaces_license"],
-}
-
 hidl_interface {
     name: "hardware.google.light@1.0",
     root: "hardware.google",
diff --git a/light/1.0/default/Android.bp b/light/1.0/default/Android.bp
index af11738..7ca84cd 100644
--- a/light/1.0/default/Android.bp
+++ b/light/1.0/default/Android.bp
@@ -14,15 +14,6 @@
 // limitations under the License.
 //
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "hardware_google_interfaces_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["hardware_google_interfaces_license"],
-}
-
 cc_defaults {
     name: "hardware.google.light_defaults",
     relative_install_path: "hw",
diff --git a/light/1.1/Android.bp b/light/1.1/Android.bp
index 8fce321..3b6fdf9 100644
--- a/light/1.1/Android.bp
+++ b/light/1.1/Android.bp
@@ -1,14 +1,5 @@
 // This file is autogenerated by hidl-gen -Landroidbp.
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "hardware_google_interfaces_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["hardware_google_interfaces_license"],
-}
-
 hidl_interface {
     name: "hardware.google.light@1.1",
     root: "hardware.google",
diff --git a/light/1.1/default/Android.bp b/light/1.1/default/Android.bp
index 783e6c2..a6b1e5d 100644
--- a/light/1.1/default/Android.bp
+++ b/light/1.1/default/Android.bp
@@ -14,15 +14,6 @@
 // limitations under the License.
 //
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "hardware_google_interfaces_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["hardware_google_interfaces_license"],
-}
-
 cc_defaults {
     name: "hardware.google.light_defaults-1.1",
     relative_install_path: "hw",
diff --git a/media/c2/1.0/Android.bp b/media/c2/1.0/Android.bp
index 3838dc7..01da299 100644
--- a/media/c2/1.0/Android.bp
+++ b/media/c2/1.0/Android.bp
@@ -1,14 +1,5 @@
 // This file is autogenerated by hidl-gen -Landroidbp.
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "hardware_google_interfaces_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["hardware_google_interfaces_license"],
-}
-
 hidl_interface {
     name: "hardware.google.media.c2@1.0",
     root: "hardware.google",
@@ -32,3 +23,4 @@ hidl_interface {
     ],
     gen_java: false,
 }
+
diff --git a/power/Android.bp b/power/Android.bp
index d0972c0..5beaf51 100644
--- a/power/Android.bp
+++ b/power/Android.bp
@@ -1,12 +1,3 @@
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "hardware_google_interfaces_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["hardware_google_interfaces_license"],
-}
-
 aidl_interface {
     name: "pixel-power-ext",
     vendor_available: true,