Update Huawei Mate 9 mock test

3 files changed, 573 insertions, 368 deletions

diff --git a/test/build.prop/huawei-mate-9.log b/test/build.prop/huawei-mate-9.log
index d0cb42f..2923f8b 100644
--- a/test/build.prop/huawei-mate-9.log
+++ b/test/build.prop/huawei-mate-9.log
@@ -3,19 +3,19 @@
 # autogenerated by buildinfo.sh
 ro.build.id=NRD90M
 ro.build.display.id=NRD90M test-keys
-ro.build.version.incremental=eng.jslave.20161217.052223
+ro.build.version.incremental=eng.jslave.20161103.091030
 ro.build.version.sdk=24
 ro.build.version.preview_sdk=0
 ro.build.version.codename=REL
 ro.build.version.all_codenames=REL
 ro.build.version.release=7.0
-ro.build.version.security_patch=2016-12-01
+ro.build.version.security_patch=2016-08-05
 ro.build.version.base_os=
-ro.build.date=Sat Dec 17 05:22:23 CST 2016
-ro.build.date.utc=1481923343
+ro.build.date=Thu Nov  3 09:10:30 CST 2016
+ro.build.date.utc=1478135430
 ro.build.type=user
-ro.build.user=jslave1
-ro.build.host=wuhjk0132cna
+ro.build.user=jslave2
+ro.build.host=szvjk107cna
 ro.build.tags=test-keys
 ro.build.flavor=generic_a15-user
 ro.product.model=generic_a15
@@ -35,8 +35,8 @@ ro.board.platform=
 # ro.build.product is obsolete; use ro.product.device
 ro.build.product=generic_a15
 # Do not try to parse description, fingerprint, or thumbprint
-ro.build.description=generic_a15-user 7.0 NRD90M eng.jslave.20161217.052223 test-keys
-ro.build.fingerprint=Huawei/generic_a15/generic_a15:7.0/NRD90M/jslave12170522:user/test-keys
+ro.build.description=generic_a15-user 7.0 NRD90M eng.jslave.20161103.091030 test-keys
+ro.build.fingerprint=Huawei/generic_a15/generic_a15:7.0/NRD90M/jslave11030910:user/test-keys
 ro.build.characteristics=default
 # end build properties
 
@@ -49,10 +49,12 @@ ro.build.hw_emui_api_level=11
 #
 # ADDITIONAL_BUILD_PROPERTIES
 #
+ro.config.ringtone=Ring_Synth_04.ogg
+ro.config.notification_sound=pixiedust.ogg
 ro.carrier=unknown
 ro.setupwizard.require_network=any
 ro.setupwizard.mode=OPTIONAL
-ro.com.google.gmsversion=7.0_r3
+ro.com.google.gmsversion=7.0_r1
 persist.sys.dalvik.vm.lib.2=libart.so
 dalvik.vm.isa.arm64.variant=generic
 dalvik.vm.isa.arm64.features=default
@@ -63,4 +65,4 @@ dalvik.vm.stack-trace-file=/data/anr/traces.txt
 
 ro.comp.sys_support_vndk=VA7.0-E5.0-B10005
 
