Snap for 8877244 from 19b932eb41 to tm-qpr1-release

Change-Id: I3425ee7d45e0ffaba7ba6618209094c9b7db444c

device-common.mk

@@ -14,13 +14,17 @@
 # limitations under the License.
 #
 
+ifneq ($(BOARD_WITHOUT_RADIO),true)
 -include vendor/google_devices/gs201/proprietary/telephony/device-vendor.mk
+endif
 include device/google/gs201/device.mk
 include device/google/gs101/tts/voice_packs.mk
 
+ifneq ($(BOARD_WITHOUT_RADIO),true)
 # Telephony
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.telephony.carrierlock.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.telephony.carrierlock.xml
+endif
 
 # Android Verified Boot
 PRODUCT_COPY_FILES += \

device.mk

@@ -60,9 +60,11 @@ LOCAL_KERNEL := $(TARGET_KERNEL_DIR)/Image.lz4
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
 	ro.oem_unlock_supported=1
 
+ifneq ($(BOARD_WITHOUT_RADIO),true)
 # Include vendor telephony soong namespace
 PRODUCT_SOONG_NAMESPACES += \
 	vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)
+endif
 
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
 #Set IKE logs to verbose for WFC
@@ -848,6 +850,7 @@ PRODUCT_PACKAGES += \
 	calliope_iva.bin \
 	vts.bin
 
+ifneq ($(BOARD_WITHOUT_RADIO),true)
 # This will be called only if IMSService is building with source code for dev branches.
 $(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)/shannon-ims/device-vendor.mk)
 
@@ -858,6 +861,7 @@ PRODUCT_PACKAGES_DEBUG += \
 	TestRcsApp
 
 PRODUCT_PACKAGES += ShannonRcs
+endif
 
 # Boot Control HAL
 PRODUCT_PACKAGES += \

powerstats/Gs201CommonDataProviders.cpp

@@ -632,10 +632,9 @@ void addPixelStateResidencyDataProvider(std::shared_ptr<PowerStats> p) {
     p->addStateResidencyDataProvider(std::move(pixelSdp));
 }
 
-void addGs201CommonDataProviders(std::shared_ptr<PowerStats> p) {
+void addCommonDataProviders(std::shared_ptr<PowerStats> p) {
     setEnergyMeter(p);
 
-    addPixelStateResidencyDataProvider(p);
     addAoC(p);
     addDvfsStats(p);
     addSoC(p);
@@ -655,6 +654,15 @@ void addGs201CommonDataProviders(std::shared_ptr<PowerStats> p) {
     addPlaceholderEnergyConsumers(p);
 }
 
+void addGs201CommonDataProviders(std::shared_ptr<PowerStats> p) {
+    addCommonDataProviders(p);
+    addPixelStateResidencyDataProvider(p);
+}
+
+void addGs201CommonDataProvidersQc(std::shared_ptr<PowerStats> p) {
+    addCommonDataProviders(p);
+}
+
 void addNFC(std::shared_ptr<PowerStats> p, const std::string& path) {
     const GenericStateResidencyDataProvider::StateResidencyConfig nfcStateConfig = {
         .entryCountSupported = true,

powerstats/include/Gs201CommonDataProviders.h

@@ -21,5 +21,5 @@
 using aidl::android::hardware::power::stats::PowerStats;
 
 void addGs201CommonDataProviders(std::shared_ptr<PowerStats> p);
-
+void addGs201CommonDataProvidersQc(std::shared_ptr<PowerStats> p);
 void addNFC(std::shared_ptr<PowerStats> p, const std::string& path);