Update Galaxy S7 (Global) mock test

3 files changed, 478 insertions, 325 deletions

diff --git a/test/build.prop/galaxy-s7-global.log b/test/build.prop/galaxy-s7-global.log
index 0e346f2..d14bbbb 100644
--- a/test/build.prop/galaxy-s7-global.log
+++ b/test/build.prop/galaxy-s7-global.log
@@ -2,20 +2,20 @@
 # begin build properties
 # autogenerated by buildinfo.sh
 ro.build.id=NRD90M
-ro.build.display.id=NRD90M.G930FXXU1DQD7
-ro.build.version.incremental=G930FXXU1DQD7
+ro.build.display.id=NRD90M.G930FXXU1DQJ8
+ro.build.version.incremental=G930FXXU1DQJ8
 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=2017-04-01
+ro.build.version.security_patch=2017-10-01
 ro.build.version.base_os=
-ro.build.date=Mon Apr 17 17:02:03 KST 2017
-ro.build.date.utc=1492416123
+ro.build.date=Tue Oct 24 15:32:43 KST 2017
+ro.build.date.utc=1508826763
 ro.build.type=user
 ro.build.user=dpi
-ro.build.host=SWHE7715
+ro.build.host=SWDG5301
 ro.build.tags=release-keys
 ro.build.flavor=heroltexx-user
 ro.product.model=SM-G930F
@@ -36,15 +36,15 @@ ro.board.platform=exynos5
 # ro.build.product is obsolete; use ro.product.device
 ro.build.product=herolte
 # Do not try to parse description, fingerprint, or thumbprint
-ro.build.description=heroltexx-user 7.0 NRD90M G930FXXU1DQD7 release-keys
-ro.build.fingerprint=samsung/heroltexx/herolte:7.0/NRD90M/G930FXXU1DQD7:user/release-keys
+ro.build.description=heroltexx-user 7.0 NRD90M G930FXXU1DQJ8 release-keys
+ro.build.fingerprint=samsung/heroltexx/herolte:7.0/NRD90M/G930FXXU1DQJ8:user/release-keys
 ro.build.characteristics=phone,emulator
 # Samsung Specific Properties
-ro.build.PDA=G930FXXU1DQD7
+ro.build.PDA=G930FXXU1DQJ8
 ro.build.official.release=true
-ro.build.hidden_ver=G930FXXU1DQD7
+ro.build.hidden_ver=G930FXXU1DQJ8
 ro.config.rm_preload_enabled=0
-ro.build.changelist=11104523
+ro.build.changelist=12365438
 ro.product_ship=true
 ro.chipname=exynos8890
 # end build properties
@@ -124,9 +124,9 @@ ro.securestorage.support=true
 ro.build.scafe.version=2017A
 security.mdpp=None
 ro.security.mdpp.ver=3.0
-ro.security.mdpp.release=1
+ro.security.mdpp.release=2
 ro.security.wlan.ver=1.0
-ro.security.wlan.release=1
+ro.security.wlan.release=2
 security.mdpp.result=None
 ro.hardware.keystore=mdfpp
 ro.security.vpnpp.ver=1.4
@@ -149,7 +149,7 @@ ro.ril.hsxpa=1
 ro.ril.gprsclass=10
 ro.adb.qemud=1
 ro.setupwizard.mode=OPTIONAL
-ro.com.google.gmsversion=7.0_r4
+ro.com.google.gmsversion=7.0_r8
 ro.build.selinux=1
 persist.sys.dalvik.vm.lib.2=libart.so
 dalvik.vm.isa.arm64.variant=exynos-m1
@@ -165,5 +165,5 @@ net.bt.name=Android
 dalvik.vm.stack-trace-file=/data/anr/traces.txt
 ro.build.version.sem=2402
 ro.build.version.sep=80000
-ro.expect.recovery_id=0x9c7831147c284be7a4460d997aa833b87056365f000000000000000000000000
+ro.expect.recovery_id=0x3febbe7420c506f45403ac14bdc221ea9ca7838d000000000000000000000000
 
