From ff3415e5c54113bdf9a18f5b970330de9b0ebfd0 Mon Sep 17 00:00:00 2001
From: Jayachandran C <jayachandranc@google.com>
Date: Tue, 28 Apr 2020 21:48:19 -0700
Subject: [PATCH] Move ro.telephony.default_network to vendor partition

This fixes GSI image overriding the default value

Bug: 153852350
Test: Manually verified after flashing the GSI image
Change-Id: I70aa7ffe2c0ee7368fa713f8798b7704f9a0db86
---
 device.mk   | 3 +++
 system.prop | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/device.mk b/device.mk
index 8349c68d..2b2d95fe 100755
--- a/device.mk
+++ b/device.mk
@@ -674,6 +674,9 @@ PRODUCT_PACKAGES += \
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.telephony.default_cdma_sub=0
 
+# Set network mode to Global by default and no DSDS/DSDA
+PRODUCT_PROPERTY_OVERRIDES += ro.telephony.default_network=10
+
 # Add an extra 10% saturation to display colors
 PRODUCT_PROPERTY_OVERRIDES += \
     persist.sys.sf.color_saturation=1.1
diff --git a/system.prop b/system.prop
index 20d70340..6a88ea97 100644
--- a/system.prop
+++ b/system.prop
@@ -10,9 +10,6 @@ persist.rild.nitz_short_ons_2=
 persist.rild.nitz_short_ons_3=
 DEVICE_PROVISIONED=1
 
-# Set network mode to Global by default and no DSDS/DSDA
-ro.telephony.default_network=10
-
 debug.sf.hw=1
 debug.gralloc.enable_fb_ubwc=1