From eb922de0a5713b5dd2224fae7dadc5ffe47864ad Mon Sep 17 00:00:00 2001 From: Ulyana Trafimovich Date: Tue, 23 Feb 2021 17:14:58 +0000 Subject: Revert "Adding aidl file to share deviceProductInfo constants bw..." Revert "Changes in tvsystem/ DeviceProductInfo to mirror changes..." Revert "Adding new CTS test for the API display#getDeviceProductInfo" Revert submission 13552775-expose DisplayInfo.deviceProductInfo Reason for revert: broken test android.compat.sjp.cts.StrictJavaPackagesTest#testBootClassPathAndSystemServerClasspath_nonDuplicateClasses on git_sc-dev on cf_x86_64_phone-userdebug at 7162420 Bug: 181021245 Reverted Changes: Id6767127f:Adding aidl file to share deviceProductInfo consta... I6959d2829:Adding public API to expose DisplayInfo.deviceProd... I720dbfe84:Adding new CTS test for the API display#getDeviceP... I6c726e12c:Changes in tvsystem/ DeviceProductInfo to mirror c... Change-Id: I6f4997ec3ff2ee540fe3466d5ef25aace4224a36 --- .../display/IDeviceProductInfoConstants.aidl | 32 ---------------------- 1 file changed, 32 deletions(-) delete mode 100644 aidl/gui/android/hardware/display/IDeviceProductInfoConstants.aidl (limited to 'aidl/gui') diff --git a/aidl/gui/android/hardware/display/IDeviceProductInfoConstants.aidl b/aidl/gui/android/hardware/display/IDeviceProductInfoConstants.aidl deleted file mode 100644 index 7cc272adff..0000000000 --- a/aidl/gui/android/hardware/display/IDeviceProductInfoConstants.aidl +++ /dev/null @@ -1,32 +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 android.hardware.display; - -/** @hide */ -interface IDeviceProductInfoConstants { - /** The device connection to the display sink is unknown. */ - const int CONNECTION_TO_SINK_UNKNOWN = 0; - - /** The device is built-in in the display sink. */ - const int CONNECTION_TO_SINK_BUILT_IN = 1; - - /** The device is directly connected to the display sink. */ - const int CONNECTION_TO_SINK_DIRECT = 2; - - /** The device is transitively connected to the display sink. */ - const int CONNECTION_TO_SINK_TRANSITIVE = 3; -} \ No newline at end of file -- cgit v1.2.3-59-g8ed1b