-ro.comp.sys_need_sndk=SA7.0-E5.0-B00005
+ro.comp.sys_need_sndk=SA7.0-E5.0-B10005
diff --git a/test/cpuinfo/huawei-mate-9.armeabi.log b/test/cpuinfo/huawei-mate-9.armeabi.log
new file mode 100644
index 0000000..b193f56
--- /dev/null
+++ b/test/cpuinfo/huawei-mate-9.armeabi.log
@@ -0,0 +1,73 @@
+Processor	: AArch64 Processor rev 1 (aarch64)
+processor	: 0
+BogoMIPS	: 3.84
+Features	: half thumb fastmult vfp edsp neon vfpv3 tls vfpv4 idiva idivt lpae evtstrm aes pmull sha1 sha2 crc32
+CPU implementer	: 0x41
+CPU architecture: 8
+CPU variant	: 0x0
+CPU part	: 0xd03
+CPU revision	: 4
+
+processor	: 1
+BogoMIPS	: 3.84
+Features	: half thumb fastmult vfp edsp neon vfpv3 tls vfpv4 idiva idivt lpae evtstrm aes pmull sha1 sha2 crc32
+CPU implementer	: 0x41
+CPU architecture: 8
+CPU variant	: 0x0
+CPU part	: 0xd03
+CPU revision	: 4
+
+processor	: 2
+BogoMIPS	: 3.84
+Features	: half thumb fastmult vfp edsp neon vfpv3 tls vfpv4 idiva idivt lpae evtstrm aes pmull sha1 sha2 crc32
+CPU implementer	: 0x41
+CPU architecture: 8
+CPU variant	: 0x0
+CPU part	: 0xd03
+CPU revision	: 4
+
+processor	: 3
+BogoMIPS	: 3.84
+Features	: half thumb fastmult vfp edsp neon vfpv3 tls vfpv4 idiva idivt lpae evtstrm aes pmull sha1 sha2 crc32
+CPU implementer	: 0x41
+CPU architecture: 8
+CPU variant	: 0x0
+CPU part	: 0xd03
+CPU revision	: 4
+
+processor	: 4
+BogoMIPS	: 3.84
+Features	: half thumb fastmult vfp edsp neon vfpv3 tls vfpv4 idiva idivt lpae evtstrm aes pmull sha1 sha2 crc32
+CPU implementer	: 0x41
+CPU architecture: 8
+CPU variant	: 0x0
+CPU part	: 0xd09
+CPU revision	: 1
+
+processor	: 5
+BogoMIPS	: 3.84
+Features	: half thumb fastmult vfp edsp neon vfpv3 tls vfpv4 idiva idivt lpae evtstrm aes pmull sha1 sha2 crc32
+CPU implementer	: 0x41
+CPU architecture: 8
+CPU variant	: 0x0
+CPU part	: 0xd09
+CPU revision	: 1
+
+processor	: 6
+BogoMIPS	: 3.84
+Features	: half thumb fastmult vfp edsp neon vfpv3 tls vfpv4 idiva idivt lpae evtstrm aes pmull sha1 sha2 crc32
+CPU implementer	: 0x41
+CPU architecture: 8
+CPU variant	: 0x0
+CPU part	: 0xd09
+CPU revision	: 1
+
+processor	: 7
+BogoMIPS	: 3.84
+Features	: half thumb fastmult vfp edsp neon vfpv3 tls vfpv4 idiva idivt lpae evtstrm aes pmull sha1 sha2 crc32
+CPU implementer	: 0x41
+CPU architecture: 8
+CPU variant	: 0x0
+CPU part	: 0xd09
+CPU revision	: 1
+
diff --git a/test/mock/huawei-mate-9.h b/test/mock/huawei-mate-9.h
index 4753862..9f00d50 100644
--- a/test/mock/huawei-mate-9.h
+++ b/test/mock/huawei-mate-9.h
@@ -1,4 +1,5 @@
 struct cpuinfo_mock_file filesystem[] = {
+#if CPUINFO_ARCH_ARM64
 	{
 		.path = "/proc/cpuinfo",
 		.size = 1486,
@@ -77,28 +78,108 @@ struct cpuinfo_mock_file filesystem[] = {
 			"CPU revision\t: 1\n"
 			"\n",
 	},
+#elif CPUINFO_ARCH_ARM
+	{
+		.path = "/proc/cpuinfo",
+		.size = 1950,
+		.content =
+			"Processor\t: AArch64 Processor rev 1 (aarch64)\n"
+			"processor\t: 0\n"
+			"BogoMIPS\t: 3.84\n"
+			"Features\t: half thumb fastmult vfp edsp neon vfpv3 tls vfpv4 idiva idivt lpae evtstrm aes pmull sha1 sha2 crc32\n"
+			"CPU implementer\t: 0x41\n"
+			"CPU architecture: 8\n"
+			"CPU variant\t: 0x0\n"
+			"CPU part\t: 0xd03\n"
+			"CPU revision\t: 4\n"
+			"\n"
+			"processor\t: 1\n"
+			"BogoMIPS\t: 3.84\n"
+			"Features\t: half thumb fastmult vfp edsp neon vfpv3 tls vfpv4 idiva idivt lpae evtstrm aes pmull sha1 sha2 crc32\n"
+			"CPU implementer\t: 0x41\n"
+			"CPU architecture: 8\n"
+			"CPU variant\t: 0x0\n"
+			"CPU part\t: 0xd03\n"
+			"CPU revision\t: 4\n"
+			"\n"
+			"processor\t: 2\n"
+			"BogoMIPS\t: 3.84\n"
+			"Features\t: half thumb fastmult vfp edsp neon vfpv3 tls vfpv4 idiva idivt lpae evtstrm aes pmull sha1 sha2 crc32\n"
+			"CPU implementer\t: 0x41\n"
+			"CPU architecture: 8\n"
+			"CPU variant\t: 0x0\n"
+			"CPU part\t: 0xd03\n"
+			"CPU revision\t: 4\n"
+			"\n"
+			"processor\t: 3\n"
+			"BogoMIPS\t: 3.84\n"
+			"Features\t: half thumb fastmult vfp edsp neon vfpv3 tls vfpv4 idiva idivt lpae evtstrm aes pmull sha1 sha2 crc32\n"
+			"CPU implementer\t: 0x41\n"
+			"CPU architecture: 8\n"
+			"CPU variant\t: 0x0\n"
+			"CPU part\t: 0xd03\n"
+			"CPU revision\t: 4\n"
+			"\n"
+			"processor\t: 4\n"
+			"BogoMIPS\t: 3.84\n"
+			"Features\t: half thumb fastmult vfp edsp neon vfpv3 tls vfpv4 idiva idivt lpae evtstrm aes pmull sha1 sha2 crc32\n"
+			"CPU implementer\t: 0x41\n"
+			"CPU architecture: 8\n"
+			"CPU variant\t: 0x0\n"
+			"CPU part\t: 0xd09\n"
+			"CPU revision\t: 1\n"
+			"\n"
+			"processor\t: 5\n"
+			"BogoMIPS\t: 3.84\n"
+			"Features\t: half thumb fastmult vfp edsp neon vfpv3 tls vfpv4 idiva idivt lpae evtstrm aes pmull sha1 sha2 crc32\n"
+			"CPU implementer\t: 0x41\n"
+			"CPU architecture: 8\n"
+			"CPU variant\t: 0x0\n"
+			"CPU part\t: 0xd09\n"
+			"CPU revision\t: 1\n"
+			"\n"
+			"processor\t: 6\n"
+			"BogoMIPS\t: 3.84\n"
+			"Features\t: half thumb fastmult vfp edsp neon vfpv3 tls vfpv4 idiva idivt lpae evtstrm aes pmull sha1 sha2 crc32\n"
+			"CPU implementer\t: 0x41\n"
+			"CPU architecture: 8\n"
+			"CPU variant\t: 0x0\n"
+			"CPU part\t: 0xd09\n"
+			"CPU revision\t: 1\n"
+			"\n"
+			"processor\t: 7\n"
+			"BogoMIPS\t: 3.84\n"
+			"Features\t: half thumb fastmult vfp edsp neon vfpv3 tls vfpv4 idiva idivt lpae evtstrm aes pmull sha1 sha2 crc32\n"
+			"CPU implementer\t: 0x41\n"
+			"CPU architecture: 8\n"
+			"CPU variant\t: 0x0\n"
+			"CPU part\t: 0xd09\n"
+			"CPU revision\t: 1\n"
+			"\n",
+	},
+#endif
 	{
 		.path = "/system/build.prop",
-		.size = 2038,
+		.size = 2117,
 		.content =
 			"\n"
 			"# begin build properties\n"
 			"# autogenerated by buildinfo.sh\n"
 			"ro.build.id=NRD90M\n"
 			"ro.build.display.id=NRD90M test-keys\n"
-			"ro.build.version.incremental=eng.jslave.20161217.052223\n"
+			"ro.build.version.incremental=eng.jslave.20161103.091030\n"
 			"ro.build.version.sdk=24\n"
 			"ro.build.version.preview_sdk=0\n"
 			"ro.build.version.codename=REL\n"
 			"ro.build.version.all_codenames=REL\n"
 			"ro.build.version.release=7.0\n"
-			"ro.build.version.security_patch=2016-12-01\n"
+			"ro.build.version.security_patch=2016-08-05\n"
 			"ro.build.version.base_os=\n"
-			"ro.build.date=Sat Dec 17 05:22:23 CST 2016\n"
-			"ro.build.date.utc=1481923343\n"
+			"ro.build.date=Thu Nov  3 09:10:30 CST 2016\n"
+			"ro.build.date.utc=1478135430\n"
 			"ro.build.type=user\n"
-			"ro.build.user=jslave1\n"
-			"ro.build.host=wuhjk0132cna\n"
+			"ro.build.user=jslave2\n"
+			"ro.build.host=szvjk107cna\n"
 			"ro.build.tags=test-keys\n"
 			"ro.build.flavor=generic_a15-user\n"
 			"ro.product.model=generic_a15\n"
@@ -118,8 +199,8 @@ struct cpuinfo_mock_file filesystem[] = {
 			"# ro.build.product is obsolete; use ro.product.device\n"
 			"ro.build.product=generic_a15\n"
 			"# Do not try to parse description, fingerprint, or thumbprint\n"
-			"ro.build.description=generic_a15-user 7.0 NRD90M eng.jslave.20161217.052223 test-keys\n"
-			"ro.build.fingerprint=Huawei/generic_a15/generic_a15:7.0/NRD90M/jslave12170522:user/test-keys\n"
+			"ro.build.description=generic_a15-user 7.0 NRD90M eng.jslave.20161103.091030 test-keys\n"
+			"ro.build.fingerprint=Huawei/generic_a15/generic_a15:7.0/NRD90M/jslave11030910:user/test-keys\n"
 			"ro.build.characteristics=default\n"
 			"# end build properties\n"
 			"\n"
@@ -132,10 +213,12 @@ struct cpuinfo_mock_file filesystem[] = {
 			"#\n"
 			"# ADDITIONAL_BUILD_PROPERTIES\n"
 			"#\n"
+			"ro.config.ringtone=Ring_Synth_04.ogg\n"
+			"ro.config.notification_sound=pixiedust.ogg\n"
 			"ro.carrier=unknown\n"
 			"ro.setupwizard.require_network=any\n"
 			"ro.setupwizard.mode=OPTIONAL\n"
-			"ro.com.google.gmsversion=7.0_r3\n"
+			"ro.com.google.gmsversion=7.0_r1\n"
 			"persist.sys.dalvik.vm.lib.2=libart.so\n"
 			"dalvik.vm.isa.arm64.variant=generic\n"
 			"dalvik.vm.isa.arm64.features=default\n"
@@ -146,7 +229,7 @@ struct cpuinfo_mock_file filesystem[] = {
 			"\n"
 			"ro.comp.sys_support_vndk=VA7.0-E5.0-B10005\n"
 			"\n"
-			"ro.comp.sys_need_sndk=SA7.0-E5.0-B00005\n",
+			"ro.comp.sys_need_sndk=SA7.0-E5.0-B10005\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/kernel_max",
@@ -154,14 +237,14 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content = "7\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/possible",
-		.size = 4,
-		.content = "0-7\n",
+		.path = "/sys/devices/system/cpu/modalias",
+		.size = 66,
+		.content = "cpu:type:aarch64:feature:,0000,0001,0002,0003,0004,0005,0006,0007\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/present",
-		.size = 4,
-		.content = "0-7\n",
+		.path = "/sys/devices/system/cpu/offline",
+		.size = 1,
+		.content = "\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/online",
@@ -169,14 +252,14 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content = "0-7\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/offline",
-		.size = 1,
-		.content = "\n",
+		.path = "/sys/devices/system/cpu/possible",
+		.size = 4,
+		.content = "0-7\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/modalias",
-		.size = 66,
-		.content = "cpu:type:aarch64:feature:,0000,0001,0002,0003,0004,0005,0006,0007\n",
+		.path = "/sys/devices/system/cpu/present",
+		.size = 4,
+		.content = "0-7\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpuidle/current_driver",
@@ -189,6 +272,11 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content = "menu\n",
 	},
 	{
+		.path = "/sys/devices/system/cpu/cpu0/cpuidle/driver/name",
+		.size = 25,
+		.content = "hisi_little_cluster_idle\n",
+	},
+	{
 		.path = "/sys/devices/system/cpu/cpu0/cpufreq/affected_cpus",
 		.size = 8,
 		.content = "0 1 2 3\n",
@@ -225,8 +313,8 @@ struct cpuinfo_mock_file filesystem[] = {
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq",
-		.size = 8,
-		.content = "1709000\n",
+		.size = 7,
+		.content = "533000\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu0/cpufreq/scaling_driver",
@@ -245,18 +333,18 @@ struct cpuinfo_mock_file filesystem[] = {
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu0/cpufreq/stats/time_in_state",
-		.size = 58,
+		.size = 60,
 		.content =
-			"533000 669\n"
-			"999000 14\n"
-			"1402000 528\n"
-			"1709000 281\n"
-			"1844000 3528\n",
+			"533000 1865\n"
+			"999000 78\n"
+			"1402000 1860\n"
+			"1709000 231\n"
+			"1844000 7168\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu0/cpufreq/stats/total_trans",
 		.size = 4,
-		.content = "131\n",
+		.content = "188\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu0/cpufreq/stats/trans_table",
@@ -264,34 +352,29 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content =
 			"   From  :    To\n"
 			"         :    533000    999000   1402000   1709000   1844000 \n"
-			"   533000:         0         0        25         0         0 \n"
-			"   999000:         0         0         2         0         0 \n"
-			"  1402000:         6         0         0        32         0 \n"
-			"  1709000:         9         0         6         0        25 \n"
-			"  1844000:        10         2         5         9         0 \n",
+			"   533000:         0         0        47         0         0 \n"
+			"   999000:         4         0         3         0         0 \n"
+			"  1402000:        29         3         0        32         3 \n"
+			"  1709000:         6         2        11         0        22 \n"
+			"  1844000:         9         2         6         9         0 \n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu0/topology/physical_package_id",
+		.path = "/sys/devices/system/cpu/cpu0/topology/core_id",
 		.size = 2,
 		.content = "0\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu0/topology/core_siblings_list",
-		.size = 4,
-		.content = "0-3\n",
-	},
-	{
 		.path = "/sys/devices/system/cpu/cpu0/topology/core_siblings",
 		.size = 3,
 		.content = "0f\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu0/topology/core_id",
-		.size = 2,
-		.content = "0\n",
+		.path = "/sys/devices/system/cpu/cpu0/topology/core_siblings_list",
+		.size = 4,
+		.content = "0-3\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu0/topology/thread_siblings_list",
+		.path = "/sys/devices/system/cpu/cpu0/topology/physical_package_id",
 		.size = 2,
 		.content = "0\n",
 	},
@@ -301,6 +384,16 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content = "01\n",
 	},
 	{
+		.path = "/sys/devices/system/cpu/cpu0/topology/thread_siblings_list",
+		.size = 2,
+		.content = "0\n",
+	},
+	{
+		.path = "/sys/devices/system/cpu/cpu1/cpuidle/driver/name",
+		.size = 25,
+		.content = "hisi_little_cluster_idle\n",
+	},
+	{
 		.path = "/sys/devices/system/cpu/cpu1/cpufreq/affected_cpus",
 		.size = 8,
 		.content = "0 1 2 3\n",
@@ -357,18 +450,18 @@ struct cpuinfo_mock_file filesystem[] = {
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu1/cpufreq/stats/time_in_state",
-		.size = 58,
+		.size = 60,
 		.content =
-			"533000 889\n"
-			"999000 14\n"
-			"1402000 531\n"
-			"1709000 291\n"
-			"1844000 3537\n",
+			"533000 2045\n"
+			"999000 78\n"
+			"1402000 1898\n"
+			"1709000 231\n"
+			"1844000 7168\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu1/cpufreq/stats/total_trans",
 		.size = 4,
-		.content = "136\n",
+		.content = "190\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu1/cpufreq/stats/trans_table",
@@ -376,16 +469,21 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content =
 			"   From  :    To\n"
 			"         :    533000    999000   1402000   1709000   1844000 \n"
-			"   533000:         0         0        26         0         0 \n"
-			"   999000:         0         0         2         0         0 \n"
-			"  1402000:         6         0         0        33         0 \n"
-			"  1709000:        10         0         6         0        26 \n"
-			"  1844000:        11         2         5         9         0 \n",
+			"   533000:         0         0        48         0         0 \n"
+			"   999000:         4         0         3         0         0 \n"
+			"  1402000:        30         3         0        32         3 \n"
+			"  1709000:         6         2        11         0        22 \n"
+			"  1844000:         9         2         6         9         0 \n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu1/topology/physical_package_id",
+		.path = "/sys/devices/system/cpu/cpu1/topology/core_id",
 		.size = 2,
-		.content = "0\n",
+		.content = "1\n",
+	},
+	{
+		.path = "/sys/devices/system/cpu/cpu1/topology/core_siblings",
+		.size = 3,
+		.content = "0f\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu1/topology/core_siblings_list",
@@ -393,14 +491,14 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content = "0-3\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu1/topology/core_siblings",
-		.size = 3,
-		.content = "0f\n",
+		.path = "/sys/devices/system/cpu/cpu1/topology/physical_package_id",
+		.size = 2,
+		.content = "0\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu1/topology/core_id",
-		.size = 2,
-		.content = "1\n",
+		.path = "/sys/devices/system/cpu/cpu1/topology/thread_siblings",
+		.size = 3,
+		.content = "02\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu1/topology/thread_siblings_list",
@@ -408,9 +506,9 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content = "1\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu1/topology/thread_siblings",
-		.size = 3,
-		.content = "02\n",
+		.path = "/sys/devices/system/cpu/cpu2/cpuidle/driver/name",
+		.size = 25,
+		.content = "hisi_little_cluster_idle\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu2/cpufreq/affected_cpus",
@@ -449,8 +547,8 @@ struct cpuinfo_mock_file filesystem[] = {
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu2/cpufreq/scaling_cur_freq",
-		.size = 7,
-		.content = "533000\n",
+		.size = 8,
+		.content = "1402000\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu2/cpufreq/scaling_driver",
@@ -469,18 +567,18 @@ struct cpuinfo_mock_file filesystem[] = {
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu2/cpufreq/stats/time_in_state",
-		.size = 59,
+		.size = 60,
 		.content =
-			"533000 1419\n"
-			"999000 23\n"
-			"1402000 604\n"
-			"1709000 303\n"
-			"1844000 3570\n",
+			"533000 2218\n"
+			"999000 78\n"
+			"1402000 1932\n"
+			"1709000 234\n"
+			"1844000 7179\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu2/cpufreq/stats/total_trans",
 		.size = 4,
-		.content = "151\n",
+		.content = "195\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu2/cpufreq/stats/trans_table",
@@ -488,16 +586,21 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content =
 			"   From  :    To\n"
 			"         :    533000    999000   1402000   1709000   1844000 \n"
-			"   533000:         0         0        30         0         0 \n"
-			"   999000:         1         0         2         0         0 \n"
-			"  1402000:         7         0         0        36         0 \n"
-			"  1709000:        10         0         6         0        29 \n"
-			"  1844000:        13         3         5         9         0 \n",
+			"   533000:         0         0        50         0         0 \n"
+			"   999000:         4         0         3         0         0 \n"
+			"  1402000:        31         3         0        33         3 \n"
+			"  1709000:         6         2        11         0        23 \n"
+			"  1844000:        10         2         6         9         0 \n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu2/topology/physical_package_id",
+		.path = "/sys/devices/system/cpu/cpu2/topology/core_id",
 		.size = 2,
-		.content = "0\n",
+		.content = "2\n",
+	},
+	{
+		.path = "/sys/devices/system/cpu/cpu2/topology/core_siblings",
+		.size = 3,
+		.content = "0f\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu2/topology/core_siblings_list",
@@ -505,14 +608,14 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content = "0-3\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu2/topology/core_siblings",
-		.size = 3,
-		.content = "0f\n",
+		.path = "/sys/devices/system/cpu/cpu2/topology/physical_package_id",
+		.size = 2,
+		.content = "0\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu2/topology/core_id",
-		.size = 2,
-		.content = "2\n",
+		.path = "/sys/devices/system/cpu/cpu2/topology/thread_siblings",
+		.size = 3,
+		.content = "04\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu2/topology/thread_siblings_list",
@@ -520,9 +623,9 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content = "2\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu2/topology/thread_siblings",
-		.size = 3,
-		.content = "04\n",
+		.path = "/sys/devices/system/cpu/cpu3/cpuidle/driver/name",
+		.size = 25,
+		.content = "hisi_little_cluster_idle\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu3/cpufreq/affected_cpus",
@@ -561,8 +664,8 @@ struct cpuinfo_mock_file filesystem[] = {
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu3/cpufreq/scaling_cur_freq",
-		.size = 8,
-		.content = "1402000\n",
+		.size = 7,
+		.content = "533000\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu3/cpufreq/scaling_driver",
@@ -581,18 +684,18 @@ struct cpuinfo_mock_file filesystem[] = {
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu3/cpufreq/stats/time_in_state",
-		.size = 59,
+		.size = 60,
 		.content =
-			"533000 1554\n"
-			"999000 23\n"
-			"1402000 685\n"
-			"1709000 307\n"
-			"1844000 3585\n",
+			"533000 2442\n"
+			"999000 78\n"
+			"1402000 1937\n"
+			"1709000 234\n"
+			"1844000 7179\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu3/cpufreq/stats/total_trans",
 		.size = 4,
-		.content = "158\n",
+		.content = "196\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu3/cpufreq/stats/trans_table",
@@ -600,16 +703,21 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content =
 			"   From  :    To\n"
 			"         :    533000    999000   1402000   1709000   1844000 \n"
-			"   533000:         0         0        33         0         0 \n"
-			"   999000:         1         0         2         0         0 \n"
-			"  1402000:         9         0         0        37         0 \n"
-			"  1709000:        10         0         6         0        30 \n"
-			"  1844000:        14         3         5         9         0 \n",
+			"   533000:         0         0        50         0         0 \n"
+			"   999000:         4         0         3         0         0 \n"
+			"  1402000:        31         3         0        33         3 \n"
+			"  1709000:         6         2        11         0        23 \n"
+			"  1844000:        10         2         6         9         0 \n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu3/topology/physical_package_id",
+		.path = "/sys/devices/system/cpu/cpu3/topology/core_id",
 		.size = 2,
-		.content = "0\n",
+		.content = "3\n",
+	},
+	{
+		.path = "/sys/devices/system/cpu/cpu3/topology/core_siblings",
+		.size = 3,
+		.content = "0f\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu3/topology/core_siblings_list",
@@ -617,14 +725,14 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content = "0-3\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu3/topology/core_siblings",
-		.size = 3,
-		.content = "0f\n",
+		.path = "/sys/devices/system/cpu/cpu3/topology/physical_package_id",
+		.size = 2,
+		.content = "0\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu3/topology/core_id",
-		.size = 2,
-		.content = "3\n",
+		.path = "/sys/devices/system/cpu/cpu3/topology/thread_siblings",
+		.size = 3,
+		.content = "08\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu3/topology/thread_siblings_list",
@@ -632,9 +740,9 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content = "3\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu3/topology/thread_siblings",
-		.size = 3,
-		.content = "08\n",
+		.path = "/sys/devices/system/cpu/cpu4/cpuidle/driver/name",
+		.size = 22,
+		.content = "hisi_big_cluster_idle\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu4/cpufreq/affected_cpus",
@@ -700,16 +808,16 @@ struct cpuinfo_mock_file filesystem[] = {
 		.path = "/sys/devices/system/cpu/cpu4/cpufreq/stats/time_in_state",
 		.size = 60,
 		.content =
-			"903000 4604\n"
-			"1421000 58\n"
-			"1805000 206\n"
-			"2112000 104\n"
-			"2362000 2167\n",
+			"903000 6470\n"
+			"1421000 63\n"
+			"1805000 522\n"
+			"2112000 264\n"
+			"2362000 4777\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu4/cpufreq/stats/total_trans",
-		.size = 3,
-		.content = "86\n",
+		.size = 4,
+		.content = "218\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu4/cpufreq/stats/trans_table",
@@ -717,16 +825,21 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content =
 			"   From  :    To\n"
 			"         :    903000   1421000   1805000   2112000   2362000 \n"
-			"   903000:         0         3        24         1         0 \n"
-			"  1421000:         2         0         4         0         1 \n"
-			"  1805000:        14         0         0         2        12 \n"
-			"  2112000:         0         0         0         0         5 \n"
-			"  2362000:        13         3         0         2         0 \n",
+			"   903000:         0         0        59         2         3 \n"
+			"  1421000:         3         0         6         0         2 \n"
+			"  1805000:        15         5         0         2        49 \n"
+			"  2112000:         2         0         0         0         8 \n"
+			"  2362000:        45         5         6         6         0 \n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu4/topology/physical_package_id",
+		.path = "/sys/devices/system/cpu/cpu4/topology/core_id",
 		.size = 2,
-		.content = "1\n",
+		.content = "0\n",
+	},
+	{
+		.path = "/sys/devices/system/cpu/cpu4/topology/core_siblings",
+		.size = 3,
+		.content = "f0\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu4/topology/core_siblings_list",
@@ -734,14 +847,14 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content = "4-7\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu4/topology/core_siblings",
-		.size = 3,
-		.content = "f0\n",
+		.path = "/sys/devices/system/cpu/cpu4/topology/physical_package_id",
+		.size = 2,
+		.content = "1\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu4/topology/core_id",
-		.size = 2,
-		.content = "0\n",
+		.path = "/sys/devices/system/cpu/cpu4/topology/thread_siblings",
+		.size = 3,
+		.content = "10\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu4/topology/thread_siblings_list",
@@ -749,9 +862,9 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content = "4\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu4/topology/thread_siblings",
-		.size = 3,
-		.content = "10\n",
+		.path = "/sys/devices/system/cpu/cpu5/cpuidle/driver/name",
+		.size = 22,
+		.content = "hisi_big_cluster_idle\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu5/cpufreq/affected_cpus",
@@ -817,16 +930,16 @@ struct cpuinfo_mock_file filesystem[] = {
 		.path = "/sys/devices/system/cpu/cpu5/cpufreq/stats/time_in_state",
 		.size = 60,
 		.content =
-			"903000 4826\n"
-			"1421000 74\n"
-			"1805000 206\n"
-			"2112000 104\n"
-			"2362000 2167\n",
+			"903000 6703\n"
+			"1421000 63\n"
+			"1805000 522\n"
+			"2112000 264\n"
+			"2362000 4777\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu5/cpufreq/stats/total_trans",
-		.size = 3,
-		.content = "88\n",
+		.size = 4,
+		.content = "218\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu5/cpufreq/stats/trans_table",
@@ -834,41 +947,46 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content =
 			"   From  :    To\n"
 			"         :    903000   1421000   1805000   2112000   2362000 \n"
-			"   903000:         0         4        24         1         0 \n"
-			"  1421000:         3         0         4         0         1 \n"
-			"  1805000:        14         0         0         2        12 \n"
-			"  2112000:         0         0         0         0         5 \n"
-			"  2362000:        13         3         0         2         0 \n",
+			"   903000:         0         0        59         2         3 \n"
+			"  1421000:         3         0         6         0         2 \n"
+			"  1805000:        15         5         0         2        49 \n"
+			"  2112000:         2         0         0         0         8 \n"
+			"  2362000:        45         5         6         6         0 \n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu5/topology/physical_package_id",
+		.path = "/sys/devices/system/cpu/cpu5/topology/core_id",
 		.size = 2,
 		.content = "1\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu5/topology/core_siblings_list",
-		.size = 4,
-		.content = "4-7\n",
-	},
-	{
 		.path = "/sys/devices/system/cpu/cpu5/topology/core_siblings",
 		.size = 3,
 		.content = "f0\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu5/topology/core_id",
+		.path = "/sys/devices/system/cpu/cpu5/topology/core_siblings_list",
+		.size = 4,
+		.content = "4-7\n",
+	},
+	{
+		.path = "/sys/devices/system/cpu/cpu5/topology/physical_package_id",
 		.size = 2,
 		.content = "1\n",
 	},
 	{
+		.path = "/sys/devices/system/cpu/cpu5/topology/thread_siblings",
+		.size = 3,
+		.content = "20\n",
+	},
+	{
 		.path = "/sys/devices/system/cpu/cpu5/topology/thread_siblings_list",
 		.size = 2,
 		.content = "5\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu5/topology/thread_siblings",
-		.size = 3,
-		.content = "20\n",
+		.path = "/sys/devices/system/cpu/cpu6/cpuidle/driver/name",
+		.size = 22,
+		.content = "hisi_big_cluster_idle\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu6/cpufreq/affected_cpus",
@@ -932,18 +1050,18 @@ struct cpuinfo_mock_file filesystem[] = {
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu6/cpufreq/stats/time_in_state",
-		.size = 61,
+		.size = 60,
 		.content =
-			"903000 5692\n"
-			"1421000 121\n"
-			"1805000 216\n"
-			"2112000 104\n"
-			"2362000 2167\n",
+			"903000 6909\n"
+			"1421000 63\n"
+			"1805000 526\n"
+			"2112000 266\n"
+			"2362000 4804\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu6/cpufreq/stats/total_trans",
-		.size = 3,
-		.content = "91\n",
+		.size = 4,
+		.content = "224\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu6/cpufreq/stats/trans_table",
@@ -951,16 +1069,21 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content =
 			"   From  :    To\n"
 			"         :    903000   1421000   1805000   2112000   2362000 \n"
-			"   903000:         0         5        24         1         0 \n"
-			"  1421000:         3         0         5         0         1 \n"
-			"  1805000:        15         0         0         2        12 \n"
-			"  2112000:         0         0         0         0         5 \n"
-			"  2362000:        13         3         0         2         0 \n",
+			"   903000:         0         0        61         2         3 \n"
+			"  1421000:         3         0         6         0         2 \n"
+			"  1805000:        15         5         0         3        50 \n"
+			"  2112000:         2         0         0         0         9 \n"
+			"  2362000:        46         5         6         6         0 \n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu6/topology/physical_package_id",
+		.path = "/sys/devices/system/cpu/cpu6/topology/core_id",
 		.size = 2,
-		.content = "1\n",
+		.content = "2\n",
+	},
+	{
+		.path = "/sys/devices/system/cpu/cpu6/topology/core_siblings",
+		.size = 3,
+		.content = "f0\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu6/topology/core_siblings_list",
@@ -968,14 +1091,14 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content = "4-7\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu6/topology/core_siblings",
-		.size = 3,
-		.content = "f0\n",
+		.path = "/sys/devices/system/cpu/cpu6/topology/physical_package_id",
+		.size = 2,
+		.content = "1\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu6/topology/core_id",
-		.size = 2,
-		.content = "2\n",
+		.path = "/sys/devices/system/cpu/cpu6/topology/thread_siblings",
+		.size = 3,
+		.content = "40\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu6/topology/thread_siblings_list",
@@ -983,9 +1106,9 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content = "6\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu6/topology/thread_siblings",
-		.size = 3,
-		.content = "40\n",
+		.path = "/sys/devices/system/cpu/cpu7/cpuidle/driver/name",
+		.size = 22,
+		.content = "hisi_big_cluster_idle\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu7/cpufreq/affected_cpus",
@@ -1049,18 +1172,18 @@ struct cpuinfo_mock_file filesystem[] = {
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu7/cpufreq/stats/time_in_state",
-		.size = 61,
+		.size = 60,
 		.content =
-			"903000 5940\n"
-			"1421000 121\n"
-			"1805000 216\n"
-			"2112000 104\n"
-			"2362000 2167\n",
+			"903000 7079\n"
+			"1421000 63\n"
+			"1805000 526\n"
+			"2112000 266\n"
+			"2362000 4863\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu7/cpufreq/stats/total_trans",
-		.size = 3,
-		.content = "91\n",
+		.size = 4,
+		.content = "225\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu7/cpufreq/stats/trans_table",
@@ -1068,21 +1191,16 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content =
 			"   From  :    To\n"
 			"         :    903000   1421000   1805000   2112000   2362000 \n"
-			"   903000:         0         5        24         1         0 \n"
-			"  1421000:         3         0         5         0         1 \n"
-			"  1805000:        15         0         0         2        12 \n"
-			"  2112000:         0         0         0         0         5 \n"
-			"  2362000:        13         3         0         2         0 \n",
+			"   903000:         0         0        61         2         3 \n"
+			"  1421000:         3         0         6         0         2 \n"
+			"  1805000:        15         5         0         3        50 \n"
+			"  2112000:         2         0         0         0         9 \n"
+			"  2362000:        47         5         6         6         0 \n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu7/topology/physical_package_id",
+		.path = "/sys/devices/system/cpu/cpu7/topology/core_id",
 		.size = 2,
-		.content = "1\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu7/topology/core_siblings_list",
-		.size = 4,
-		.content = "4-7\n",
+		.content = "3\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu7/topology/core_siblings",
@@ -1090,23 +1208,27 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content = "f0\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu7/topology/core_id",
-		.size = 2,
-		.content = "3\n",
+		.path = "/sys/devices/system/cpu/cpu7/topology/core_siblings_list",
+		.size = 4,
+		.content = "4-7\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu7/topology/thread_siblings_list",
+		.path = "/sys/devices/system/cpu/cpu7/topology/physical_package_id",
 		.size = 2,
-		.content = "7\n",
+		.content = "1\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu7/topology/thread_siblings",
 		.size = 3,
 		.content = "80\n",
 	},
+	{
+		.path = "/sys/devices/system/cpu/cpu7/topology/thread_siblings_list",
+		.size = 2,
+		.content = "7\n",
+	},
 	{ NULL },
 };
-
 #ifdef __ANDROID__
 struct cpuinfo_mock_property properties[] = {
 	{
@@ -1227,7 +1349,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "debug.aps.current_battery",
-		.value = "44",
+		.value = "19",
 	},
 	{
 		.key = "debug.aps.enable",
@@ -1274,6 +1396,10 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "1",
 	},
 	{
+		.key = "gsm.check_is_single_pdp_sub1",
+		.value = "false",
+	},
+	{
 		.key = "gsm.current.phone-type",
 		.value = "1,1",
 	},
@@ -1283,7 +1409,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "gsm.fastdormancy.mode",
-		.value = "0",
+		.value = "1",
 	},
 	{
 		.key = "gsm.hw.fdn.activated1",
@@ -1371,7 +1497,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "gsm.version.baseband",
-		.value = "21.507.00.00.031,21.507.00.00.031",
+		.value = "21.500.00.00.031,21.500.00.00.031",
 	},
 	{
 		.key = "gsm.version.ril-impl",
@@ -1402,8 +1528,12 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "480",
 	},
 	{
+		.key = "hw.wifi.dns_stat",
+		.value = "86,29,1325,1,16202",
+	},
+	{
 		.key = "hw.wifipro.dns_fail_count",
-		.value = "21",
+		.value = "4",
 	},
 	{
 		.key = "hw_chargemonitor.log",
@@ -1419,7 +1549,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "init.svc.adbd",
-		.value = "running",
+		.value = "stopping",
 	},
 	{
 		.key = "init.svc.applogcat",
@@ -1494,10 +1624,6 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "running",
 	},
 	{
-		.key = "init.svc.fusd",
-		.value = "running",
-	},
-	{
 		.key = "init.svc.gatekeeperd",
 		.value = "running",
 	},
@@ -1707,13 +1833,29 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "net.change",
-		.value = "net.portal.background",
+		.value = "net.ntp.timereference",
+	},
+	{
+		.key = "net.dns1",
+		.value = "208.67.222.222",
+	},
+	{
+		.key = "net.dns2",
+		.value = "208.67.220.220",
 	},
 	{
 		.key = "net.hostname",
 		.value = "HUAWEI_Mate_9",
 	},
 	{
+		.key = "net.ntp.time",
+		.value = "1524186154191",
+	},
+	{
+		.key = "net.ntp.timereference",
+		.value = "22290",
+	},
+	{
 		.key = "net.portal.background",
 		.value = "false",
 	},
@@ -1751,7 +1893,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "persist.app_auto_start",
-		.value = "false",
+		.value = "true",
 	},
 	{
 		.key = "persist.config.hw.lca.region",
@@ -1778,6 +1920,10 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "1",
 	},
 	{
+		.key = "persist.fb_auto_alloc",
+		.value = "1",
+	},
+	{
 		.key = "persist.fw.force_adoptable",
 		.value = "true",
 	},
@@ -1822,6 +1968,10 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "HISI_CGUL_MODE",
 	},
 	{
+		.key = "persist.radio.lte_enabled",
+		.value = "true",
+	},
+	{
 		.key = "persist.radio.lte_rel_ver",
 		.value = "11",
 	},
@@ -2018,10 +2168,6 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "0",
 	},
 	{
-		.key = "persist.sys.mcc_match_fyrom",
-		.value = "",
-	},
-	{
 		.key = "persist.sys.media.video.encodec",
 		.value = "video/avc",
 	},
@@ -2142,12 +2288,16 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "75:999000:85:1402000:90:1709000:95",
 	},
 	{
+		.key = "persist.sys.timezone",
+		.value = "America/Los_Angeles",
+	},
+	{
 		.key = "persist.sys.usb.config",
 		.value = "hisuite,mtp,mass_storage,adb",
 	},
 	{
 		.key = "persist.sys.webview.vmsize",
-		.value = "114046272",
+		.value = "118450112",
 	},
 	{
 		.key = "persist.touch_move_opt",
@@ -2294,10 +2444,6 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "4",
 	},
 	{
-		.key = "ro.boot.flash.locked",
-		.value = "1",
-	},
-	{
 		.key = "ro.boot.hardware",
 		.value = "hi3660",
 	},
@@ -2311,7 +2457,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.boot.serialno",
-		.value = "AHK7N17124007836",
+		.value = "AHK0216C29000389",
 	},
 	{
 		.key = "ro.boot.verifiedbootstate",
@@ -2323,15 +2469,15 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.bootimage.build.date",
-		.value = "Sat Dec 17 03:15:29 CST 2016",
+		.value = "Thu Nov 3 12:20:37 CST 2016",
 	},
 	{
 		.key = "ro.bootimage.build.date.utc",
-		.value = "1481915729",
+		.value = "1478146837",
 	},
 	{
 		.key = "ro.bootimage.build.fingerprint",
-		.value = "hi3660/hi3660/hi3660:7.0/NRD90M/jenkin12170314:user/test-keys",
+		.value = "hi3660/hi3660/hi3660:7.0/NRD90M/jenkin11031219:user/test-keys",
 	},
 	{
 		.key = "ro.bootloader",
@@ -2346,32 +2492,36 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "/data/misc/bluedroid/macbt",
 	},
 	{
+		.key = "ro.build.beta",
+		.value = "false",
+	},
+	{
 		.key = "ro.build.characteristics",
 		.value = "default",
 	},
 	{
 		.key = "ro.build.date",
-		.value = "Sat Dec 17 05:22:23 CST 2016",
+		.value = "Thu Nov  3 09:10:30 CST 2016",
 	},
 	{
 		.key = "ro.build.date.utc",
-		.value = "1481923343",
+		.value = "1478135430",
 	},
 	{
 		.key = "ro.build.description",
-		.value = "MHA-L29-user 7.0 HUAWEIMHA-L29 C185B138 release-keys",
+		.value = "MHA-L29-user 7.0 HUAWEIMHA-L29 C636B112 release-keys",
 	},
 	{
 		.key = "ro.build.diaplay.id",
-		.value = "System 5.0.0.48(0AFY)",
+		.value = "System 5.0.0.48(03AE)",
 	},
 	{
 		.key = "ro.build.display.id",
-		.value = "MHA-L29C185B138",
+		.value = "MHA-L29C636B112",
 	},
 	{
 		.key = "ro.build.fingerprint",
-		.value = "HUAWEI/MHA-L29/HWMHA:7.0/HUAWEIMHA-L29/C185B138:user/release-keys",
+		.value = "HUAWEI/MHA-L29/HWMHA:7.0/HUAWEIMHA-L29/C636B112:user/release-keys",
 	},
 	{
 		.key = "ro.build.flavor",
@@ -2395,7 +2545,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.build.host",
-		.value = "android-19of24",
+		.value = "android-01of24",
 	},
 	{
 		.key = "ro.build.hw_emui_api_level",
@@ -2443,7 +2593,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.build.version.incremental",
-		.value = "C185B138",
+		.value = "C636B112",
 	},
 	{
 		.key = "ro.build.version.preview_sdk",
@@ -2459,7 +2609,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.build.version.security_patch",
-		.value = "2016-12-01",
+		.value = "2016-10-01",
 	},
 	{
 		.key = "ro.carrier",
@@ -2499,7 +2649,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.com.google.gmsversion",
-		.value = "7.0_r3",
+		.value = "7.0_r1",
 	},
 	{
 		.key = "ro.comp.chip_need_vndk",
@@ -2507,23 +2657,15 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.comp.chip_support_sndk",
-		.value = "SA7.0-E5.0-B00005",
+		.value = "SA7.0-E5.0-B10005",
 	},
 	{
 		.key = "ro.comp.chipset_version",
-		.value = "Chipset-chicago 5.0.0.130(0029)",
-	},
-	{
-		.key = "ro.comp.cust_version",
-		.value = "Cust-185000 5.0.0.1(0001)",
-	},
-	{
-		.key = "ro.comp.product_version",
-		.value = "Product-MHA 5.0.0.5(0001)",
+		.value = "Chipset-chicago 5.0.0.101SP01(005B)",
 	},
 	{
 		.key = "ro.comp.sys_need_sndk",
-		.value = "SA7.0-E5.0-B00005",
+		.value = "SA7.0-E5.0-B10005",
 	},
 	{
 		.key = "ro.comp.sys_support_vndk",
@@ -2531,27 +2673,23 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.comp.system_version",
-		.value = "System 5.0.0.48(0AFY)",
-	},
-	{
-		.key = "ro.comp.version_version",
-		.value = "Version-MHA-L29-185000 5.0.0.1(000Q)",
+		.value = "System 5.0.0.48(03AE)",
 	},
 	{
 		.key = "ro.confg.hw_bootversion",
-		.value = "Chipset-chicago 5.0.0.130(0029)_BOOT",
+		.value = "Chipset-chicago 5.0.0.101SP01(005B)_BOOT",
 	},
 	{
 		.key = "ro.confg.hw_fastbootversion",
-		.value = "Chipset-chicago 5.0.0.130(0029)_FASTBOOT",
+		.value = "Chipset-chicago 5.0.0.101SP01(005B)_FASTBOOT",
 	},
 	{
 		.key = "ro.confg.hw_systemversion",
-		.value = "System 5.0.0.48(0AFY)",
+		.value = "System 5.0.0.48(03AE)",
 	},
 	{
 		.key = "ro.confg.hw_userdataversion",
-		.value = "MHA-L29C185B138_DATA_hw_meafnaf",
+		.value = "MHA-L29C636B112_DATA_hw_spcseas",
 	},
 	{
 		.key = "ro.config.alarm_alert",
@@ -2567,11 +2705,11 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.config.attach_ip_type",
-		.value = "IPV4V6",
+		.value = "IPV4V6PCSCF",
 	},
 	{
 		.key = "ro.config.backcolor",
-		.value = "black",
+		.value = "white",
 	},
 	{
 		.key = "ro.config.beta_sec_ctrl",
@@ -2590,6 +2728,10 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "true",
 	},
 	{
+		.key = "ro.config.calendar_event_order",
+		.value = "true",
+	},
+	{
 		.key = "ro.config.callinwifi",
 		.value = "200,6",
 	},
@@ -2598,10 +2740,6 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "true",
 	},
 	{
-		.key = "ro.config.cbs_del_2B",
-		.value = "true",
-	},
-	{
 		.key = "ro.config.client_number",
 		.value = "5",
 	},
@@ -2626,12 +2764,12 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "HISI_CGUL_MODE",
 	},
 	{
-		.key = "ro.config.device_time_for_mms",
-		.value = "true",
+		.key = "ro.config.devicecolor",
+		.value = "white",
 	},
 	{
-		.key = "ro.config.devicecolor",
-		.value = "gray",
+		.key = "ro.config.dist_nosim_airplane",
+		.value = "true",
 	},
 	{
 		.key = "ro.config.dsds_mode",
@@ -2642,6 +2780,10 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "true",
 	},
 	{
+		.key = "ro.config.emergencycall_show",
+		.value = "true",
+	},
+	{
 		.key = "ro.config.enable_c2dm_delay",
 		.value = "true",
 	},
@@ -2690,10 +2832,22 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "true",
 	},
 	{
+		.key = "ro.config.hideContactWithoutNum",
+		.value = "true",
+	},
+	{
+		.key = "ro.config.hide_ecc_no_net",
+		.value = "true",
+	},
+	{
 		.key = "ro.config.hisi_cdma_supported",
 		.value = "true",
 	},
 	{
+		.key = "ro.config.hk_3gpp_notdownload",
+		.value = "true",
+	},
+	{
 		.key = "ro.config.hspap_hsdpa_open",
 		.value = "1",
 	},
@@ -2719,7 +2873,11 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.config.hw_RemindWifiToPdp",
-		.value = "false",
+		.value = "true",
+	},
+	{
+		.key = "ro.config.hw_TW_emergencyNum",
+		.value = "true",
 	},
 	{
 		.key = "ro.config.hw_allow_rs_mms",
@@ -2767,11 +2925,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.config.hw_em_solution_ver",
-		.value = "B061",
-	},
-	{
-		.key = "ro.config.hw_enable_join",
-		.value = "true",
+		.value = "B054",
 	},
 	{
 		.key = "ro.config.hw_enable_merge",
@@ -2798,32 +2952,8 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "false",
 	},
 	{
-		.key = "ro.config.hw_hide_hebrew",
-		.value = "true",
-	},
-	{
 		.key = "ro.config.hw_hidecallforward",
-		.value = "true",
-	},
-	{
-		.key = "ro.config.hw_hidecugtoast",
-		.value = "true",
-	},
-	{
-		.key = "ro.config.hw_higeo_fusion_ver",
-		.value = "0.5",
-	},
-	{
-		.key = "ro.config.hw_higeo_map_matching",
-		.value = "1",
-	},
-	{
-		.key = "ro.config.hw_higeo_nw_pos_db",
-		.value = "NA",
-	},
-	{
-		.key = "ro.config.hw_higeo_pdrsupport",
-		.value = "true",
+		.value = "false",
 	},
 	{
 		.key = "ro.config.hw_hotswap_on",
@@ -2842,6 +2972,10 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "true",
 	},
 	{
+		.key = "ro.config.hw_ims_as_normal",
+		.value = "true",
+	},
+	{
 		.key = "ro.config.hw_ipv6_support",
 		.value = "true",
 	},
@@ -2862,10 +2996,6 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "1",
 	},
 	{
-		.key = "ro.config.hw_mmi_match_list",
-		.value = "*333#",
-	},
-	{
 		.key = "ro.config.hw_multiscreen",
 		.value = "false",
 	},
@@ -2886,16 +3016,16 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "true",
 	},
 	{
-		.key = "ro.config.hw_omacp",
-		.value = "1",
+		.key = "ro.config.hw_not_modify_wifi",
+		.value = "Singtel WIFI",
 	},
 	{
-		.key = "ro.config.hw_opt_pre_contact",
-		.value = "true",
+		.key = "ro.config.hw_omacp",
+		.value = "1",
 	},
 	{
 		.key = "ro.config.hw_opta",
-		.value = "185",
+		.value = "636",
 	},
 	{
 		.key = "ro.config.hw_optb",
@@ -2958,6 +3088,10 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "true",
 	},
 	{
+		.key = "ro.config.hw_southeast_asia",
+		.value = "true",
+	},
+	{
 		.key = "ro.config.hw_srlte",
 		.value = "true",
 	},
@@ -3007,17 +3141,13 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.config.hw_volte_on",
-		.value = "false",
+		.value = "true",
 	},
 	{
 		.key = "ro.config.hw_watermark",
 		.value = "false",
 	},
 	{
-		.key = "ro.config.hw_wifi_mtu",
-		.value = "1500",
-	},
-	{
 		.key = "ro.config.hw_wifipro_enable",
 		.value = "true",
 	},
@@ -3078,6 +3208,10 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "true",
 	},
 	{
+		.key = "ro.config.not_show_net_connect",
+		.value = "true",
+	},
+	{
 		.key = "ro.config.notification_sound",
 		.value = "Bongo.ogg",
 	},
