collect block devices for dummies & fix multi-user not to run on ICS …

…or below
IzzySoft · Aug 5, 2020 · 58a0739 · 58a0739
1 parent b35684a
commit 58a0739
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/lib/deviceinfo.lib b/lib/deviceinfo.lib
@@ -447,7 +447,7 @@ getDeviceInfo() {
   echo "  <li>$(href '#devaccounts' 'Users &amp; Accounts')</li>" >> "$devicehead"
 
   #----------------------------------------------------------=[ MultiUser ]=---
-  [[ $DEVICE_SDKVER -gt 10 ]] && {  # not available on Android < 3
+  [[ $DEVICE_SDKVER -gt 16 ]] && {  # not available on Android <= 4
     copyAdbContent dumpsys_user "adb ${ADBOPTS} shell dumpsys user" $tmp2
     [[ -s "$tmp2" ]] && {     # only if the file exists and has content
       doProgress "  + Processing user info" 3

diff --git a/tools/mk_dummy b/tools/mk_dummy
@@ -74,6 +74,8 @@ echo "* details for partitions.lib..."
 adb ${ADBOPTS} shell adb ${ADBOPTS} shell cat /proc/emmc 2>/dev/null > $dummy/proc_emmc
 adb ${ADBOPTS} shell adb ${ADBOPTS} shell cat /proc/mtd 2>/dev/null > $dummy/proc_mtd
 adb ${ADBOPTS} shell ls -1 /dev/block 2>/dev/null > $dummy/ls_1_dev_block
+[[ $? -ne 0 || ! -s "$dummy/ls_1_dev_block" || $(cat "$dummy/ls_1_dev_block" | wc -l) -lt 3 ]] && adb ${ADBOPTS} shell ls /dev/block 2>/dev/null > $dummy/ls_1_dev_block
+[[ $? -ne 0 || ! -s "$dummy/ls_1_dev_block" || $(cat "$dummy/ls_1_dev_block" | wc -l) -lt 3 ]] && adb ${ADBOPTS} shell su -c ls /dev/block 2>/dev/null > $dummy/ls_1_dev_block
 adb ${ADBOPTS} shell cat /proc/mounts 2>/dev/null > $dummy/proc_mounts
 adb ${ADBOPTS} shell cat /proc/dumchar_info 2>/dev/null > $dummy/proc_dumchar_info
 adb ${ADBOPTS} shell 'ls -al /dev/block/platform/*/by-name 2>/dev/null' > $dummy/dev_block_byname