From 7cb45f297897659beaf7826a1636cedafd7113c6 Mon Sep 17 00:00:00 2001 From: Rakesh Raghava Date: Thu, 22 Feb 2024 04:00:23 +0000 Subject: [PATCH 1/2] Removed ImsMedia from zuma - PixelImsMedia is used in zuma, so aosp ImsMedia is removed Bug: 325148061 Test: mm Change-Id: Ifcb93dfa9f06c08d34a7816c2a001f7115fc3baa --- device.mk | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/device.mk b/device.mk index e3818ced..94dee0ed 100644 --- a/device.mk +++ b/device.mk @@ -910,21 +910,6 @@ PRODUCT_PACKAGES += ShannonIms PRODUCT_PACKAGES += ShannonRcs -ifeq (,$(filter aosp_% factory_%,$(TARGET_PRODUCT))) -#ImsMediaAoc library -FEATURE_TYPE := oem_audio -SOONG_CONFIG_NAMESPACES += audio_lib -SOONG_CONFIG_audio_lib += \ - audio_type - -SOONG_CONFIG_audio_lib_audio_type := $(FEATURE_TYPE) -endif - -# ImsMedia -PRODUCT_PACKAGES += \ - ImsMediaService \ - libimsmedia - # Exynos RIL and telephony # Multi SIM(DSDS) SIM_COUNT := 2 From 009c900677871388b7f2fcc3ba8d76800692313f Mon Sep 17 00:00:00 2001 From: Liana Kazanova Date: Tue, 27 Feb 2024 21:11:56 +0000 Subject: [PATCH 2/2] Revert "Add sepolicy include to zuma." Revert submission 26288713-twoshay-sepolicy-24 Reason for revert: DroidMonitor: Potential culprit for b/327235315 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted. Bug:327235315 Reverted changes: /q/submissionid:26288713-twoshay-sepolicy-24 Change-Id: I71fa628c86d239b53fdd80a7b124daf7b66e2ca0 --- device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device.mk b/device.mk index c1671f92..e3818ced 100644 --- a/device.mk +++ b/device.mk @@ -1192,8 +1192,8 @@ include device/google/gs-common/pixel_ril/ril.mk endif # Touch service +include hardware/google/pixel/input/twoshay.mk include device/google/gs-common/touch/twoshay/aidl_zuma.mk -include device/google/gs-common/touch/twoshay/twoshay.mk # Allow longer timeout for incident report generation in bugreport # Overriding in /product partition instead of /vendor intentionally,