@@ -3110,6 +3244,10 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "IC,FCC,CE",
 	},
 	{
+		.key = "ro.config.scr_timeout_10sec",
+		.value = "true",
+	},
+	{
 		.key = "ro.config.show_epg_menu",
 		.value = "false",
 	},
@@ -3122,20 +3260,16 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "true",
 	},
 	{
-		.key = "ro.config.show_sim_icon",
-		.value = "true",
-	},
-	{
 		.key = "ro.config.show_vmail_number",
 		.value = "true",
 	},
 	{
 		.key = "ro.config.signalplus.tas",
-		.value = "true",
+		.value = "false",
 	},
 	{
 		.key = "ro.config.signalplus.xpass",
-		.value = "true",
+		.value = "false",
 	},
 	{
 		.key = "ro.config.small.previewpos",
@@ -3166,6 +3300,10 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "true",
 	},
 	{
+		.key = "ro.config.theme_display_tw",
+		.value = "true",
+	},
+	{
 		.key = "ro.config.tw_dialpad_show",
 		.value = "true",
 	},
@@ -3234,6 +3372,10 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "true",
 	},
 	{
+		.key = "ro.email.inline_as_att",
+		.value = "true",
+	},
+	{
 		.key = "ro.enable_boot_charger_mode",
 		.value = "0",
 	},
