Enable rmnet0 on the cuttlefish auto device.
All changed lines were taken from shared/phone/device.mk.
Unfortunately, even with this change there is only a
VIRTUAL_DEVICE_BOOT_COMPLETED message after manually clicking through
the auto installer flow. The message comes after hitting the final "Done."
During the time that it is stuck, logcat produces:
VIRTUAL_DEVICE_BOOT_PENDING: Connectivity
However, after going through the install flow the network is available and
reported as 4G on the top bar.
Bug: 110720387
Test: Ran cf_x86_64_auto-userdebug locally.
Change-Id: I17fb5caf22760fd8a0ffcfff699f459cf4fa01fb
Merged-In: I17fb5caf22760fd8a0ffcfff699f459cf4fa01fb
(cherry picked from commit 683b2b548c94ef8441c8662bcafbc71ce05173a3)
diff --git a/shared/auto/device.mk b/shared/auto/device.mk
index 4b9efd8..7d00f8d 100644
--- a/shared/auto/device.mk
+++ b/shared/auto/device.mk
@@ -17,6 +17,7 @@
################################################
# Begin GCE specific configurations
+$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
$(call inherit-product, device/google/cuttlefish/shared/device.mk)
################################################
@@ -26,6 +27,10 @@
packages/services/Car/car_product/init/init.bootstat.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw//init.bootstat.rc \
packages/services/Car/car_product/init/init.car.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw//init.car.rc
+
+PRODUCT_COPY_FILES += \
+ frameworks/native/data/etc/android.hardware.telephony.gsm.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.telephony.gsm.xml
+
# Auto core hardware permissions
PRODUCT_COPY_FILES += \
frameworks/native/data/etc/car_core_hardware.xml:system/etc/permissions/car_core_hardware.xml \
@@ -42,6 +47,17 @@
PRODUCT_PROPERTY_OVERRIDES += \
android.car.hvac.demo=true
+PRODUCT_PROPERTY_OVERRIDES += \
+ keyguard.no_require_sim=true \
+ rild.libpath=libvsoc-ril.so \
+ ro.cdma.home.operator.alpha=Android \
+ ro.cdma.home.operator.numeric=302780 \
+ ro.gsm.home.operator.alpha=Android \
+ ro.gsm.home.operator.numeric=302780 \
+ gsm.sim.operator.numeric=302780 \
+ gsm.sim.operator.alpha=Android \
+ gsm.sim.operator.iso-country=us
+
# vehicle HAL
PRODUCT_PACKAGES += android.hardware.automotive.vehicle@2.0-service
@@ -55,6 +71,16 @@
gps.vsoc_x86 \
android.hardware.gnss@1.0-impl
+# Cell network connection
+PRODUCT_PACKAGES += \
+ MmsService \
+ Phone \
+ PhoneService \
+ Telecom \
+ TeleService \
+ libvsoc-ril \
+ rild \
+
# DRM Properities
PRODUCT_PROPERTY_OVERRIDES += \
drm.service.enabled=true