diff --git a/aosp_comet.mk b/aosp_comet.mk index 4990bed..a6a1ca3 100644 --- a/aosp_comet.mk +++ b/aosp_comet.mk @@ -14,12 +14,12 @@ # limitations under the License. # -TARGET_LINUX_KERNEL_VERSION := 5.15 +TARGET_LINUX_KERNEL_VERSION := 6.1 USE_SWIFTSHADER := true BOARD_USES_SWIFTSHADER := true -$(call inherit-product, device/google/zuma/aosp_common.mk) +$(call inherit-product, device/google/zumapro/aosp_common.mk) $(call inherit-product, device/google/comet/device-comet.mk) PRODUCT_NAME := aosp_comet diff --git a/comet/BoardConfig.mk b/comet/BoardConfig.mk index 072875a..1e8b8d9 100644 --- a/comet/BoardConfig.mk +++ b/comet/BoardConfig.mk @@ -19,7 +19,7 @@ TARGET_SCREEN_DENSITY := 420 BOARD_USES_GENERIC_AUDIO := true USES_DEVICE_GOOGLE_COMET := true -include device/google/zuma/BoardConfig-common.mk --include vendor/google_devices/zuma/prebuilts/BoardConfigVendor.mk +include device/google/zumapro/BoardConfig-common.mk +-include vendor/google_devices/zumapro/prebuilts/BoardConfigVendor.mk include device/google/comet-sepolicy/comet-sepolicy.mk include device/google/comet/wifi/BoardConfig-wifi.mk diff --git a/conf/init.comet.rc b/conf/init.comet.rc index 1d31984..067b985 100644 --- a/conf/init.comet.rc +++ b/conf/init.comet.rc @@ -1,5 +1,5 @@ # Comet specific init.rc -import /vendor/etc/init/hw/init.zuma.rc +import /vendor/etc/init/hw/init.zumapro.rc on init && property:ro.vendor.factory=1 import /vendor/etc/init/hw/init.factory.rc diff --git a/device-comet.mk b/device-comet.mk index 5ac6a76..769d4a2 100644 --- a/device-comet.mk +++ b/device-comet.mk @@ -19,12 +19,12 @@ TARGET_BOARD_KERNEL_HEADERS := device/google/comet-kernel/kernel-headers TARGET_RECOVERY_DEFAULT_ROTATION := ROTATION_RIGHT $(call inherit-product-if-exists, vendor/google_devices/comet/prebuilts/device-vendor-comet.mk) -$(call inherit-product-if-exists, vendor/google_devices/zuma/prebuilts/device-vendor.mk) -$(call inherit-product-if-exists, vendor/google_devices/zuma/proprietary/device-vendor.mk) +$(call inherit-product-if-exists, vendor/google_devices/zumapro/prebuilts/device-vendor.mk) +$(call inherit-product-if-exists, vendor/google_devices/zumapro/proprietary/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/comet/proprietary/comet/device-vendor-comet.mk) $(call inherit-product-if-exists, vendor/qorvo/uwb/qm35-hal/Device.mk) -include device/google/zuma/device-shipping-common.mk +include device/google/zumapro/device-shipping-common.mk include device/google/comet/audio/comet/audio-tables.mk include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml index e107042..d9fe72c 100644 --- a/device_framework_matrix_product.xml +++ b/device_framework_matrix_product.xml @@ -1,4 +1,4 @@ - + vendor.samsung.hardware.gnss hwbinder diff --git a/factory_comet.mk b/factory_comet.mk index e40f14d..1a3a07b 100644 --- a/factory_comet.mk +++ b/factory_comet.mk @@ -14,9 +14,9 @@ # limitations under the License. # -TARGET_LINUX_KERNEL_VERSION := 5.15 +TARGET_LINUX_KERNEL_VERSION := 6.1 -$(call inherit-product, device/google/zuma/factory_common.mk) +$(call inherit-product, device/google/zumapro/factory_common.mk) $(call inherit-product, device/google/comet/device-comet.mk) include device/google/comet/audio/comet/factory-audio-tables.mk diff --git a/location/gnssd/manifest.xml b/location/gnssd/manifest.xml index 2743146..e2863ee 100644 --- a/location/gnssd/manifest.xml +++ b/location/gnssd/manifest.xml @@ -1,4 +1,4 @@ - + vendor.samsung.hardware.gnss hwbinder diff --git a/powerstats/comet/Android.bp b/powerstats/comet/Android.bp index 2ad3cdd..7079df7 100644 --- a/powerstats/comet/Android.bp +++ b/powerstats/comet/Android.bp @@ -15,7 +15,7 @@ soong_namespace { imports: [ "hardware/google/pixel", - "device/google/zuma/powerstats", + "device/google/zumapro/powerstats", ] } @@ -37,6 +37,6 @@ cc_binary { ], shared_libs: [ - "android.hardware.power.stats-impl.zuma", + "android.hardware.power.stats-impl.zumapro", ], } diff --git a/powerstats/comet/service.cpp b/powerstats/comet/service.cpp index 342d6ca..2cbcca3 100644 --- a/powerstats/comet/service.cpp +++ b/powerstats/comet/service.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include @@ -35,11 +35,11 @@ void addDisplay(std::shared_ptr p) { // Add display residency stats std::vector states = { "Off", - "LP: 1080x2340@30", - "On: 1080x2340@60", - "On: 1080x2340@90", - "HBM: 1080x2340@60", - "HBM: 1080x2340@90"}; + "LP: 1440x3120@30", + "On: 1440x3120@60", + "On: 1440x3120@90", + "HBM: 1440x3120@60", + "HBM: 1440x3120@90"}; p->addStateResidencyDataProvider(std::make_unique( "Display", @@ -47,13 +47,11 @@ void addDisplay(std::shared_ptr p) { states)); // Add display energy consumer - p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterAndEntityConsumer( - p, EnergyConsumerType::DISPLAY, "display", {"PPVAR_VSYS_PWR_DISP"}, "Display", - {{"LP: 1080x2340@30", 1}, - {"On: 1080x2340@60", 2}, - {"On: 1080x2340@90", 3}, - {"HBM: 1080x2340@60", 4}, - {"HBM: 1080x2340@90", 5}})); + p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterConsumer( + p, + EnergyConsumerType::DISPLAY, + "Display", + {"VSYS_PWR_DISPLAY"})); } int main() { @@ -64,7 +62,7 @@ int main() { std::shared_ptr p = ndk::SharedRefBase::make(); - addZumaCommonDataProviders(p); + addZumaProCommonDataProviders(p); addDisplay(p); const std::string instance = std::string() + PowerStats::descriptor + "/default";