From 98d4a789893128856fb1780846faab6339bccd3b Mon Sep 17 00:00:00 2001 From: Tanuj Tekriwal Date: Thu, 26 Sep 2024 08:10:16 +0000 Subject: [PATCH] Revert "Enable Android Desktop mode by default" This reverts commit 0e89b8e41107c3f9c5a795a3a183d9a2c29fcec9. Tracked-On: OAM-125619 Signed-off-by: Tanuj Tekriwal --- groups/device-type/tablet/option.spec | 2 +- groups/device-type/tablet/product.mk | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/groups/device-type/tablet/option.spec b/groups/device-type/tablet/option.spec index e12503f21..45abd1bde 100644 --- a/groups/device-type/tablet/option.spec +++ b/groups/device-type/tablet/option.spec @@ -1,2 +1,2 @@ [defaults] -pc_core_hardware_path = frameworks/native/data/etc +tablet_core_hardware_path = frameworks/native/data/etc diff --git a/groups/device-type/tablet/product.mk b/groups/device-type/tablet/product.mk index 2484d6564..4fc78371c 100644 --- a/groups/device-type/tablet/product.mk +++ b/groups/device-type/tablet/product.mk @@ -1,8 +1,5 @@ -PRODUCT_CHARACTERISTICS := pc +PRODUCT_CHARACTERISTICS := tablet PRODUCT_COPY_FILES += \ - {{{pc_core_hardware_path}}}/pc_core_hardware.xml:vendor/etc/permissions/pc_core_hardware.xml - -PRODUCT_COPY_FILES += \ - frameworks/native/data/etc/android.software.freeform_window_management.xml:vendor/etc/permissions/android.software.freeform_window_management.xml + {{{tablet_core_hardware_path}}}/tablet_core_hardware.xml:vendor/etc/permissions/tablet_core_hardware.xml