diff --git a/test/cpuinfo/galaxy-s7-global.armeabi.log b/test/cpuinfo/galaxy-s7-global.armeabi.log
new file mode 100644
index 0000000..d908f55
--- /dev/null
+++ b/test/cpuinfo/galaxy-s7-global.armeabi.log
@@ -0,0 +1,48 @@
+processor	: 0
+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
+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
+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
+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
+Features	: half thumb fastmult vfp edsp neon vfpv3 tls vfpv4 idiva idivt lpae evtstrm aes pmull sha1 sha2 crc32
+CPU implementer	: 0x53
+CPU architecture: 8
+CPU variant	: 0x1
+CPU part	: 0x001
+CPU revision	: 1
+
+processor	: 5
+Features	: half thumb fastmult vfp edsp neon vfpv3 tls vfpv4 idiva idivt lpae evtstrm aes pmull sha1 sha2 crc32
+CPU implementer	: 0x53
+CPU architecture: 8
+CPU variant	: 0x1
+CPU part	: 0x001
+CPU revision	: 1
+
diff --git a/test/mock/galaxy-s7-global.h b/test/mock/galaxy-s7-global.h
index bcdc3a3..1345a8b 100644
--- a/test/mock/galaxy-s7-global.h
+++ b/test/mock/galaxy-s7-global.h
@@ -1,4 +1,5 @@
 struct cpuinfo_mock_file filesystem[] = {
+#if CPUINFO_ARCH_ARM64
 	{
 		.path = "/proc/cpuinfo",
 		.size = 984,
@@ -52,6 +53,61 @@ struct cpuinfo_mock_file filesystem[] = {
 			"CPU revision\t: 1\n"
 			"\n",
 	},
+#elif CPUINFO_ARCH_ARM
+	{
+		.path = "/proc/cpuinfo",
+		.size = 1332,
+		.content =
+			"processor\t: 0\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"
+			"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"
+			"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"
+			"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"
+			"Features\t: half thumb fastmult vfp edsp neon vfpv3 tls vfpv4 idiva idivt lpae evtstrm aes pmull sha1 sha2 crc32\n"
+			"CPU implementer\t: 0x53\n"
+			"CPU architecture: 8\n"
+			"CPU variant\t: 0x1\n"
+			"CPU part\t: 0x001\n"
+			"CPU revision\t: 1\n"
+			"\n"
+			"processor\t: 5\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: 0x53\n"
+			"CPU architecture: 8\n"
+			"CPU variant\t: 0x1\n"
+			"CPU part\t: 0x001\n"
+			"CPU revision\t: 1\n"
+			"\n",
+	},
+#endif
 	{
 		.path = "/system/build.prop",
 		.size = 4795,
@@ -60,20 +116,20 @@ struct cpuinfo_mock_file filesystem[] = {
 			"# begin build properties\n"
 			"# autogenerated by buildinfo.sh\n"
 			"ro.build.id=NRD90M\n"
-			"ro.build.display.id=NRD90M.G930FXXU1DQD7\n"
-			"ro.build.version.incremental=G930FXXU1DQD7\n"
+			"ro.build.display.id=NRD90M.G930FXXU1DQJ8\n"
+			"ro.build.version.incremental=G930FXXU1DQJ8\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=2017-04-01\n"
+			"ro.build.version.security_patch=2017-10-01\n"
 			"ro.build.version.base_os=\n"
-			"ro.build.date=Mon Apr 17 17:02:03 KST 2017\n"
-			"ro.build.date.utc=1492416123\n"
+			"ro.build.date=Tue Oct 24 15:32:43 KST 2017\n"
+			"ro.build.date.utc=1508826763\n"
 			"ro.build.type=user\n"
 			"ro.build.user=dpi\n"
-			"ro.build.host=SWHE7715\n"
+			"ro.build.host=SWDG5301\n"
 			"ro.build.tags=release-keys\n"
 			"ro.build.flavor=heroltexx-user\n"
 			"ro.product.model=SM-G930F\n"
@@ -94,15 +150,15 @@ struct cpuinfo_mock_file filesystem[] = {
 			"# ro.build.product is obsolete; use ro.product.device\n"
 			"ro.build.product=herolte\n"
 			"# Do not try to parse description, fingerprint, or thumbprint\n"
-			"ro.build.description=heroltexx-user 7.0 NRD90M G930FXXU1DQD7 release-keys\n"
-			"ro.build.fingerprint=samsung/heroltexx/herolte:7.0/NRD90M/G930FXXU1DQD7:user/release-keys\n"
+			"ro.build.description=heroltexx-user 7.0 NRD90M G930FXXU1DQJ8 release-keys\n"
+			"ro.build.fingerprint=samsung/heroltexx/herolte:7.0/NRD90M/G930FXXU1DQJ8:user/release-keys\n"
 			"ro.build.characteristics=phone,emulator\n"
 			"# Samsung Specific Properties\n"
-			"ro.build.PDA=G930FXXU1DQD7\n"
+			"ro.build.PDA=G930FXXU1DQJ8\n"
 			"ro.build.official.release=true\n"
-			"ro.build.hidden_ver=G930FXXU1DQD7\n"
+			"ro.build.hidden_ver=G930FXXU1DQJ8\n"
 			"ro.config.rm_preload_enabled=0\n"
-			"ro.build.changelist=11104523\n"
+			"ro.build.changelist=12365438\n"
 			"ro.product_ship=true\n"
 			"ro.chipname=exynos8890\n"
 			"# end build properties\n"
@@ -182,9 +238,9 @@ struct cpuinfo_mock_file filesystem[] = {
 			"ro.build.scafe.version=2017A\n"
 			"security.mdpp=None\n"
 			"ro.security.mdpp.ver=3.0\n"
-			"ro.security.mdpp.release=1\n"
+			"ro.security.mdpp.release=2\n"
 			"ro.security.wlan.ver=1.0\n"
-			"ro.security.wlan.release=1\n"
+			"ro.security.wlan.release=2\n"
 			"security.mdpp.result=None\n"
 			"ro.hardware.keystore=mdfpp\n"
 			"ro.security.vpnpp.ver=1.4\n"
@@ -207,7 +263,7 @@ struct cpuinfo_mock_file filesystem[] = {
 			"ro.ril.gprsclass=10\n"
 			"ro.adb.qemud=1\n"
 			"ro.setupwizard.mode=OPTIONAL\n"
-			"ro.com.google.gmsversion=7.0_r4\n"
+			"ro.com.google.gmsversion=7.0_r8\n"
 			"ro.build.selinux=1\n"
 			"persist.sys.dalvik.vm.lib.2=libart.so\n"
 			"dalvik.vm.isa.arm64.variant=exynos-m1\n"
@@ -223,23 +279,43 @@ struct cpuinfo_mock_file filesystem[] = {
 			"dalvik.vm.stack-trace-file=/data/anr/traces.txt\n"
 			"ro.build.version.sem=2402\n"
 			"ro.build.version.sep=80000\n"
-			"ro.expect.recovery_id=0x9c7831147c284be7a4460d997aa833b87056365f000000000000000000000000\n"
+			"ro.expect.recovery_id=0x3febbe7420c506f45403ac14bdc221ea9ca7838d000000000000000000000000\n"
 			"\n",
 	},
 	{
+		.path = "/sys/devices/soc0/family",
+		.size = 15,
+		.content = "Samsung Exynos\n",
+	},
+	{
+		.path = "/sys/devices/soc0/machine",
+		.size = 48,
+		.content = "Samsung UNIVERSAL8890 board based on EXYNOS8890\n",
+	},
+	{
+		.path = "/sys/devices/soc0/revision",
+		.size = 3,
+		.content = "32\n",
+	},
+	{
+		.path = "/sys/devices/soc0/soc_id",
+		.size = 11,
+		.content = "EXYNOS8890\n",
+	},
+	{
 		.path = "/sys/devices/system/cpu/kernel_max",
 		.size = 2,
 		.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",
+		.path = "/sys/devices/system/cpu/offline",
 		.size = 4,
-		.content = "0-7\n",
+		.content = "6-7\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/online",
@@ -247,51 +323,51 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content = "0-5\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/offline",
+		.path = "/sys/devices/system/cpu/possible",
 		.size = 4,
-		.content = "6-7\n",
+		.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/cpufreq/all_time_in_state",
-		.size = 1204,
+		.size = 1182,
 		.content =
 			"freq\t\tcpu0\t\tcpu1\t\tcpu2\t\tcpu3\t\tcpu4\t\tcpu5\t\tcpu6\t\tcpu7\t\t\n"
-			"442000\t\t1140\t\t1140\t\t1140\t\t1140\t\tN/A\t\tN/A\t\t\n"
-			"546000\t\t13\t\t13\t\t13\t\t13\t\tN/A\t\tN/A\t\t\n"
-			"650000\t\t10\t\t10\t\t10\t\t10\t\tN/A\t\tN/A\t\t\n"
-			"728000\t\tN/A\t\tN/A\t\tN/A\t\tN/A\t\t1614\t\t1614\t\t\n"
-			"754000\t\t0\t\t0\t\t0\t\t0\t\tN/A\t\tN/A\t\t\n"
+			"442000\t\t0\t\t0\t\t0\t\t0\t\tN/A\t\tN/A\t\t\n"
+			"546000\t\t0\t\t0\t\t0\t\t0\t\tN/A\t\tN/A\t\t\n"
+			"650000\t\t0\t\t0\t\t0\t\t0\t\tN/A\t\tN/A\t\t\n"
+			"728000\t\tN/A\t\tN/A\t\tN/A\t\tN/A\t\t26\t\t26\t\t\n"
+			"754000\t\t1293\t\t1293\t\t1293\t\t1293\t\tN/A\t\tN/A\t\t\n"
 			"832000\t\tN/A\t\tN/A\t\tN/A\t\tN/A\t\t0\t\t0\t\t\n"
-			"858000\t\t103\t\t103\t\t103\t\t103\t\tN/A\t\tN/A\t\t\n"
+			"858000\t\t38\t\t38\t\t38\t\t38\t\tN/A\t\tN/A\t\t\n"
 			"936000\t\tN/A\t\tN/A\t\tN/A\t\tN/A\t\t0\t\t0\t\t\n"
-			"962000\t\t31\t\t31\t\t31\t\t31\t\tN/A\t\tN/A\t\t\n"
-			"1040000\t\tN/A\t\tN/A\t\tN/A\t\tN/A\t\t3\t\t3\t\t\n"
-			"1066000\t\t62\t\t62\t\t62\t\t62\t\tN/A\t\tN/A\t\t\n"
-			"1144000\t\tN/A\t\tN/A\t\tN/A\t\tN/A\t\t6\t\t6\t\t\n"
-			"1170000\t\t138\t\t138\t\t138\t\t138\t\tN/A\t\tN/A\t\t\n"
-			"1248000\t\tN/A\t\tN/A\t\tN/A\t\tN/A\t\t55\t\t55\t\t\n"
-			"1274000\t\t27\t\t27\t\t27\t\t27\t\tN/A\t\tN/A\t\t\n"
+			"962000\t\t29\t\t29\t\t29\t\t29\t\tN/A\t\tN/A\t\t\n"
+			"1040000\t\tN/A\t\tN/A\t\tN/A\t\tN/A\t\t0\t\t0\t\t\n"
+			"1066000\t\t53\t\t53\t\t53\t\t53\t\tN/A\t\tN/A\t\t\n"
+			"1144000\t\tN/A\t\tN/A\t\tN/A\t\tN/A\t\t0\t\t0\t\t\n"
+			"1170000\t\t66\t\t66\t\t66\t\t66\t\tN/A\t\tN/A\t\t\n"
+			"1248000\t\tN/A\t\tN/A\t\tN/A\t\tN/A\t\t0\t\t0\t\t\n"
+			"1274000\t\t13\t\t13\t\t13\t\t13\t\tN/A\t\tN/A\t\t\n"
 			"1352000\t\tN/A\t\tN/A\t\tN/A\t\tN/A\t\t0\t\t0\t\t\n"
-			"1378000\t\t101\t\t101\t\t101\t\t101\t\tN/A\t\tN/A\t\t\n"
-			"1456000\t\tN/A\t\tN/A\t\tN/A\t\tN/A\t\t10\t\t10\t\t\n"
-			"1482000\t\t18\t\t18\t\t18\t\t18\t\tN/A\t\tN/A\t\t\n"
+			"1378000\t\t24\t\t24\t\t24\t\t24\t\tN/A\t\tN/A\t\t\n"
+			"1456000\t\tN/A\t\tN/A\t\tN/A\t\tN/A\t\t0\t\t0\t\t\n"
+			"1482000\t\t8\t\t8\t\t8\t\t8\t\tN/A\t\tN/A\t\t\n"
 			"1560000\t\tN/A\t\tN/A\t\tN/A\t\tN/A\t\t0\t\t0\t\t\n"
-			"1586000\t\t4021\t\t4021\t\t4021\t\t4021\t\tN/A\t\tN/A\t\t\n"
+			"1586000\t\t3974\t\t3974\t\t3974\t\t3974\t\tN/A\t\tN/A\t\t\n"
 			"1664000\t\tN/A\t\tN/A\t\tN/A\t\tN/A\t\t0\t\t0\t\t\n"
-			"1768000\t\tN/A\t\tN/A\t\tN/A\t\tN/A\t\t58\t\t58\t\t\n"
-			"1872000\t\tN/A\t\tN/A\t\tN/A\t\tN/A\t\t0\t\t0\t\t\n"
-			"1976000\t\tN/A\t\tN/A\t\tN/A\t\tN/A\t\t0\t\t0\t\t\n"
-			"2080000\t\tN/A\t\tN/A\t\tN/A\t\tN/A\t\t0\t\t0\t\t\n"
-			"2184000\t\tN/A\t\tN/A\t\tN/A\t\tN/A\t\t0\t\t0\t\t\n"
-			"2288000\t\tN/A\t\tN/A\t\tN/A\t\tN/A\t\t3918\t\t3918\t\t\n"
+			"1768000\t\tN/A\t\tN/A\t\tN/A\t\tN/A\t\t29\t\t29\t\t\n"
+			"1872000\t\tN/A\t\tN/A\t\tN/A\t\tN/A\t\t1426\t\t1426\t\t\n"
+			"1976000\t\tN/A\t\tN/A\t\tN/A\t\tN/A\t\t29\t\t29\t\t\n"
+			"2080000\t\tN/A\t\tN/A\t\tN/A\t\tN/A\t\t13\t\t13\t\t\n"
+			"2184000\t\tN/A\t\tN/A\t\tN/A\t\tN/A\t\t4\t\t4\t\t\n"
+			"2288000\t\tN/A\t\tN/A\t\tN/A\t\tN/A\t\t3965\t\t3965\t\t\n"
 			"2392000\t\tN/A\t\tN/A\t\tN/A\t\tN/A\t\t0\t\t0\t\t\n"
 			"2496000\t\tN/A\t\tN/A\t\tN/A\t\tN/A\t\t0\t\t0\t\t\n"
-			"2600000\t\tN/A\t\tN/A\t\tN/A\t\tN/A\t\t0\t\t0\t\t\n",
+			"2600000\t\tN/A\t\tN/A\t\tN/A\t\tN/A\t\t6\t\t6\t\t\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpufreq/current_in_state",
@@ -313,6 +389,11 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content = "menu\n",
 	},
 	{
+		.path = "/sys/devices/system/cpu/cpu0/cpuidle/driver/name",
+		.size = 18,
+		.content = "boot_cluster_idle\n",
+	},
+	{
 		.path = "/sys/devices/system/cpu/cpu0/cpufreq/affected_cpus",
 		.size = 8,
 		.content = "0 1 2 3\n",
@@ -345,7 +426,7 @@ struct cpuinfo_mock_file filesystem[] = {
 	{
 		.path = "/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq",
 		.size = 7,
-		.content = "442000\n",
+		.content = "754000\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu0/cpufreq/scaling_driver",
@@ -364,30 +445,35 @@ struct cpuinfo_mock_file filesystem[] = {
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu0/cpufreq/stats/time_in_state",
-		.size = 132,
+		.size = 126,
 		.content =
-			"1586000 4021\n"
-			"1482000 18\n"
-			"1378000 101\n"
-			"1274000 27\n"
-			"1170000 138\n"
-			"1066000 62\n"
-			"962000 31\n"
-			"858000 103\n"
-			"754000 0\n"
-			"650000 10\n"
-			"546000 13\n"
-			"442000 1258\n",
+			"1586000 3974\n"
+			"1482000 8\n"
+			"1378000 32\n"
+			"1274000 13\n"
+			"1170000 69\n"
+			"1066000 53\n"
+			"962000 29\n"
+			"858000 40\n"
+			"754000 1416\n"
+			"650000 0\n"
+			"546000 0\n"
+			"442000 0\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu0/cpufreq/stats/total_trans",
-		.size = 4,
-		.content = "133\n",
+		.size = 3,
+		.content = "74\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu0/topology/physical_package_id",
+		.path = "/sys/devices/system/cpu/cpu0/topology/core_id",
 		.size = 2,
-		.content = "1\n",
+		.content = "0\n",
+	},
+	{
+		.path = "/sys/devices/system/cpu/cpu0/topology/core_siblings",
+		.size = 3,
+		.content = "0f\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu0/topology/core_siblings_list",
@@ -395,14 +481,14 @@ struct cpuinfo_mock_file filesystem[] = {
 		.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/physical_package_id",
+		.size = 2,
+		.content = "1\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu0/topology/core_id",
-		.size = 2,
-		.content = "0\n",
+		.path = "/sys/devices/system/cpu/cpu0/topology/thread_siblings",
+		.size = 3,
+		.content = "01\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu0/topology/thread_siblings_list",
@@ -410,9 +496,9 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content = "0\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu0/topology/thread_siblings",
-		.size = 3,
-		.content = "01\n",
+		.path = "/sys/devices/system/cpu/cpu1/cpuidle/driver/name",
+		.size = 18,
+		.content = "boot_cluster_idle\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu1/cpufreq/affected_cpus",
@@ -447,7 +533,7 @@ struct cpuinfo_mock_file filesystem[] = {
 	{
 		.path = "/sys/devices/system/cpu/cpu1/cpufreq/scaling_cur_freq",
 		.size = 7,
-		.content = "442000\n",
+		.content = "754000\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu1/cpufreq/scaling_driver",
@@ -466,48 +552,43 @@ struct cpuinfo_mock_file filesystem[] = {
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu1/cpufreq/stats/time_in_state",
-		.size = 132,
+		.size = 126,
 		.content =
-			"1586000 4021\n"
-			"1482000 18\n"
-			"1378000 101\n"
-			"1274000 27\n"
-			"1170000 138\n"
-			"1066000 62\n"
-			"962000 31\n"
-			"858000 109\n"
-			"754000 0\n"
-			"650000 10\n"
-			"546000 20\n"
-			"442000 1610\n",
+			"1586000 3974\n"
+			"1482000 8\n"
+			"1378000 36\n"
+			"1274000 13\n"
+			"1170000 71\n"
+			"1066000 53\n"
+			"962000 29\n"
+			"858000 42\n"
+			"754000 1645\n"
+			"650000 0\n"
+			"546000 0\n"
+			"442000 0\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu1/cpufreq/stats/total_trans",
-		.size = 4,
-		.content = "137\n",
+		.size = 3,
+		.content = "78\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu1/topology/physical_package_id",
+		.path = "/sys/devices/system/cpu/cpu1/topology/core_id",
 		.size = 2,
 		.content = "1\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu1/topology/core_siblings_list",
-		.size = 4,
-		.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/core_id",
-		.size = 2,
-		.content = "1\n",
+		.path = "/sys/devices/system/cpu/cpu1/topology/core_siblings_list",
+		.size = 4,
+		.content = "0-3\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu1/topology/thread_siblings_list",
+		.path = "/sys/devices/system/cpu/cpu1/topology/physical_package_id",
 		.size = 2,
 		.content = "1\n",
 	},
@@ -517,6 +598,16 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content = "02\n",
 	},
 	{
+		.path = "/sys/devices/system/cpu/cpu1/topology/thread_siblings_list",
+		.size = 2,
+		.content = "1\n",
+	},
+	{
+		.path = "/sys/devices/system/cpu/cpu2/cpuidle/driver/name",
+		.size = 18,
+		.content = "boot_cluster_idle\n",
+	},
+	{
 		.path = "/sys/devices/system/cpu/cpu2/cpufreq/affected_cpus",
 		.size = 8,
 		.content = "0 1 2 3\n",
@@ -549,7 +640,7 @@ struct cpuinfo_mock_file filesystem[] = {
 	{
 		.path = "/sys/devices/system/cpu/cpu2/cpufreq/scaling_cur_freq",
 		.size = 7,
-		.content = "442000\n",
+		.content = "754000\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu2/cpufreq/scaling_driver",
@@ -568,30 +659,35 @@ struct cpuinfo_mock_file filesystem[] = {
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu2/cpufreq/stats/time_in_state",
-		.size = 132,
+		.size = 126,
 		.content =
-			"1586000 4021\n"
-			"1482000 23\n"
-			"1378000 105\n"
-			"1274000 27\n"
-			"1170000 141\n"
-			"1066000 62\n"
-			"962000 31\n"
-			"858000 111\n"
-			"754000 0\n"
-			"650000 10\n"
-			"546000 41\n"
-			"442000 1924\n",
+			"1586000 3974\n"
+			"1482000 8\n"
+			"1378000 36\n"
+			"1274000 13\n"
+			"1170000 71\n"
+			"1066000 53\n"
+			"962000 29\n"
+			"858000 42\n"
+			"754000 1885\n"
+			"650000 0\n"
+			"546000 0\n"
+			"442000 0\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu2/cpufreq/stats/total_trans",
-		.size = 4,
-		.content = "145\n",
+		.size = 3,
+		.content = "78\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu2/topology/physical_package_id",
+		.path = "/sys/devices/system/cpu/cpu2/topology/core_id",
 		.size = 2,
-		.content = "1\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",
@@ -599,14 +695,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 = "1\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",
@@ -614,9 +710,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 = 18,
+		.content = "boot_cluster_idle\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu3/cpufreq/affected_cpus",
@@ -670,30 +766,35 @@ struct cpuinfo_mock_file filesystem[] = {
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu3/cpufreq/stats/time_in_state",
-		.size = 132,
+		.size = 128,
 		.content =
-			"1586000 4021\n"
-			"1482000 23\n"
-			"1378000 109\n"
-			"1274000 32\n"
-			"1170000 143\n"
-			"1066000 62\n"
-			"962000 33\n"
-			"858000 135\n"
-			"754000 1\n"
-			"650000 12\n"
-			"546000 50\n"
-			"442000 2216\n",
+			"1586000 3974\n"
+			"1482000 8\n"
+			"1378000 36\n"
+			"1274000 13\n"
+			"1170000 71\n"
+			"1066000 53\n"
+			"962000 29\n"
+			"858000 42\n"
+			"754000 2047\n"
+			"650000 0\n"
+			"546000 0\n"
+			"442000 110\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu3/cpufreq/stats/total_trans",
-		.size = 4,
-		.content = "160\n",
+		.size = 3,
+		.content = "79\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu3/topology/physical_package_id",
+		.path = "/sys/devices/system/cpu/cpu3/topology/core_id",
 		.size = 2,
-		.content = "1\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",
@@ -701,14 +802,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 = "1\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",
@@ -716,9 +817,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 = "non-boot_cluster_idle\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu4/cpufreq/affected_cpus",
@@ -777,27 +878,27 @@ struct cpuinfo_mock_file filesystem[] = {
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu4/cpufreq/stats/time_in_state",
-		.size = 196,
+		.size = 201,
 		.content =
-			"2600000 4\n"
+			"2600000 24\n"
 			"2496000 0\n"
-			"2392000 0\n"
-			"2288000 3920\n"
-			"2184000 0\n"
-			"2080000 2\n"
-			"1976000 0\n"
-			"1872000 2\n"
-			"1768000 58\n"
-			"1664000 2\n"
-			"1560000 4\n"
-			"1456000 27\n"
+			"2392000 3\n"
+			"2288000 3965\n"
+			"2184000 4\n"
+			"2080000 16\n"
+			"1976000 29\n"
+			"1872000 2204\n"
+			"1768000 29\n"
+			"1664000 3\n"
+			"1560000 0\n"
+			"1456000 14\n"
 			"1352000 0\n"
-			"1248000 73\n"
-			"1144000 6\n"
-			"1040000 3\n"
+			"1248000 29\n"
+			"1144000 0\n"
+			"1040000 0\n"
 			"936000 0\n"
-			"832000 3\n"
-			"728000 3085\n",
+			"832000 6\n"
+			"728000 350\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu4/cpufreq/stats/total_trans",
@@ -805,34 +906,39 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content = "38\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu4/topology/physical_package_id",
+		.path = "/sys/devices/system/cpu/cpu4/topology/core_id",
 		.size = 2,
 		.content = "0\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu4/topology/core_siblings_list",
-		.size = 4,
-		.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/core_id",
+		.path = "/sys/devices/system/cpu/cpu4/topology/core_siblings_list",
+		.size = 4,
+		.content = "4-7\n",
+	},
+	{
+		.path = "/sys/devices/system/cpu/cpu4/topology/physical_package_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",
 		.size = 2,
 		.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 = "non-boot_cluster_idle\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu5/cpufreq/affected_cpus",
@@ -891,27 +997,27 @@ struct cpuinfo_mock_file filesystem[] = {
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu5/cpufreq/stats/time_in_state",
-		.size = 197,
+		.size = 202,
 		.content =
-			"2600000 28\n"
+			"2600000 74\n"
 			"2496000 0\n"
-			"2392000 0\n"
-			"2288000 3922\n"
-			"2184000 0\n"
-			"2080000 4\n"
-			"1976000 0\n"
-			"1872000 4\n"
-			"1768000 58\n"
-			"1664000 4\n"
-			"1560000 4\n"
-			"1456000 36\n"
-			"1352000 0\n"
-			"1248000 82\n"
-			"1144000 6\n"
-			"1040000 3\n"
-			"936000 0\n"
-			"832000 3\n"
-			"728000 3745\n",
+			"2392000 8\n"
+			"2288000 3970\n"
+			"2184000 4\n"
+			"2080000 16\n"
+			"1976000 29\n"
+			"1872000 2204\n"
+			"1768000 29\n"
+			"1664000 9\n"
+			"1560000 0\n"
+			"1456000 18\n"
+			"1352000 5\n"
+			"1248000 29\n"
+			"1144000 0\n"
+			"1040000 0\n"
+			"936000 80\n"
+			"832000 6\n"
+			"728000 479\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu5/cpufreq/stats/total_trans",
@@ -919,14 +1025,9 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content = "46\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu5/topology/physical_package_id",
+		.path = "/sys/devices/system/cpu/cpu5/topology/core_id",
 		.size = 2,
-		.content = "0\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu5/topology/core_siblings_list",
-		.size = 4,
-		.content = "4-7\n",
+		.content = "1\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu5/topology/core_siblings",
@@ -934,23 +1035,27 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content = "f0\n",
 	},
 	{
-		.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/thread_siblings_list",
+		.path = "/sys/devices/system/cpu/cpu5/topology/physical_package_id",
 		.size = 2,
-		.content = "5\n",
+		.content = "0\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",
+	},
 	{ NULL },
 };
-
 #ifdef __ANDROID__
 struct cpuinfo_mock_property properties[] = {
 	{
@@ -1058,10 +1163,6 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "1",
 	},
 	{
-		.key = "dev.kies.deviceowner",
-		.value = "0",
-	},
-	{
 		.key = "dev.kies.drivedisplay",
 		.value = "0",
 	},
@@ -1102,16 +1203,12 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "1",
 	},
 	{
-		.key = "dev.ssrm.live_thumbnail",
-		.value = "1",
-	},
-	{
 		.key = "dev.ssrm.mode",
 		.value = "dm;",
 	},
 	{
 		.key = "dev.ssrm.pst",
-		.value = "410",
+		.value = "420",
 	},
 	{
 		.key = "dev.ssrm.smart_switch",
@@ -1167,7 +1264,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "gsm.version.baseband",
-		.value = "G930FXXU1DQD7",
+		.value = "G930FXXU1DQIL",
 	},
 	{
 		.key = "gsm.version.ril-impl",
@@ -1250,10 +1347,6 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "running",
 	},
 	{
-		.key = "init.svc.daemonsu",
-		.value = "stopped",
-	},
-	{
 		.key = "init.svc.debuggerd",
 		.value = "running",
 	},
@@ -1370,10 +1463,6 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "running",
 	},
 	{
-		.key = "init.svc.p2p_supplicant",
-		.value = "running",
-	},
-	{
 		.key = "init.svc.powersnd",
 		.value = "stopped",
 	},
@@ -1467,19 +1556,11 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "net.change",
-		.value = "net.dns2",
-	},
-	{
-		.key = "net.dns1",
-		.value = "208.67.222.222",
-	},
-	{
-		.key = "net.dns2",
-		.value = "208.67.220.220",
+		.value = "net.qtaguid_enabled",
 	},
 	{
 		.key = "net.hostname",
-		.value = "android-e24a7742dc20e5c8",
+		.value = "android-b9735a4ba009c89a",
 	},
 	{
 		.key = "net.knox.shareddevice.version",
@@ -1523,11 +1604,11 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "nfc.fw.rfreg_display_ver",
-		.value = "1",
+		.value = "2",
 	},
 	{
 		.key = "nfc.fw.rfreg_ver",
-		.value = "17/1/23/16.2.29",
+		.value = "17/4/18/17.25.19",
 	},
 	{
 		.key = "nfc.smartcard.binded",
@@ -1575,7 +1656,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "persist.audio.sales_code",
-		.value = "O2U",
+		.value = "XSG",
 	},
 	{
 		.key = "persist.audio.soundalivefxsec",
@@ -1587,7 +1668,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "persist.audio.sysvolume",
-		.value = "0",
+		.value = "9",
 	},
 	{
 		.key = "persist.audio.uhqa",
@@ -1599,7 +1680,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "persist.bluetooth_fw_ver",
-		.value = "bcm4359C0_V0092.0143_semco.hcd",
+		.value = "bcm4359C0_V0118.0173_semco.hcd",
 	},
 	{
 		.key = "persist.demo.hdmirotationlock",
@@ -1655,15 +1736,19 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "persist.sys.ccm.date",
-		.value = "Mon Apr 17 17:02:03 KST 2017",
+		.value = "Tue Oct 24 15:32:43 KST 2017",
+	},
+	{
+		.key = "persist.sys.clssprld1",
+		.value = "888",
 	},
 	{
 		.key = "persist.sys.clssprld2",
-		.value = "366",
+		.value = "356",
 	},
 	{
 		.key = "persist.sys.clssprld3",
-		.value = "1211",
+		.value = "1221",
 	},
 	{
 		.key = "persist.sys.cpboot",
@@ -1711,7 +1796,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "persist.sys.timezone",
-		.value = "America/Los_Angeles",
+		.value = "America/New_York",
 	},
 	{
 		.key = "persist.sys.usb.config",
@@ -1723,7 +1808,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "persist.sys.webview.vmsize",
-		.value = "116905264",
+		.value = "112887376",
 	},
 	{
 		.key = "pm.dexopt.ab-ota",
@@ -1762,6 +1847,10 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "speed",
 	},
 	{
+		.key = "ril.CHAR",
+		.value = "111727107",
+	},
+	{
 		.key = "ril.CompleteMsg",
 		.value = "OK",
 	},
@@ -1770,6 +1859,10 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "0",
 	},
 	{
+		.key = "ril.LIMA",
+		.value = "40491",
+	},
+	{
 		.key = "ril.RildInit",
 		.value = "1",
 	},
@@ -1814,12 +1907,8 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "1",
 	},
 	{
-		.key = "ril.data.intfprefix",
-		.value = "rmnet",
-	},
-	{
 		.key = "ril.debug_modemfactory",
-		.value = "CSC Feature State: IMS ON, EPDG ON",
+		.value = "CSC Feature State: IMS ON, EPDG OFF",
 	},
 	{
 		.key = "ril.ecclist00",
@@ -1850,12 +1939,16 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "0",
 	},
 	{
+		.key = "ril.iscdma",
+		.value = "0",
+	},
+	{
 		.key = "ril.isctc",
 		.value = "0",
 	},
 	{
 		.key = "ril.model_id",
-		.value = "QB6266275",
+		.value = "QB7634580",
 	},
 	{
 		.key = "ril.modem.board",
@@ -1863,19 +1956,23 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ril.official_cscver",
-		.value = "G930FTEF1DQD1",
+		.value = "G930FOJV1DQIL",
 	},
 	{
 		.key = "ril.product_code",
-		.value = "SM-G930FZDAO2U",
+		.value = "SM-G930FZKAXSG",
 	},
 	{
 		.key = "ril.radiostate",
 		.value = "10",
 	},
 	{
+		.key = "ril.read.done",
+		.value = "1",
+	},
+	{
 		.key = "ril.rfcal_date",
-		.value = "20160619",
+		.value = "20161104",
 	},
 	{
 		.key = "ril.rildreset",
@@ -1883,7 +1980,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ril.serialnumber",
-		.value = "R58H62W1B8A",
+		.value = "R58HB0TBT8X",
 	},
 	{
 		.key = "ril.servicestate",
@@ -1903,7 +2000,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ril.sw_ver",
-		.value = "G930FXXU1DQD7",
+		.value = "G930FXXU1DQIL",
 	},
 	{
 		.key = "ril.timezoneID",
@@ -1963,7 +2060,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.boot.bootloader",
-		.value = "G930FXXU1DQD7",
+		.value = "G930FXXU1DQJ8",
 	},
 	{
 		.key = "ro.boot.debug_level",
@@ -1979,7 +2076,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.boot.fmp_config",
-		.value = "0",
+		.value = "1",
 	},
 	{
 		.key = "ro.boot.hardware",
@@ -2011,7 +2108,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.boot.serialno",
-		.value = "ce051605cb380d3005",
+		.value = "ce10160ac4b5291704",
 	},
 	{
 		.key = "ro.boot.ucs_mode",
@@ -2019,7 +2116,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.boot.warranty_bit",
-		.value = "1",
+		.value = "0",
 	},
 	{
 		.key = "ro.boot_recovery",
@@ -2027,19 +2124,19 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.bootimage.build.date",
-		.value = "Mon Apr 17 17:02:03 KST 2017",
+		.value = "Tue Oct 24 15:32:43 KST 2017",
 	},
 	{
 		.key = "ro.bootimage.build.date.utc",
-		.value = "1492416123",
+		.value = "1508826763",
 	},
 	{
 		.key = "ro.bootimage.build.fingerprint",
-		.value = "samsung/heroltexx/herolte:7.0/NRD90M/G930FXXU1DQD7:user/test-keys",
+		.value = "samsung/heroltexx/herolte:7.0/NRD90M/G930FXXU1DQJ8:user/test-keys",
 	},
 	{
 		.key = "ro.bootloader",
-		.value = "G930FXXU1DQD7",
+		.value = "G930FXXU1DQJ8",
 	},
 	{
 		.key = "ro.bootmode",
@@ -2051,11 +2148,11 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.build.PDA",
-		.value = "G930FXXU1DQD7",
+		.value = "G930FXXU1DQJ8",
 	},
 	{
 		.key = "ro.build.changelist",
-		.value = "11104523",
+		.value = "12365438",
 	},
 	{
 		.key = "ro.build.characteristics",
@@ -2063,23 +2160,23 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.build.date",
-		.value = "Mon Apr 17 17:02:03 KST 2017",
+		.value = "Tue Oct 24 15:32:43 KST 2017",
 	},
 	{
 		.key = "ro.build.date.utc",
-		.value = "1492416123",
+		.value = "1508826763",
 	},
 	{
 		.key = "ro.build.description",
-		.value = "heroltexx-user 7.0 NRD90M G930FXXU1DQD7 release-keys",
+		.value = "heroltexx-user 7.0 NRD90M G930FXXU1DQJ8 release-keys",
 	},
 	{
 		.key = "ro.build.display.id",
-		.value = "NRD90M.G930FXXU1DQD7",
+		.value = "NRD90M.G930FXXU1DQJ8",
 	},
 	{
 		.key = "ro.build.fingerprint",
-		.value = "samsung/heroltexx/herolte:7.0/NRD90M/G930FXXU1DQD7:user/release-keys",
+		.value = "samsung/heroltexx/herolte:7.0/NRD90M/G930FXXU1DQJ8:user/release-keys",
 	},
 	{
 		.key = "ro.build.flavor",
@@ -2087,11 +2184,11 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.build.hidden_ver",
-		.value = "G930FXXU1DQD7",
+		.value = "G930FXXU1DQJ8",
 	},
 	{
 		.key = "ro.build.host",
-		.value = "SWHE7715",
+		.value = "SWDG5301",
 	},
 	{
 		.key = "ro.build.id",
@@ -2143,7 +2240,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.build.version.incremental",
-		.value = "G930FXXU1DQD7",
+		.value = "G930FXXU1DQJ8",
 	},
 	{
 		.key = "ro.build.version.preview_sdk",
@@ -2159,7 +2256,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.build.version.security_patch",
-		.value = "2017-04-01",
+		.value = "2017-10-01",
 	},
 	{
 		.key = "ro.build.version.sem",
@@ -2183,7 +2280,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.com.google.gmsversion",
-		.value = "7.0_r4",
+		.value = "7.0_r8",
 	},
 	{
 		.key = "ro.config.alarm_alert",
@@ -2278,24 +2375,32 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "unknown",
 	},
 	{
+		.key = "ro.crypto.fs_crypto_blkdev",
+		.value = "/dev/block/dm-1",
+	},
+	{
 		.key = "ro.crypto.fuse_sdcard",
 		.value = "true",
 	},
 	{
 		.key = "ro.crypto.state",
-		.value = "unencrypted",
+		.value = "encrypted",
+	},
+	{
+		.key = "ro.crypto.type",
+		.value = "block",
 	},
 	{
 		.key = "ro.csc.country_code",
-		.value = "UK & IRE",
+		.value = "UAE",
 	},
 	{
 		.key = "ro.csc.countryiso_code",
-		.value = "GB",
+		.value = "AE",
 	},
 	{
 		.key = "ro.csc.sales_code",
-		.value = "O2U",
+		.value = "XSG",
 	},
 	{
 		.key = "ro.dalvik.vm.native.bridge",
@@ -2319,7 +2424,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.expect.recovery_id",
-		.value = "0x9c7831147c284be7a4460d997aa833b87056365f000000000000000000000000",
+		.value = "0x3febbe7420c506f45403ac14bdc221ea9ca7838d000000000000000000000000",
 	},
 	{
 		.key = "ro.exynos.dss",
@@ -2327,7 +2432,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.fmp_config",
-		.value = "0",
+		.value = "1",
 	},
 	{
 		.key = "ro.frp.pst",
@@ -2511,7 +2616,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.runtime.firstboot",
-		.value = "1505432310859",
+		.value = "1487045962023",
 	},
 	{
 		.key = "ro.secure",
@@ -2535,7 +2640,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.security.mdpp.release",
-		.value = "1",
+		.value = "2",
 	},
 	{
 		.key = "ro.security.mdpp.ux",
@@ -2559,7 +2664,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.security.wlan.release",
-		.value = "1",
+		.value = "2",
 	},
 	{
 		.key = "ro.security.wlan.ver",
@@ -2571,7 +2676,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.serialno",
-		.value = "ce051605cb380d3005",
+		.value = "ce10160ac4b5291704",
 	},
 	{
 		.key = "ro.setupwizard.mode",
@@ -2603,7 +2708,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.warranty_bit",
-		.value = "1",
+		.value = "0",
 	},
 	{
 		.key = "ro.wifi.channels",
@@ -2639,7 +2744,11 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "selinux.policy_version",
-		.value = "SEPF_SECMOBILE_7.0_0005",
+		.value = "SEPF_SECMOBILE_7.0_0009",
+	},
+	{
+		.key = "selinux.reload_policy",
+		.value = "1",
 	},
 	{
 		.key = "service.bootanim.exit",
@@ -2670,14 +2779,6 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "1",
 	},
 	{
-		.key = "sukernel.daemonsu.launch",
-		.value = "service",
-	},
-	{
-		.key = "sukernel.mount",
-		.value = "1",
-	},
-	{
 		.key = "sys.bartender.batterystats.ver",
 		.value = "16",
 	},
@@ -2735,7 +2836,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "sys.oem_unlock_allowed",
-		.value = "1",
+		.value = "0",
 	},
 	{
 		.key = "sys.reset_reason",
@@ -2758,10 +2859,6 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "24300",
 	},
 	{
-		.key = "sys.sysctl.tcp_def_init_rwnd",
-		.value = "60",
-	},
-	{
 		.key = "sys.usb.config",
 		.value = "mtp,adb",
 	},
@@ -2778,6 +2875,14 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "0",
 	},
 	{
+		.key = "vold.crypt.type",
+		.value = "default",
+	},
+	{
+		.key = "vold.decrypt",
+		.value = "trigger_restart_framework",
+	},
+	{
 		.key = "vold.has_adoptable",
 		.value = "0",
 	},
@@ -2795,7 +2900,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "wlan.driver.status",
-		.value = "ok",
+		.value = "unloaded",
 	},
 	{
 		.key = "wlan.p2p.chkintent",