862379 - [Leo] add a sleep to adb root when flashing a build with Custom RIL

Status: RESOLVED FIXED

(Release Engineering :: Release Requests, defect)

Description

[Tony Chung [:tchung]]

The flash.sh script (FOR LEO ONLY && RIL PACKAGE), is missing a key sleep that needs to be applied so the ril is flashed properly.    Please add this root and sleep piece into the existing script.

	run_adb root &&
	sleep 5 &&

Within the section:


upload_ril()
{
	echo Uploading RIL
	run_adb wait-for-device &&
	run_adb root &&
	sleep 5 &&
	run_adb wait-for-device &&
	run_adb remount &&
	run_adb push ril/libqc_b2g_ril /system/b2g/distribution/bundles/libqc_b2g_ril
	run_adb push ril/libqc_b2g_location /system/b2g/distribution/bundles/libqc_b2g_location
	run_adb push ril/libqc_b2g_ril.version /system/b2g/distribution/bundles/libqc_b2g_ril.version
}

Comment 1

[Marcia Knous [:marcia]]

I just tried hand editing the flash.sh file in today's build with those changes and the flash still stalls before the RIL is uploaded.

Comment 2

[Tony Chung [:tchung]]

Works for me.  I'll work with Marcia on the side to see why her machine can't flash properly.

Uploading RIL
restarting adbd as root
remount succeeded
push: ril/libqc_b2g_ril/QCContentHelper.js -> /system/b2g/distribution/bundles/libqc_b2g_ril/QCContentHelper.js
push: ril/libqc_b2g_ril/libqc_b2g_ril.xpt -> /system/b2g/distribution/bundles/libqc_b2g_ril/libqc_b2g_ril.xpt
push: ril/libqc_b2g_ril/libqc_b2g_ril.so -> /system/b2g/distribution/bundles/libqc_b2g_ril/libqc_b2g_ril.so
push: ril/libqc_b2g_ril/interfaces.manifest -> /system/b2g/distribution/bundles/libqc_b2g_ril/interfaces.manifest
push: ril/libqc_b2g_ril/chrome.manifest -> /system/b2g/distribution/bundles/libqc_b2g_ril/chrome.manifest
5 files pushed. 0 files skipped.
3248 KB/s (394744 bytes in 0.118s)
push: ril/libqc_b2g_location/xtradownloader.js -> /system/b2g/distribution/bundles/libqc_b2g_location/xtradownloader.js
push: ril/libqc_b2g_location/libqc_b2g_location.xpt -> /system/b2g/distribution/bundles/libqc_b2g_location/libqc_b2g_location.xpt
push: ril/libqc_b2g_location/libqc_b2g_location.so -> /system/b2g/distribution/bundles/libqc_b2g_location/libqc_b2g_location.so
push: ril/libqc_b2g_location/interfaces.manifest -> /system/b2g/distribution/bundles/libqc_b2g_location/interfaces.manifest
push: ril/libqc_b2g_location/chrome.manifest -> /system/b2g/distribution/bundles/libqc_b2g_location/chrome.manifest
5 files pushed. 0 files skipped.
1496 KB/s (40173 bytes in 0.026s)
10 KB/s (17 bytes in 0.001s)
Attempting to set the time on the device
time 1366191274 -> 1366191274.0
Tonys:b2g-distro tchung$

Comment 3

[Rail Aliiev [:rail]]

I added "sleep 5 && run_adb wait-for-device &&" after "run_adb root". It didn't break anything on an Unagi phone.

Comment 4

[Tony Chung [:tchung]]

Verified fix on 4/19 nightly builds, flash.sh script.

However, the script gets stuck on the Uploading Ril step, because the device boots into FTU, but remote Debugging is disabled (meaning adb devices isnt found by default).   The user needs to switch on the settings to turn on debugging, in order for the remaining part of the RIL upload to proceed.

How can we automate this without human interaction?

Comment 5

[Rail Aliiev [:rail]]

I have no such issue on an Unagi phone. I can even reflash my phone when it doesn't boot after reflashing (and it's still accessible via adb shell). I think debugging is turned off when you see the first run screen or after it.

Comment 6

[Tony Chung [:tchung]]

(In reply to Rail Aliiev [:rail] from comment #5)
> I have no such issue on an Unagi phone. I can even reflash my phone when it
> doesn't boot after reflashing (and it's still accessible via adb shell). I
> think debugging is turned off when you see the first run screen or after it.

Yes, it is turned off; and that's preventing the leo and Buri phones from proceeding with the upload.   wonder if this is a device issue.  how can we resolve this in the script?  

needinfo'ing mwu for tips.