预置BarCode

test 132266 [基本移植]修改关于手机-状态-序列号 wuxuhua 09/10409/1 dev_France_Altice

author wuxuhua [email protected]

Wed, 16 May 2018 20:59:02 +0800 (20:59 +0800)

committer wuxuhua [email protected]

Wed, 16 May 2018 20:59:02 +0800 (20:59 +0800)

Change-Id: I0d9785224aed9c025f4e2f4b60ab423bd90760e0

TK_MD_BASIC_MOLY.LR12A.R2.MP.V8.6/mcu/common/interface/service/nvram/nvram_defs.h patch | blob | history

TK_MD_BASIC_MOLY.LR12A.R2.MP.V8.6/mcu/pcore/custom/service/nvram/mml1_nvram_def.c patch | blob | history

TK_MD_BASIC_MOLY.LR12A.R2.MP.V8.6/mcu/pcore/custom/service/nvram/nvram_data_items.c patch | blob | history

diff --git a/TK_MD_BASIC_MOLY.LR12A.R2.MP.V8.6/mcu/common/interface/service/nvram/nvram_defs.h b/TK_MD_BASIC_MOLY.LR12A.R2.MP.V8.6/mcu/common/interface/service/nvram/nvram_defs.h

index 1d19ca7…786f303 100644 (file)

扫描二维码关注公众号，回复： 4674983 查看本文章

— a/TK_MD_BASIC_MOLY.LR12A.R2.MP.V8.6/mcu/common/interface/service/nvram/nvram_defs.h

+++ b/TK_MD_BASIC_MOLY.LR12A.R2.MP.V8.6/mcu/common/interface/service/nvram/nvram_defs.h

@@ -295,7 +295,9 @@ extern kal_uint32 nvram_ut_assert_flag;

#define NVRAM_EF_ZERO_DEFAULT_ZIP NVRAM_EF_ZERO_DEFAULT

#define NVRAM_EF_FF_DEFAULT_ZIP NVRAM_EF_FF_DEFAULT

+//Redmine132266 wuxuhua modified for default barcode 2018-05-16 begin

+extern const kal_uint8 NVRAM_EF_BARCODE_NUM_DEFAULT[];

+//Redmine132266 wuxuhua modified for default barcode 2018-05-16 end

#ifndef NVRAM_AUTO_GEN

 #define NVRAM_NORMAL(X) (kal_uint8 const *)X

diff --git a/TK_MD_BASIC_MOLY.LR12A.R2.MP.V8.6/mcu/pcore/custom/service/nvram/mml1_nvram_def.c b/TK_MD_BASIC_MOLY.LR12A.R2.MP.V8.6/mcu/pcore/custom/service/nvram/mml1_nvram_def.c

index edd77aa…f032894 100644 (file)

— a/TK_MD_BASIC_MOLY.LR12A.R2.MP.V8.6/mcu/pcore/custom/service/nvram/mml1_nvram_def.c

+++ b/TK_MD_BASIC_MOLY.LR12A.R2.MP.V8.6/mcu/pcore/custom/service/nvram/mml1_nvram_def.c

@@ -323,7 +323,9 @@ ltable_entry_struct logical_data_item_table_mml1[] =

     NVRAM_EF_BARCODE_NUM_LID,

     NVRAM_EF_BARCODE_NUM_TOTAL,

     NVRAM_EF_BARCODE_NUM_SIZE,

   NVRAM_NORMAL(NVRAM_EF_ZERO_DEFAULT),

   //Redmine132266 wuxuhua modified for default barcode 2018-05-16 begin

   NVRAM_NORMAL(NVRAM_EF_BARCODE_NUM_DEFAULT),

   //Redmine132266 wuxuhua modified for default barcode 2018-05-16 end

   NVRAM_CATEGORY_USER | NVRAM_CATEGORY_CALIBRAT,

   NVRAM_ATTR_AVERAGE | NVRAM_ATTR_CONFIDENTIAL,

   "ML09", /* keep the file prefix as the same with legacy branches in BKRS/sw upgrade */

diff --git a/TK_MD_BASIC_MOLY.LR12A.R2.MP.V8.6/mcu/pcore/custom/service/nvram/nvram_data_items.c b/TK_MD_BASIC_MOLY.LR12A.R2.MP.V8.6/mcu/pcore/custom/service/nvram/nvram_data_items.c

index 141ba31…9506863 100644 (file)

— a/TK_MD_BASIC_MOLY.LR12A.R2.MP.V8.6/mcu/pcore/custom/service/nvram/nvram_data_items.c

+++ b/TK_MD_BASIC_MOLY.LR12A.R2.MP.V8.6/mcu/pcore/custom/service/nvram/nvram_data_items.c

@@ -1788,6 +1788,18 @@

kal_uint8 const NVRAM_EF_ZERO_DEFAULT[] = { 0x00 };

kal_uint8 const NVRAM_EF_FF_DEFAULT[] = { 0xFF };

kal_uint8 const NVRAM_EF_SPECIAL_DEFAULT[] = { 0x55 };

+//Redmine132266 wuxuhua modified for default barcode 2018-05-16 begin

+kal_uint8 const NVRAM_EF_BARCODE_NUM_DEFAULT[] =

‘F’, ‘a’, ‘c’, ‘t’, ‘o’, ‘r’, ‘y’, ’ ', ‘N’, ‘e’,
‘e’, ‘d’, ’ ', ‘W’, ‘r’, ‘i’, ‘t’, ‘e’, ’ ', ‘S’,
‘N’, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00

+};

+//Redmine132266 wuxuhua modified for default barcode 2018-05-16 end

#ifdef NVRAM_CRYPT_TEST

kal_uint32 bWriteMsp = 0;

— a/alps/vendor/mediatek/proprietary/packages/apps/MtkSettings/src/com/android/settings/deviceinfo/SerialNumberPreferenceController.java

+++ b/alps/vendor/mediatek/proprietary/packages/apps/MtkSettings/src/com/android/settings/deviceinfo/SerialNumberPreferenceController.java

@@ -34,7 +34,9 @@ public class SerialNumberPreferenceController extends AbstractPreferenceControll

 private final String mSerialNumber;



 public SerialNumberPreferenceController(Context context) {

```
   this(context, Build.getSerial());
```

   //Redmine132266 wuxuhua modified for default barcode 2018-05-16 begin

   this(context, android.os.SystemProperties.get("gsm.serial"));

   //Redmine132266 wuxuhua modified for default barcode 2018-05-16 end

}

@VisibleForTesting

猜你喜欢