From 15681df3563dbea684b7cd27c85af5bde7cd153e Mon Sep 17 00:00:00 2001 From: Simon Braunschmidt Date: Fri, 28 Nov 2008 01:24:13 +0100 Subject: [PATCH] BUGFIX - ro.kernel.android.{qemud | ril} and ro.android.noril This fixes both a typo and the fact that sh seems not to have test or [. (see also sh/builtins.def: ##testcmd commented out) The handling of these properties was broken, having the effect that the Modem in ... internal/telephony/test/Simulated*.java was never run, even if it would have been the users/developers intention. See also issue #1380 http://code.google.com/p/android/issues/detail?id=1380 Signed-off-by: Simon.Braunschmidt@gmail.com> --- rootdir/etc/init.goldfish.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/rootdir/etc/init.goldfish.sh b/rootdir/etc/init.goldfish.sh index f1b801d91..5ff0a3a4a 100755 --- a/rootdir/etc/init.goldfish.sh +++ b/rootdir/etc/init.goldfish.sh @@ -3,16 +3,20 @@ ifconfig eth0 10.0.2.15 netmask 255.255.255.0 up route add default gw 10.0.2.2 dev eth0 -qemud=`getprop.ro.kernel.android.qemud` -if test -z "$qemud"; then +qemud=`getprop ro.kernel.android.qemud` +case "$qemud" in + "") radio_ril=`getprop ro.kernel.android.ril` - if test -z "$radio_ril"; then + case "$radio_ril" in + "") # no need for the radio interface daemon # telephony is entirely emulated in Java setprop ro.radio.noril yes stop ril-daemon - fi -fi + ;; + esac + ;; +esac num_dns=`getprop ro.kernel.android.ndns` case "$num_dns" in