提交: 01c76f540054b3f5849da1d557fd2c477b876356 - system-core (git)

system/core

Commit MetaInfo

• 修订版: 01c76f540054b3f5849da1d557fd2c477b876356 (tree)
• 时间: 2012-01-13 06:24:19
• 作者: Benoit Goby <benoit@andr...>
• Commiter: Benoit Goby

Log Message

HACK: Export androidboot.modelno as ro.boot.modelno -- DO NOT MERGE

Export androidboot.modelno command line parameter as ro.boot.modelno
property, so that we can set the USB iProduct string to the correct
value on Stingray.

Bug: 5853250
Change-Id: Idc413f15dc4d9d02027589d1b11bdf50e0a79ccc

更改概述

• modified: init/init.c

差异

--- a/init/init.c
+++ b/init/init.c
@@ -65,6 +65,7 @@ static char baseband[32];
 static char carrier[32];
 static char bootloader[32];
 static char hardware[32];
+static char modelno[32];
 static unsigned revision = 0;
 static char qemu[32];
 
@@ -447,6 +448,8 @@ static void import_kernel_nv(char *name, int in_qemu)
             strlcpy(bootloader, value, sizeof(bootloader));
         } else if (!strcmp(name,"androidboot.hardware")) {
             strlcpy(hardware, value, sizeof(hardware));
+        } else if (!strcmp(name,"androidboot.modelno")) {
+            strlcpy(modelno, value, sizeof(modelno));
         }
     } else {
         /* in the emulator, export any kernel option with the
@@ -596,6 +599,9 @@ static int set_init_properties_action(int nargs, char **args)
     property_set("ro.carrier", carrier[0] ? carrier : "unknown");
     property_set("ro.bootloader", bootloader[0] ? bootloader : "unknown");
 
+    if (modelno[0])
+        property_set("ro.boot.modelno", modelno);
+
     property_set("ro.hardware", hardware);
     snprintf(tmp, PROP_VALUE_MAX, "%d", revision);
     property_set("ro.revision", tmp);