Snap for 8730993 from 87b81800eb75fea95cfbb2d19791da01ed99151a to mainline-tzdata3-release
Change-Id: I34475cf7c7be672ac701449f18e4796af29925be
diff --git a/Android.bp b/Android.bp
index 8f0762d..d97115f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -2,7 +2,18 @@
}
package {
- default_applicable_licenses: ["Android-Apache-2.0"],
+ 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 {
diff --git a/bluetooth/bt_channel_avoidance/1.0/Android.bp b/bluetooth/bt_channel_avoidance/1.0/Android.bp
index 5c68b4b..5c7e4cc 100644
--- a/bluetooth/bt_channel_avoidance/1.0/Android.bp
+++ b/bluetooth/bt_channel_avoidance/1.0/Android.bp
@@ -1,6 +1,10 @@
package {
// See: http://go/android-license-faq
- default_applicable_licenses: ["Android-Apache-2.0"],
+ // 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 {
diff --git a/bluetooth/ccc/1.0/Android.bp b/bluetooth/ccc/1.0/Android.bp
index 178a046..bb789b5 100644
--- a/bluetooth/ccc/1.0/Android.bp
+++ b/bluetooth/ccc/1.0/Android.bp
@@ -1,6 +1,10 @@
package {
// See: http://go/android-license-faq
- default_applicable_licenses: ["Android-Apache-2.0"],
+ // 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 {
diff --git a/bluetooth/ccc/1.1/Android.bp b/bluetooth/ccc/1.1/Android.bp
deleted file mode 100644
index c4a8998..0000000
--- a/bluetooth/ccc/1.1/Android.bp
+++ /dev/null
@@ -1,19 +0,0 @@
-package {
- // See: http://go/android-license-faq
- default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
-hidl_interface {
- name: "hardware.google.bluetooth.ccc@1.1",
- root: "hardware.google",
- srcs: [
- "IBluetoothCcc.hal",
- "IBluetoothCccCallback.hal",
- "types.hal",
- ],
- interfaces: [
- "hardware.google.bluetooth.ccc@1.0",
- "android.hidl.base@1.0",
- ],
- gen_java: true,
-}
diff --git a/bluetooth/ccc/1.1/IBluetoothCcc.hal b/bluetooth/ccc/1.1/IBluetoothCcc.hal
deleted file mode 100644
index 775fb64..0000000
--- a/bluetooth/ccc/1.1/IBluetoothCcc.hal
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2022 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.1;
-
-import IBluetoothCccCallback;
-import @1.0::Address;
-import @1.0::LmpEventId;
-import @1.0::IBluetoothCcc;
-
-interface IBluetoothCcc extends @1.0::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_1_1(IBluetoothCccCallback callback,
- Address address, vec<LmpEventId> lmpEventIds);
-};
diff --git a/bluetooth/ccc/1.1/IBluetoothCccCallback.hal b/bluetooth/ccc/1.1/IBluetoothCccCallback.hal
deleted file mode 100644
index 9122699..0000000
--- a/bluetooth/ccc/1.1/IBluetoothCccCallback.hal
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2022 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.1;
-
-import types;
-import @1.0::Address;
-import @1.0::Direction;
-import @1.0::LmpEventId;
-import @1.0::IBluetoothCccCallback;
-
-interface IBluetoothCccCallback extends @1.0::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_1_1(Timestamp timestamp, Address address, Direction direction,
- LmpEventId lmpEventId, uint16_t connEventCounter);
-};
diff --git a/bluetooth/ccc/1.1/types.hal b/bluetooth/ccc/1.1/types.hal
deleted file mode 100644
index b8d4037..0000000
--- a/bluetooth/ccc/1.1/types.hal
+++ /dev/null
@@ -1,31 +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.1;
-
-/**
- * Generic structure to return the timestamp
- */
-struct Timestamp {
- /**
- * Timestamp in microsecond since system boot.
- */
- uint64_t systemTime;
- /**
- * Timestamp in microsecond since Bluetooth controller power up.
- */
- uint64_t bluetoothTime;
-};
diff --git a/bluetooth/ewp/1.0/Android.bp b/bluetooth/ewp/1.0/Android.bp
deleted file mode 100644
index a4c2e63..0000000
--- a/bluetooth/ewp/1.0/Android.bp
+++ /dev/null
@@ -1,16 +0,0 @@
-package {
- // See: http://go/android-license-faq
- default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
-hidl_interface {
- name: "hardware.google.bluetooth.ewp@1.0",
- root: "hardware.google",
- srcs: [
- "IBluetoothEwp.hal",
- ],
- interfaces: [
- "android.hidl.base@1.0",
- ],
- gen_java: true,
-}
\ No newline at end of file
diff --git a/bluetooth/ewp/1.0/IBluetoothEwp.hal b/bluetooth/ewp/1.0/IBluetoothEwp.hal
deleted file mode 100644
index 8355351..0000000
--- a/bluetooth/ewp/1.0/IBluetoothEwp.hal
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2022 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.ewp@1.0;
-
-interface IBluetoothEwp {
- /**
- * API to enable Bluetooth Le Audio offload debugging mechanism.
- *
- * This API must be invoked whenever maximum Bluetooth Tx power need to
- * changed for optimising performance purpose in SAR scenarios.
- *
- * @param event_mask The event mask for the EWP mechanism
- */
- oneway EnableEwp(uint16_t event_mask);
-
- /**
- * API to disable Bluetooth Le Audio offload debugging mechanism.
- */
- oneway DisableEwp();
-};
diff --git a/bluetooth/ext/1.0/Android.bp b/bluetooth/ext/1.0/Android.bp
deleted file mode 100644
index da64eed..0000000
--- a/bluetooth/ext/1.0/Android.bp
+++ /dev/null
@@ -1,16 +0,0 @@
-package {
- // See: http://go/android-license-faq
- default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
-hidl_interface {
- name: "hardware.google.bluetooth.ext@1.0",
- root: "hardware.google",
- srcs: [
- "IBluetoothExt.hal",
- ],
- interfaces: [
- "android.hidl.base@1.0",
- ],
- gen_java: true,
-}
diff --git a/bluetooth/ext/1.0/IBluetoothExt.hal b/bluetooth/ext/1.0/IBluetoothExt.hal
deleted file mode 100644
index 653903c..0000000
--- a/bluetooth/ext/1.0/IBluetoothExt.hal
+++ /dev/null
@@ -1,30 +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.ext@1.0;
-
-interface IBluetoothExt {
- /**
- * API to set Bluetooth HCI packet
- *
- * @param opcode : Bluetooth HCI command opcode to be send
- * @param params : Bluetooth HCI command paramethers for the opcode
- */
- setBluetoothCmdPacket(uint16_t opcode, vec<uint8_t> params) generates (bool value);
-};
diff --git a/bluetooth/sar/1.0/Android.bp b/bluetooth/sar/1.0/Android.bp
index e3194bc..e0b6b24 100644
--- a/bluetooth/sar/1.0/Android.bp
+++ b/bluetooth/sar/1.0/Android.bp
@@ -1,6 +1,10 @@
package {
// See: http://go/android-license-faq
- default_applicable_licenses: ["Android-Apache-2.0"],
+ // 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 {
diff --git a/bluetooth/sar/1.1/Android.bp b/bluetooth/sar/1.1/Android.bp
index 8282e87..05bdb09 100644
--- a/bluetooth/sar/1.1/Android.bp
+++ b/bluetooth/sar/1.1/Android.bp
@@ -1,6 +1,10 @@
package {
// See: http://go/android-license-faq
- default_applicable_licenses: ["Android-Apache-2.0"],
+ // 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 {
diff --git a/bluetooth/sar/1.2/Android.bp b/bluetooth/sar/1.2/Android.bp
deleted file mode 100644
index 623ec68..0000000
--- a/bluetooth/sar/1.2/Android.bp
+++ /dev/null
@@ -1,19 +0,0 @@
-package {
- // See: http://go/android-license-faq
- default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
-hidl_interface {
- name: "hardware.google.bluetooth.sar@1.2",
- root: "hardware.google",
- system_ext_specific: true,
- srcs: [
- "IBluetoothSar.hal",
- ],
- interfaces: [
- "android.hidl.base@1.0",
- "hardware.google.bluetooth.sar@1.0",
- "hardware.google.bluetooth.sar@1.1",
- ],
- gen_java: true,
-}
diff --git a/bluetooth/sar/1.2/IBluetoothSar.hal b/bluetooth/sar/1.2/IBluetoothSar.hal
deleted file mode 100644
index 8f48c03..0000000
--- a/bluetooth/sar/1.2/IBluetoothSar.hal
+++ /dev/null
@@ -1,34 +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.sar@1.2;
-import hardware.google.bluetooth.sar@1.1;
-
-interface IBluetoothSar extends @1.1::IBluetoothSar {
- /**
- * API to set Bluetooth RF regulation area
- *
- * This API must be invoke whenever the maximum Bluetooth Tx power needs to be changed due to
- * changing of located area.
- *
- * @param 2-ASCII area code representing a major regulation area(e.g. NA, EU, JP, or DF for
- * default.)
- */
- oneway setBluetoothAreaCode(uint8_t[2] areaCode);
-};
\ No newline at end of file
diff --git a/current.txt b/current.txt
index 3370cb9..210c9c7 100644
--- a/current.txt
+++ b/current.txt
@@ -1,11 +1,3 @@
-# HALs released in Android T
-
-5cac13157224d961fdfa4f27a03ba0de63d76997ef5e4705c4168f36cf5afe85 hardware.google.bluetooth.ccc@1.1::types
-4f61c104c6daff2fca7b4b946a6b7aefb5a5d7ae77f9ecf12170d498ac380cf7 hardware.google.bluetooth.ccc@1.1::IBluetoothCcc
-7d6b8268118c242880aee862de5baac357cb56698e374b1560b0ef6ef1099986 hardware.google.bluetooth.ccc@1.1::IBluetoothCccCallback
-55be275674153f9e967c37b57c50654ee8e7c6fc3591139b57216817a3fde27b hardware.google.bluetooth.ewp@1.0::IBluetoothEwp
-7e406108cc0a5e73a85b6b1da7a97494667ecd265c566e2b8ddf65abc44bb733 hardware.google.bluetooth.ext@1.0::IBluetoothExt
-
# HALs released in Android S
c34fdd31d56ca97aec45eb3eb9b47d62294335e1c880a7998013f2096825397d hardware.google.bluetooth.bt_channel_avoidance@1.0::IBTChannelAvoidance
diff --git a/display/Android.bp b/display/Android.bp
index 879ee15..5b63f65 100644
--- a/display/Android.bp
+++ b/display/Android.bp
@@ -1,6 +1,10 @@
package {
// See: http://go/android-license-faq
- default_applicable_licenses: ["Android-Apache-2.0"],
+ // 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 {
@@ -13,8 +17,7 @@
stability: "vintf",
imports: [
- "android.hardware.common-V2",
- "android.hardware.graphics.common-V3",
+ "android.hardware.common",
],
backend: {
@@ -25,50 +28,9 @@
enabled: false,
},
},
- versions_with_info: [
- {
- version: "1",
- imports: [
- "android.hardware.common-V2",
- "android.hardware.graphics.common-V3",
- ],
- },
- {
- version: "2",
- imports: [
- "android.hardware.common-V2",
- "android.hardware.graphics.common-V3",
- ],
- },
- {
- version: "3",
- imports: [
- "android.hardware.common-V2",
- "android.hardware.graphics.common-V3",
- ],
- },
- {
- version: "4",
- imports: [
- "android.hardware.common-V2",
- "android.hardware.graphics.common-V3",
- ],
- },
- {
- version: "5",
- imports: [
- "android.hardware.common-V2",
- "android.hardware.graphics.common-V3",
- ],
- },
- {
- version: "6",
- imports: [
- "android.hardware.common-V2",
- "android.hardware.graphics.common-V3",
- ],
- },
-
+ versions: [
+ "1",
+ "2",
+ "3",
],
-
}
diff --git a/display/aidl_api/com.google.hardware.pixel.display/4/.hash b/display/aidl_api/com.google.hardware.pixel.display/4/.hash
deleted file mode 100644
index 040c45e..0000000
--- a/display/aidl_api/com.google.hardware.pixel.display/4/.hash
+++ /dev/null
@@ -1 +0,0 @@
-83dc0187b6f66edcb32fc4f31a13b01baadee097
diff --git a/display/aidl_api/com.google.hardware.pixel.display/4/com/google/hardware/pixel/display/HbmState.aidl b/display/aidl_api/com.google.hardware.pixel.display/4/com/google/hardware/pixel/display/HbmState.aidl
deleted file mode 100644
index 76af8b3..0000000
--- a/display/aidl_api/com.google.hardware.pixel.display/4/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/4/com/google/hardware/pixel/display/IDisplay.aidl b/display/aidl_api/com.google.hardware.pixel.display/4/com/google/hardware/pixel/display/IDisplay.aidl
deleted file mode 100644
index 6192e85..0000000
--- a/display/aidl_api/com.google.hardware.pixel.display/4/com/google/hardware/pixel/display/IDisplay.aidl
+++ /dev/null
@@ -1,50 +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);
- int setMinIdleRefreshRate(in int fps);
- int setRefreshRateThrottle(in int delayMs);
-}
diff --git a/display/aidl_api/com.google.hardware.pixel.display/4/com/google/hardware/pixel/display/LbeState.aidl b/display/aidl_api/com.google.hardware.pixel.display/4/com/google/hardware/pixel/display/LbeState.aidl
deleted file mode 100644
index 6ad7fb7..0000000
--- a/display/aidl_api/com.google.hardware.pixel.display/4/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/5/.hash b/display/aidl_api/com.google.hardware.pixel.display/5/.hash
deleted file mode 100644
index e74ac0b..0000000
--- a/display/aidl_api/com.google.hardware.pixel.display/5/.hash
+++ /dev/null
@@ -1 +0,0 @@
-25eb3afc90d97d5a194c65a2273268973fdafdb9
diff --git a/display/aidl_api/com.google.hardware.pixel.display/5/com/google/hardware/pixel/display/HbmState.aidl b/display/aidl_api/com.google.hardware.pixel.display/5/com/google/hardware/pixel/display/HbmState.aidl
deleted file mode 100644
index 76af8b3..0000000
--- a/display/aidl_api/com.google.hardware.pixel.display/5/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/5/com/google/hardware/pixel/display/HistogramErrorCode.aidl b/display/aidl_api/com.google.hardware.pixel.display/5/com/google/hardware/pixel/display/HistogramErrorCode.aidl
deleted file mode 100644
index 5ace70d..0000000
--- a/display/aidl_api/com.google.hardware.pixel.display/5/com/google/hardware/pixel/display/HistogramErrorCode.aidl
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2022 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 HistogramErrorCode {
- NONE = 0,
- BAD_ROI = 1,
- BAD_WEIGHT = 2,
- BAD_POSITION = 3,
- BAD_PRIORITY = 4,
- ENABLE_HIST_ERROR = 5,
- DISABLE_HIST_ERROR = 6,
- BAD_HIST_DATA = 7,
- DRM_PLAYING = 8,
- DISPLAY_POWEROFF = 9,
-}
diff --git a/display/aidl_api/com.google.hardware.pixel.display/5/com/google/hardware/pixel/display/HistogramPos.aidl b/display/aidl_api/com.google.hardware.pixel.display/5/com/google/hardware/pixel/display/HistogramPos.aidl
deleted file mode 100644
index 20b8160..0000000
--- a/display/aidl_api/com.google.hardware.pixel.display/5/com/google/hardware/pixel/display/HistogramPos.aidl
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2022 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 HistogramPos {
- POST = 0,
- PRE = 1,
-}
diff --git a/display/aidl_api/com.google.hardware.pixel.display/5/com/google/hardware/pixel/display/IDisplay.aidl b/display/aidl_api/com.google.hardware.pixel.display/5/com/google/hardware/pixel/display/IDisplay.aidl
deleted file mode 100644
index 3a1cb3a..0000000
--- a/display/aidl_api/com.google.hardware.pixel.display/5/com/google/hardware/pixel/display/IDisplay.aidl
+++ /dev/null
@@ -1,51 +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);
- int setMinIdleRefreshRate(in int fps);
- int setRefreshRateThrottle(in int delayMs);
- com.google.hardware.pixel.display.HistogramErrorCode histogramSample(in android.hardware.graphics.common.Rect roi, in com.google.hardware.pixel.display.Weight weight, in com.google.hardware.pixel.display.HistogramPos pos, in com.google.hardware.pixel.display.Priority pri, out char[] histogrambuffer);
-}
diff --git a/display/aidl_api/com.google.hardware.pixel.display/5/com/google/hardware/pixel/display/LbeState.aidl b/display/aidl_api/com.google.hardware.pixel.display/5/com/google/hardware/pixel/display/LbeState.aidl
deleted file mode 100644
index 8c8b53e..0000000
--- a/display/aidl_api/com.google.hardware.pixel.display/5/com/google/hardware/pixel/display/LbeState.aidl
+++ /dev/null
@@ -1,42 +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,
- HIGH_BRIGHTNESS_ENHANCE = 4,
-}
diff --git a/display/aidl_api/com.google.hardware.pixel.display/5/com/google/hardware/pixel/display/Priority.aidl b/display/aidl_api/com.google.hardware.pixel.display/5/com/google/hardware/pixel/display/Priority.aidl
deleted file mode 100644
index 2b2c957..0000000
--- a/display/aidl_api/com.google.hardware.pixel.display/5/com/google/hardware/pixel/display/Priority.aidl
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2022 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 Priority {
- NORMAL = 0,
- PRIORITY = 1,
-}
diff --git a/display/aidl_api/com.google.hardware.pixel.display/5/com/google/hardware/pixel/display/Weight.aidl b/display/aidl_api/com.google.hardware.pixel.display/5/com/google/hardware/pixel/display/Weight.aidl
deleted file mode 100644
index e25da1e..0000000
--- a/display/aidl_api/com.google.hardware.pixel.display/5/com/google/hardware/pixel/display/Weight.aidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2022 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
-parcelable Weight {
- char weightR;
- char weightG;
- char weightB;
-}
diff --git a/display/aidl_api/com.google.hardware.pixel.display/6/.hash b/display/aidl_api/com.google.hardware.pixel.display/6/.hash
deleted file mode 100644
index 14c4c64..0000000
--- a/display/aidl_api/com.google.hardware.pixel.display/6/.hash
+++ /dev/null
@@ -1 +0,0 @@
-5ffdf5f92b086f84aa904e8133c0286d184403c7
diff --git a/display/aidl_api/com.google.hardware.pixel.display/6/com/google/hardware/pixel/display/HbmState.aidl b/display/aidl_api/com.google.hardware.pixel.display/6/com/google/hardware/pixel/display/HbmState.aidl
deleted file mode 100644
index 76af8b3..0000000
--- a/display/aidl_api/com.google.hardware.pixel.display/6/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/6/com/google/hardware/pixel/display/HistogramErrorCode.aidl b/display/aidl_api/com.google.hardware.pixel.display/6/com/google/hardware/pixel/display/HistogramErrorCode.aidl
deleted file mode 100644
index 5ace70d..0000000
--- a/display/aidl_api/com.google.hardware.pixel.display/6/com/google/hardware/pixel/display/HistogramErrorCode.aidl
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2022 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 HistogramErrorCode {
- NONE = 0,
- BAD_ROI = 1,
- BAD_WEIGHT = 2,
- BAD_POSITION = 3,
- BAD_PRIORITY = 4,
- ENABLE_HIST_ERROR = 5,
- DISABLE_HIST_ERROR = 6,
- BAD_HIST_DATA = 7,
- DRM_PLAYING = 8,
- DISPLAY_POWEROFF = 9,
-}
diff --git a/display/aidl_api/com.google.hardware.pixel.display/6/com/google/hardware/pixel/display/HistogramPos.aidl b/display/aidl_api/com.google.hardware.pixel.display/6/com/google/hardware/pixel/display/HistogramPos.aidl
deleted file mode 100644
index 20b8160..0000000
--- a/display/aidl_api/com.google.hardware.pixel.display/6/com/google/hardware/pixel/display/HistogramPos.aidl
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2022 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 HistogramPos {
- POST = 0,
- PRE = 1,
-}
diff --git a/display/aidl_api/com.google.hardware.pixel.display/6/com/google/hardware/pixel/display/IDisplay.aidl b/display/aidl_api/com.google.hardware.pixel.display/6/com/google/hardware/pixel/display/IDisplay.aidl
deleted file mode 100644
index 173b274..0000000
--- a/display/aidl_api/com.google.hardware.pixel.display/6/com/google/hardware/pixel/display/IDisplay.aidl
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2022 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);
- int setMinIdleRefreshRate(in int fps);
- int setRefreshRateThrottle(in int delayMs);
- com.google.hardware.pixel.display.HistogramErrorCode histogramSample(in android.hardware.graphics.common.Rect roi, in com.google.hardware.pixel.display.Weight weight, in com.google.hardware.pixel.display.HistogramPos pos, in com.google.hardware.pixel.display.Priority pri, out char[] histogrambuffer);
- com.google.hardware.pixel.display.PanelCalibrationStatus getPanelCalibrationStatus();
-}
diff --git a/display/aidl_api/com.google.hardware.pixel.display/6/com/google/hardware/pixel/display/LbeState.aidl b/display/aidl_api/com.google.hardware.pixel.display/6/com/google/hardware/pixel/display/LbeState.aidl
deleted file mode 100644
index 8c8b53e..0000000
--- a/display/aidl_api/com.google.hardware.pixel.display/6/com/google/hardware/pixel/display/LbeState.aidl
+++ /dev/null
@@ -1,42 +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,
- HIGH_BRIGHTNESS_ENHANCE = 4,
-}
diff --git a/display/aidl_api/com.google.hardware.pixel.display/6/com/google/hardware/pixel/display/PanelCalibrationStatus.aidl b/display/aidl_api/com.google.hardware.pixel.display/6/com/google/hardware/pixel/display/PanelCalibrationStatus.aidl
deleted file mode 100644
index 55271d0..0000000
--- a/display/aidl_api/com.google.hardware.pixel.display/6/com/google/hardware/pixel/display/PanelCalibrationStatus.aidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2022 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 PanelCalibrationStatus {
- ORIGINAL = 0,
- GOLDEN = 1,
- UNCALIBRATED = 2,
-}
diff --git a/display/aidl_api/com.google.hardware.pixel.display/6/com/google/hardware/pixel/display/Priority.aidl b/display/aidl_api/com.google.hardware.pixel.display/6/com/google/hardware/pixel/display/Priority.aidl
deleted file mode 100644
index 2b2c957..0000000
--- a/display/aidl_api/com.google.hardware.pixel.display/6/com/google/hardware/pixel/display/Priority.aidl
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2022 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 Priority {
- NORMAL = 0,
- PRIORITY = 1,
-}
diff --git a/display/aidl_api/com.google.hardware.pixel.display/6/com/google/hardware/pixel/display/Weight.aidl b/display/aidl_api/com.google.hardware.pixel.display/6/com/google/hardware/pixel/display/Weight.aidl
deleted file mode 100644
index e25da1e..0000000
--- a/display/aidl_api/com.google.hardware.pixel.display/6/com/google/hardware/pixel/display/Weight.aidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2022 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
-parcelable Weight {
- char weightR;
- char weightG;
- char weightB;
-}
diff --git a/display/aidl_api/com.google.hardware.pixel.display/current/com/google/hardware/pixel/display/HistogramErrorCode.aidl b/display/aidl_api/com.google.hardware.pixel.display/current/com/google/hardware/pixel/display/HistogramErrorCode.aidl
deleted file mode 100644
index 5ace70d..0000000
--- a/display/aidl_api/com.google.hardware.pixel.display/current/com/google/hardware/pixel/display/HistogramErrorCode.aidl
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2022 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 HistogramErrorCode {
- NONE = 0,
- BAD_ROI = 1,
- BAD_WEIGHT = 2,
- BAD_POSITION = 3,
- BAD_PRIORITY = 4,
- ENABLE_HIST_ERROR = 5,
- DISABLE_HIST_ERROR = 6,
- BAD_HIST_DATA = 7,
- DRM_PLAYING = 8,
- DISPLAY_POWEROFF = 9,
-}
diff --git a/display/aidl_api/com.google.hardware.pixel.display/current/com/google/hardware/pixel/display/HistogramPos.aidl b/display/aidl_api/com.google.hardware.pixel.display/current/com/google/hardware/pixel/display/HistogramPos.aidl
deleted file mode 100644
index 20b8160..0000000
--- a/display/aidl_api/com.google.hardware.pixel.display/current/com/google/hardware/pixel/display/HistogramPos.aidl
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2022 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 HistogramPos {
- POST = 0,
- PRE = 1,
-}
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
index 173b274..a4e0b06 100644
--- 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
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2022 The Android Open Source Project
+ * 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.
@@ -45,8 +45,4 @@
void setLhbmState(in boolean enabled);
boolean getLhbmState();
int setCompensationImageHandle(in android.hardware.common.NativeHandle native_handle, in String imageName);
- int setMinIdleRefreshRate(in int fps);
- int setRefreshRateThrottle(in int delayMs);
- com.google.hardware.pixel.display.HistogramErrorCode histogramSample(in android.hardware.graphics.common.Rect roi, in com.google.hardware.pixel.display.Weight weight, in com.google.hardware.pixel.display.HistogramPos pos, in com.google.hardware.pixel.display.Priority pri, out char[] histogrambuffer);
- com.google.hardware.pixel.display.PanelCalibrationStatus getPanelCalibrationStatus();
}
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
index 8c8b53e..6ad7fb7 100644
--- 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
@@ -38,5 +38,4 @@
NORMAL = 1,
HIGH_BRIGHTNESS = 2,
POWER_SAVE = 3,
- HIGH_BRIGHTNESS_ENHANCE = 4,
}
diff --git a/display/aidl_api/com.google.hardware.pixel.display/current/com/google/hardware/pixel/display/PanelCalibrationStatus.aidl b/display/aidl_api/com.google.hardware.pixel.display/current/com/google/hardware/pixel/display/PanelCalibrationStatus.aidl
deleted file mode 100644
index 55271d0..0000000
--- a/display/aidl_api/com.google.hardware.pixel.display/current/com/google/hardware/pixel/display/PanelCalibrationStatus.aidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2022 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 PanelCalibrationStatus {
- ORIGINAL = 0,
- GOLDEN = 1,
- UNCALIBRATED = 2,
-}
diff --git a/display/aidl_api/com.google.hardware.pixel.display/current/com/google/hardware/pixel/display/Priority.aidl b/display/aidl_api/com.google.hardware.pixel.display/current/com/google/hardware/pixel/display/Priority.aidl
deleted file mode 100644
index 2b2c957..0000000
--- a/display/aidl_api/com.google.hardware.pixel.display/current/com/google/hardware/pixel/display/Priority.aidl
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2022 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 Priority {
- NORMAL = 0,
- PRIORITY = 1,
-}
diff --git a/display/aidl_api/com.google.hardware.pixel.display/current/com/google/hardware/pixel/display/Weight.aidl b/display/aidl_api/com.google.hardware.pixel.display/current/com/google/hardware/pixel/display/Weight.aidl
deleted file mode 100644
index e25da1e..0000000
--- a/display/aidl_api/com.google.hardware.pixel.display/current/com/google/hardware/pixel/display/Weight.aidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2022 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
-parcelable Weight {
- char weightR;
- char weightG;
- char weightB;
-}
diff --git a/display/com/google/hardware/pixel/display/HistogramErrorCode.aidl b/display/com/google/hardware/pixel/display/HistogramErrorCode.aidl
deleted file mode 100644
index 9fad3a3..0000000
--- a/display/com/google/hardware/pixel/display/HistogramErrorCode.aidl
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2022 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 HistogramErrorCode {
- NONE = 0,
- BAD_ROI = 1,
- BAD_WEIGHT = 2,
- BAD_POSITION = 3,
- BAD_PRIORITY = 4,
- ENABLE_HIST_ERROR = 5,
- DISABLE_HIST_ERROR = 6,
- BAD_HIST_DATA = 7,
- DRM_PLAYING = 8,
- DISPLAY_POWEROFF = 9,
-}
diff --git a/display/com/google/hardware/pixel/display/HistogramPos.aidl b/display/com/google/hardware/pixel/display/HistogramPos.aidl
deleted file mode 100644
index 0f9c1b3..0000000
--- a/display/com/google/hardware/pixel/display/HistogramPos.aidl
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2022 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 HistogramPos {
- POST = 0,
- PRE = 1,
-}
diff --git a/display/com/google/hardware/pixel/display/IDisplay.aidl b/display/com/google/hardware/pixel/display/IDisplay.aidl
index b242b65..bb7ca4b 100644
--- a/display/com/google/hardware/pixel/display/IDisplay.aidl
+++ b/display/com/google/hardware/pixel/display/IDisplay.aidl
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2022 The Android Open Source Project
+ * 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.
@@ -15,15 +15,10 @@
*/
package com.google.hardware.pixel.display;
-import com.google.hardware.pixel.display.HistogramErrorCode;
+
import com.google.hardware.pixel.display.HbmState;
import com.google.hardware.pixel.display.LbeState;
-import com.google.hardware.pixel.display.Weight;
-import com.google.hardware.pixel.display.HistogramPos;
-import com.google.hardware.pixel.display.PanelCalibrationStatus;
-import com.google.hardware.pixel.display.Priority;
import android.hardware.common.NativeHandle;
-import android.hardware.graphics.common.Rect;
@VintfStability
interface IDisplay {
@@ -110,67 +105,4 @@
* @return errno of setCompensationImageHandle
*/
int setCompensationImageHandle(in NativeHandle native_handle, in String imageName);
-
- /**
- * Limit minimum idle display refresh rate. This is only relevant for displays
- * that can idle to a lower refresh rate than what is set by the platform. That is,
- * this API only controls kernel driver or panel self-driven refresh rate updates
- * it does not enforce the platform selected refresh rate (via setActiveConfig).
- *
- * @param fps The lowest refresh rate allowed. Setting to -1 means display
- * should not switch to lower refresh rate while idle.
- * @return errno if there was a problem with the request, zero if successful
- */
- int setMinIdleRefreshRate(in int fps);
-
- /**
- * Throttle refresh rate switching such that switches don't happen earlier
- * than the provided delay in milliseconds
- *
- * @param delayMs Amount of time in milliseconds to wait before switching to
- * a new refresh rate
- * @return errno if there was a problem with the request, zero if successful
- */
- int setRefreshRateThrottle(in int delayMs);
-
- /**
- * Collects the luma histograms of the content displayed on screen.
- *
- *
- * @param roi input from client, is the regions of interest in the frames that
- * should be sampled to collect the luma values of the roi
- * The sample represents the most-recently posted frames
- * @param weight input from client, the weights for red(weight_r), green(weight_g)
- * and blue(weight_b) colors, which is used in luma calculation formula.
- * The formula:
- * luma = weight_r * red + weight_g * green + weight_b * blue
- * The weight_r + weight_g + weight_b = 1024
- * @param pos histogram sample position, could be PRE_DQE or POST_DQE
- * @param priority input from client, is the priority of the call.
- * Priority is a num with two values {normal, priority}
- * @param histogrambuffer output from histogram server, is a 256 * 16 bits buffer to store the
- * luma counts return by the histogram hardware
- * @return error NONE = 0 upon success. Otherwise
- * BAD_ROI = 1 when roi passed in is not in correct format
- * BAD_WEIGHT = 2 when weight passed in is not in correct format
- * BAD_POSITION = 3 when the histogram sampling position is incorrect
- * BAD_PRIORITY = 4 when the priority input is not in correct format
- * ENABLE_HIST_ERROR = 5 when enable histgoram property error
- * DISABLE_HIST_ERROR = 6 when disable histgoram property error
- * BAD_HIST_DATA = 7 when there is error to collect histogram data
- * DRM_PLAYING = 8 when there is DRM content playing,
- * for content protection, no histogram data sampled
- * DISPLAY_POWEROFF = 9 when the display is power off,
- * no histogram data is sampled
- */
- HistogramErrorCode histogramSample(in Rect roi, in Weight weight, in HistogramPos pos,
- in Priority pri, out char[] histogrambuffer);
-
- /**
- * Get the panel calibration status.
- *
- * @return status of panel calibration.
- */
- PanelCalibrationStatus getPanelCalibrationStatus();
-
}
diff --git a/display/com/google/hardware/pixel/display/LbeState.aidl b/display/com/google/hardware/pixel/display/LbeState.aidl
index e512104..810dcc7 100644
--- a/display/com/google/hardware/pixel/display/LbeState.aidl
+++ b/display/com/google/hardware/pixel/display/LbeState.aidl
@@ -22,6 +22,5 @@
OFF = 0,
NORMAL = 1,
HIGH_BRIGHTNESS = 2,
- POWER_SAVE =3,
- HIGH_BRIGHTNESS_ENHANCE = 4,
+ POWER_SAVE = 3,
}
diff --git a/display/com/google/hardware/pixel/display/PanelCalibrationStatus.aidl b/display/com/google/hardware/pixel/display/PanelCalibrationStatus.aidl
deleted file mode 100644
index f55e730..0000000
--- a/display/com/google/hardware/pixel/display/PanelCalibrationStatus.aidl
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2022 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 PanelCalibrationStatus {
- ORIGINAL = 0,
- GOLDEN = 1,
- UNCALIBRATED = 2,
-}
diff --git a/display/com/google/hardware/pixel/display/Priority.aidl b/display/com/google/hardware/pixel/display/Priority.aidl
deleted file mode 100644
index c423086..0000000
--- a/display/com/google/hardware/pixel/display/Priority.aidl
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2022 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 Priority {
- NORMAL = 0,
- PRIORITY = 1,
-}
diff --git a/display/com/google/hardware/pixel/display/Weight.aidl b/display/com/google/hardware/pixel/display/Weight.aidl
deleted file mode 100644
index 53659e8..0000000
--- a/display/com/google/hardware/pixel/display/Weight.aidl
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2022 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
-parcelable Weight {
- char weightR;
- char weightG;
- char weightB;
-}
diff --git a/light/1.0/Android.bp b/light/1.0/Android.bp
index 56ed058..c2e0efb 100644
--- a/light/1.0/Android.bp
+++ b/light/1.0/Android.bp
@@ -2,7 +2,11 @@
package {
// See: http://go/android-license-faq
- default_applicable_licenses: ["Android-Apache-2.0"],
+ // 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 {
diff --git a/light/1.0/default/Android.bp b/light/1.0/default/Android.bp
index 96e12a3..af11738 100644
--- a/light/1.0/default/Android.bp
+++ b/light/1.0/default/Android.bp
@@ -16,7 +16,11 @@
package {
// See: http://go/android-license-faq
- default_applicable_licenses: ["Android-Apache-2.0"],
+ // 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 {
diff --git a/light/1.1/Android.bp b/light/1.1/Android.bp
index bf9f1f8..8fce321 100644
--- a/light/1.1/Android.bp
+++ b/light/1.1/Android.bp
@@ -2,7 +2,11 @@
package {
// See: http://go/android-license-faq
- default_applicable_licenses: ["Android-Apache-2.0"],
+ // 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 {
diff --git a/light/1.1/default/Android.bp b/light/1.1/default/Android.bp
index 0b5be36..783e6c2 100644
--- a/light/1.1/default/Android.bp
+++ b/light/1.1/default/Android.bp
@@ -16,7 +16,11 @@
package {
// See: http://go/android-license-faq
- default_applicable_licenses: ["Android-Apache-2.0"],
+ // 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 {
diff --git a/media/c2/1.0/Android.bp b/media/c2/1.0/Android.bp
index 62d306f..3838dc7 100644
--- a/media/c2/1.0/Android.bp
+++ b/media/c2/1.0/Android.bp
@@ -2,7 +2,11 @@
package {
// See: http://go/android-license-faq
- default_applicable_licenses: ["Android-Apache-2.0"],
+ // 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 {
diff --git a/power/Android.bp b/power/Android.bp
index 41269ba..d0972c0 100644
--- a/power/Android.bp
+++ b/power/Android.bp
@@ -1,6 +1,10 @@
package {
// See: http://go/android-license-faq
- default_applicable_licenses: ["Android-Apache-2.0"],
+ // 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 {