@@ -3259,11 +3401,11 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.hw.country",
-		.value = "meafnaf",
+		.value = "spcseas",
 	},
 	{
 		.key = "ro.hw.custPath",
-		.value = "/cust/hw/meafnaf",
+		.value = "/cust/hw/spcseas",
 	},
 	{
 		.key = "ro.hw.oemName",
@@ -3342,20 +3484,16 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "false",
 	},
 	{
-		.key = "ro.oem_unlock_supported",
-		.value = "1",
-	},
-	{
 		.key = "ro.opengles.version",
 		.value = "196610",
 	},
 	{
 		.key = "ro.product.CustCVersion",
-		.value = "C185",
+		.value = "C636",
 	},
 	{
 		.key = "ro.product.CustDVersion",
-		.value = "D138",
+		.value = "D112",
 	},
 	{
 		.key = "ro.product.board",
@@ -3399,7 +3537,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.product.locale",
-		.value = "en-US",
+		.value = "en-GB",
 	},
 	{
 		.key = "ro.product.locale.language",
@@ -3447,7 +3585,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.runtime.firstboot",
-		.value = "1508439208151",
+		.value = "1524186581019",
 	},
 	{
 		.key = "ro.secure",
@@ -3455,7 +3593,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.serialno",
-		.value = "AHK7N17124007836",
+		.value = "AHK0216C29000389",
 	},
 	{
 		.key = "ro.setupwizard.mode",
@@ -3506,10 +3644,6 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "false",
 	},
 	{
-		.key = "ro.sysui.show.normal.layout",
-		.value = "true",
-	},
-	{
 		.key = "ro.sysui.signal.layout",
 		.value = "",
 	},
