surnia: Abandon TARGET_UNIFIED_DEVICE flagHEADn7.1

 * Override the unified properties using vendor init

Change-Id: Id04671dfa32c5480000dcbe4e2d9aae3a81402b9

1 files changed, 39 insertions, 39 deletions

diff --git a/init/init_surnia.cpp b/init/init_surnia.cpp
index 22e44ed..1758fc1 100644
--- a/init/init_surnia.cpp
+++ b/init/init_surnia.cpp
@@ -70,11 +70,11 @@ void vendor_load_properties()
     if (radio == "0x2") {
         /* XT1529 */
         cdma_properties();
-        property_set("ro.product.model", "XT1529");
-        property_set("ro.product.device", "surnia_cdma");
-        property_set("ro.build.product", "surnia_cdma");
-        property_set("ro.build.description", "surnia_verizon-user 5.1 LPI23.29-17.5 5 release-keys");
-        property_set("ro.build.fingerprint", "motorola/surnia_verizon/surnia_cdma:5.1/LPI23.29-17.5/5:user/release-keys");
+        property_override("ro.product.model", "XT1529");
+        property_override("ro.product.device", "surnia_cdma");
+        property_override("ro.build.product", "surnia_cdma");
+        property_override("ro.build.description", "surnia_verizon-user 5.1 LPI23.29-17.5 5 release-keys");
+        property_override("ro.build.fingerprint", "motorola/surnia_verizon/surnia_cdma:5.1/LPI23.29-17.5/5:user/release-keys");
         property_set("ro.mot.build.customerid", "verizon");
         property_set("ro.telephony.get_imsi_from_sim", "true");
         property_set("ro.com.google.clientidbase.am", "android-verizon");
@@ -84,39 +84,39 @@ void vendor_load_properties()
     } else if (radio == "0x1") {
         /* XT1527 */
         gsm_properties(false);
-        property_set("ro.product.model", "XT1527");
-        property_set("ro.product.device", "surnia_umts");
-        property_set("ro.build.product", "surnia_umts");
-        property_set("ro.build.description", "surnia_retus-user 5.0.2 LXI22.50-24.1 1 release-keys");
-        property_set("ro.build.fingerprint", "motorola/surnia_retus/surnia_umts:5.0.2/LXI22.50-24.1/1:user/release-keys");
+        property_override("ro.product.model", "XT1527");
+        property_override("ro.product.device", "surnia_umts");
+        property_override("ro.build.product", "surnia_umts");
+        property_override("ro.build.description", "surnia_retus-user 5.0.2 LXI22.50-24.1 1 release-keys");
+        property_override("ro.build.fingerprint", "motorola/surnia_retus/surnia_umts:5.0.2/LXI22.50-24.1/1:user/release-keys");
         property_set("ro.mot.build.customerid", "retus");
     } else if (radio == "0x3") {
         /* XT1526 */
         cdma_properties();
         if (carrier == "sprint") {
             if (fsg == "boost") {
-                property_set("ro.build.description", "surnia_boost-user 5.0.2 LXI22.50-14.8 30 release-keys");
-                property_set("ro.build.fingerprint", "motorola/surnia_boost/surnia_cdma:5.0.2/LXI22.50-14.8/30:user/release-keys");
+                property_override("ro.build.description", "surnia_boost-user 5.0.2 LXI22.50-14.8 30 release-keys");
+                property_override("ro.build.fingerprint", "motorola/surnia_boost/surnia_cdma:5.0.2/LXI22.50-14.8/30:user/release-keys");
 	        property_set("ro.cdma.home.operator.numeric", "311870");
 	        property_set("ro.cdma.home.operator.alpha", "Boost Mobile");
             } else {
-                property_set("ro.build.description", "surnia_sprint-user 5.0.2 LXI22.50-14.8 30 release-keys");
-                property_set("ro.build.fingerprint", "motorola/surnia_sprint/surnia_cdma:5.0.2/LXI22.50-14.8/30:user/release-keys");
+                property_override("ro.build.description", "surnia_sprint-user 5.0.2 LXI22.50-14.8 30 release-keys");
+                property_override("ro.build.fingerprint", "motorola/surnia_sprint/surnia_cdma:5.0.2/LXI22.50-14.8/30:user/release-keys");
             }
             property_set("ro.fsg-id", "sprint");
             property_set("ro.carrier", "sprint");
             property_set("ro.mot.build.customerid ","sprint");
         } else {
-            property_set("ro.build.description", "surnia_usc-user 5.0.2 LXI22.50-14.8 30 release-keys");
-            property_set("ro.build.fingerprint", "motorola/surnia_usc/surnia_cdma:5.0.2/LXI22.50-14.8/30:user/release-keys");
+            property_override("ro.build.description", "surnia_usc-user 5.0.2 LXI22.50-14.8 30 release-keys");
+            property_override("ro.build.fingerprint", "motorola/surnia_usc/surnia_cdma:5.0.2/LXI22.50-14.8/30:user/release-keys");
             property_set("ro.mot.build.customerid", "usc");
             property_set("ro.cdma.home.operator.alpha", "U.S. Cellular");
             property_set("ro.cdma.home.operator.numeric", "311580");
             property_set("ro.fsg-id", "usc");
         }
-        property_set("ro.product.model", "XT1526");
-        property_set("ro.product.device", "surnia_cdma");
-        property_set("ro.build.product", "surnia_cdma");
+        property_override("ro.product.model", "XT1526");
+        property_override("ro.product.device", "surnia_cdma");
+        property_override("ro.build.product", "surnia_cdma");
         property_set("persist.radio.0x9e_not_callname","1");
         property_set("persist.radio.lifecalls", "0");
         property_set("persist.radio.lifetimer", "0");
@@ -126,38 +126,38 @@ void vendor_load_properties()
     } else if (radio == "0x4") {
         /* XT1524 */
         gsm_properties(false);
-        property_set("ro.product.model", "XT1524");
-        property_set("ro.product.device", "surnia_umts");
-        property_set("ro.build.product", "surnia_umts");
-        property_set("ro.build.description", "surnia_reteu-user 5.0.2 LXI22.50-24.1 2 release-keys");
-        property_set("ro.build.fingerprint", "motorola/surnia_reteu/surnia_umts:5.0.2/LXI22.50-24.1/2:user/release-keys");
+        property_override("ro.product.model", "XT1524");
+        property_override("ro.product.device", "surnia_umts");
+        property_override("ro.build.product", "surnia_umts");
+        property_override("ro.build.description", "surnia_reteu-user 5.0.2 LXI22.50-24.1 2 release-keys");
+        property_override("ro.build.fingerprint", "motorola/surnia_reteu/surnia_umts:5.0.2/LXI22.50-24.1/2:user/release-keys");
         property_set("ro.mot.build.customerid", "reteuall");
     } else if (radio == "0x6") {
         /* XT1523 */
         gsm_properties(true);
-        property_set("ro.product.model", "XT1523");
-        property_set("ro.product.device", "surnia_udstv");
-        property_set("ro.build.product", "surnia_udstv");
-        property_set("ro.build.description", "surnia_retbr_dstv-user 5.0.2 LXI22.50-24.1 3 release-keys");
-        property_set("ro.build.fingerprint", "motorola/surnia_retbr_dstv/surnia_udstv:5.0.2/LXI22.50-24.1/3:user/release-keys");
+        property_override("ro.product.model", "XT1523");
+        property_override("ro.product.device", "surnia_udstv");
+        property_override("ro.build.product", "surnia_udstv");
+        property_override("ro.build.description", "surnia_retbr_dstv-user 5.0.2 LXI22.50-24.1 3 release-keys");
+        property_override("ro.build.fingerprint", "motorola/surnia_retbr_dstv/surnia_udstv:5.0.2/LXI22.50-24.1/3:user/release-keys");
         property_set("ro.mot.build.customerid", "retbr");
     } else if (radio == "0x7") {
         /* XT1521 */
         gsm_properties(true);
-        property_set("ro.product.model", "XT1521");
-        property_set("ro.product.device", "surnia_uds");
-        property_set("ro.build.product", "surnia_uds");
-        property_set("ro.build.description", "surnia_retasia_ds-user 5.0.2 LXI22.50-53.1 1 release-keys");
-        property_set("ro.build.fingerprint", "motorola/surnia_retasia_ds/surnia_uds:5.0.2/LXI22.50-53.1/1:user/release-keys");
+        property_override("ro.product.model", "XT1521");
+        property_override("ro.product.device", "surnia_uds");
+        property_override("ro.build.product", "surnia_uds");
+        property_override("ro.build.description", "surnia_retasia_ds-user 5.0.2 LXI22.50-53.1 1 release-keys");
+        property_override("ro.build.fingerprint", "motorola/surnia_retasia_ds/surnia_uds:5.0.2/LXI22.50-53.1/1:user/release-keys");
         property_set("ro.mot.build.customerid", "retasiaall");
     } else if (radio == "0x8") {
         /* XT1514 */
         gsm_properties(true);
-        property_set("ro.product.model", "XT1514");
-        property_set("ro.product.device", "surnia_uds");
-        property_set("ro.build.product", "surnia_uds");
-        property_set("ro.build.description", "surnia_retbr_ds-user 5.0.2 LXI22.50-24.1 1 release-keys");
-        property_set("ro.build.fingerprint", "motorola/surnia_retbr_ds/surnia_uds:5.0.2/LXI22.50-24.1/1:user/release-keys");
+        property_override("ro.product.model", "XT1514");
+        property_override("ro.product.device", "surnia_uds");
+        property_override("ro.build.product", "surnia_uds");
+        property_override("ro.build.description", "surnia_retbr_ds-user 5.0.2 LXI22.50-24.1 1 release-keys");
+        property_override("ro.build.fingerprint", "motorola/surnia_retbr_ds/surnia_uds:5.0.2/LXI22.50-24.1/1:user/release-keys");
         property_set("ro.mot.build.customerid", "retbr");
     }
     device = property_get("ro.product.device");