commit 5bd7e67d191b5f7467e6ffa4ad6ef36fc36537fc
author Yifan Hong <elsk@google.com> Wed Nov 22 01:52:09 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 22 01:52:09 2017 +0000
tree db73e75af952ee04d88124724aa71dba5a16f9d9
parent 0ad7959f9a58d6243ca66edce97815236d505a0a
parent 77c7854432ceee1a4b8f4afc15292a28c4e9fb37

Merge "charger: add charger_test"

bootstat/boot_reason_test.sh

diff --git a/bootstat/boot_reason_test.sh b/bootstat/boot_reason_test.sh
index c1d5430..79702a6 100755
--- a/bootstat/boot_reason_test.sh
+++ b/bootstat/boot_reason_test.sh
@@ -778,7 +778,12 @@
   checkDebugBuild || return
   duration_test ">90"
   panic_msg="kernel_panic,sysrq"
-  enterPstore || panic_msg="\(kernel_panic,sysrq\|kernel_panic\)"
+  enterPstore
+  if [ ${?} != 0 ]; then
+    echo "         or functional bootloader" >&2
+    panic_msg="\(kernel_panic,sysrq\|kernel_panic\)"
+    pstore_ok=true
+  fi
   echo c | adb shell su root tee /proc/sysrq-trigger >/dev/null
   wait_for_screen
   EXPECT_PROPERTY sys.boot.reason ${panic_msg}

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index a3213cd..d980ee9 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -412,6 +412,7 @@
     mkdir /data/misc/net 0750 root shell
     mkdir /data/misc/radio 0770 system radio
     mkdir /data/misc/sms 0770 system radio
+    mkdir /data/misc/carrierid 0770 system radio
     mkdir /data/misc/zoneinfo 0775 system system
     mkdir /data/misc/textclassifier 0771 system system
     mkdir /data/misc/vpn 0770 system vpn