@@ -3523,11 +3657,11 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.vendor.build.date",
-		.value = "Sat Dec 17 03:21:29 CST 2016",
+		.value = "Thu Nov 3 12:34:08 CST 2016",
 	},
 	{
 		.key = "ro.vendor.build.date.utc",
-		.value = "1481916089",
+		.value = "1478147648",
 	},
 	{
 		.key = "ro.vowifi.callinwifi",
@@ -3570,14 +3704,6 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "0.75",
 	},
 	{
-		.key = "sys.aps.facedown.sleep",
-		.value = "0",
-	},
-	{
-		.key = "sys.aps.facedownDetectionOn",
-		.value = "0",
-	},
-	{
 		.key = "sys.aps.gameProcessName",
 		.value = "",
 	},
@@ -3591,7 +3717,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "sys.aps.version",
-		.value = "3.3.10-3.2.10.1",
+		.value = "3.3.10-3.2.10",
 	},
 	{
 		.key = "sys.boot_completed",
@@ -3599,7 +3725,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "sys.defaultapn.enabled",
-		.value = "true",
+		.value = "false",
 	},
 	{
 		.key = "sys.fingerprint.deviceId",
@@ -3631,7 +3757,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "sys.resettype",
-		.value = "normal:coldboot",
+		.value = "normal:press1s",
 	},
 	{
 		.key = "sys.show_google_nlp",
@@ -3646,6 +3772,10 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "24300",
 	},
 	{
+		.key = "sys.sysctl.tcp_def_init_rwnd",
+		.value = "60",
+	},
+	{
 		.key = "sys.usb.config",
 		.value = "hisuite,mtp,mass_storage,adb",
 	},