diff options
Diffstat (limited to 'rootdir')
| -rw-r--r-- | rootdir/Android.mk | 6 | ||||
| -rw-r--r-- | rootdir/etc/dbus.conf | 50 | ||||
| -rw-r--r-- | rootdir/etc/hcid.conf | 64 | ||||
| -rw-r--r-- | rootdir/etc/init.goldfish.rc | 9 | ||||
| -rw-r--r-- | rootdir/etc/mountd.conf | 6 | ||||
| -rw-r--r-- | rootdir/init.rc | 12 |
6 files changed, 31 insertions, 116 deletions
diff --git a/rootdir/Android.mk b/rootdir/Android.mk index 756005b..7ff1a74 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -7,8 +7,7 @@ copy_from := \ etc/mountd.conf \ etc/dbus.conf \ etc/init.goldfish.sh \ - etc/hosts \ - etc/hcid.conf + etc/hosts dont_copy := \ etc/init.gprs-pppd \ @@ -28,10 +27,13 @@ ALL_PREBUILT += $(copy_to) # files that live under /... +# Only copy init.rc if the target doesn't have its own. +ifneq ($(TARGET_PROVIDES_INIT_RC),true) file := $(TARGET_ROOT_OUT)/init.rc $(file) : $(LOCAL_PATH)/init.rc | $(ACP) $(transform-prebuilt-to-target) ALL_PREBUILT += $(file) +endif file := $(TARGET_ROOT_OUT)/init.goldfish.rc $(file) : $(LOCAL_PATH)/etc/init.goldfish.rc | $(ACP) diff --git a/rootdir/etc/dbus.conf b/rootdir/etc/dbus.conf index 8742345..75586b9 100644 --- a/rootdir/etc/dbus.conf +++ b/rootdir/etc/dbus.conf @@ -5,9 +5,6 @@ <!-- Our well-known bus type, do not change this --> <type>system</type> - <!-- Fork into daemon mode --> - <fork/> - <!-- Only allow socket-credentials-based authentication --> <auth>EXTERNAL</auth> @@ -17,51 +14,14 @@ systems.) --> <listen>unix:path=/dev/socket/dbus</listen> + <!-- Allow everything, D-Bus socket is protected by unix filesystem + permissions --> <policy context="default"> - <!-- Deny everything then punch holes --> - <deny send_interface="*"/> - <deny receive_interface="*"/> - <deny own="*"/> - <!-- But allow all users to connect --> + <allow send_interface="*"/> + <allow receive_interface="*"/> + <allow own="*"/> <allow user="*"/> - <!-- Allow anyone to talk to the message bus --> - <!-- FIXME I think currently these allow rules are always implicit - even if they aren't in here --> - <allow send_destination="org.freedesktop.DBus"/> - <allow receive_sender="org.freedesktop.DBus"/> - <!-- valid replies are always allowed --> <allow send_requested_reply="true"/> <allow receive_requested_reply="true"/> </policy> - - - <!-- Now punch holes for bluetooth --> - - <policy context="default"> - <allow own="*"/> - <allow user="*"/> - <allow send_destination="org.bluez.PasskeyAgent"/> - <allow receive_sender="org.bluez.PasskeyAgent"/> - <allow send_path="/org/bluez/PasskeyAgent"/> - </policy> - - <policy user="root"> - <allow own="org.bluez"/> - </policy> - - <policy at_console="true"> - <allow send_destination="org.bluez.Adapter"/> - <allow receive_sender="org.bluez.Adapter"/> - - <allow send_path="/org/bluez/Adapter"/> - - <allow send_destination="org.bluez.Manager"/> - <allow receive_sender="org.bluez.Manager"/> - - <allow send_path="/org/bluez/Manager"/> - - <allow send_destination="org.bluez.Security"/> - <allow receive_sender="org.bluez.Security"/> - </policy> - </busconfig> diff --git a/rootdir/etc/hcid.conf b/rootdir/etc/hcid.conf deleted file mode 100644 index 56df63a..0000000 --- a/rootdir/etc/hcid.conf +++ /dev/null @@ -1,64 +0,0 @@ -# -# HCI daemon configuration file. -# - -# HCId options -options { - # Automatically initialize new devices - autoinit yes; - - # Security Manager mode - # none - Security manager disabled - # auto - Use local PIN for incoming connections - # user - Always ask user for a PIN - # - security user; - - # Pairing mode - # none - Pairing disabled - # multi - Allow pairing with already paired devices - # once - Pair once and deny successive attempts - pairing multi; -} - -# Default settings for HCI devices -device { - # Local device name - # %d - device id - # %h - host name - # %b - ro.product.brand - # %m - ro.product.model - # %n - ro.product.name - name "%m"; - - # Local device class - # 0x400000 - Service class: Telephony - # 0x000200 - Major class: Phone - # 0x00000C - Minor class: Smart phone - class 0x40020C; - - # Default packet type - #pkt_type DH1,DM1,HV1; - - # Inquiry and Page scan - iscan disable; - pscan enable; - - # Page timeout (in 0.625ms slots): 10 seconds - pageto 16384; - - # Default link mode - # none - no specific policy - # accept - always accept incoming connections - # master - become master on incoming connections, - # deny role switch on outgoing connections - lm accept; - - # Default link policy - # none - no specific policy - # rswitch - allow role switch - # hold - allow hold mode - # sniff - allow sniff mode - # park - allow park mode - lp rswitch,hold,sniff,park; -} diff --git a/rootdir/etc/init.goldfish.rc b/rootdir/etc/init.goldfish.rc index 5975974..96480f3 100644 --- a/rootdir/etc/init.goldfish.rc +++ b/rootdir/etc/init.goldfish.rc @@ -16,11 +16,11 @@ on boot stop dund stop akmd - setprop app.setupwizard.disable 1 + setprop ro.setupwizard.mode EMULATOR # enable Google-specific location features, # like NetworkLocationProvider and LocationCollector - setprop ro.com.google.enable_google_location_features 1 + setprop ro.com.google.locationfeatures 1 # For the emulator, which bypasses Setup Wizard, you can specify # account info for the device via these two properties. Google @@ -39,8 +39,9 @@ service goldfish-setup /system/etc/init.goldfish.sh oneshot service qemud /system/bin/qemud - socket qemud_gsm stream 666 - socket qemud_gps stream 666 + socket qemud_gsm stream 666 + socket qemud_gps stream 666 + socket qemud_control stream 666 oneshot # -Q is a special logcat option that forces the diff --git a/rootdir/etc/mountd.conf b/rootdir/etc/mountd.conf index d9dfded..094a2c7 100644 --- a/rootdir/etc/mountd.conf +++ b/rootdir/etc/mountd.conf @@ -10,4 +10,10 @@ mount { ## true if this mount point can be shared via USB mass storage enable_ums true + + ## path to the UMS driver file for specifying the block device path + ## use this for the mass_storage function driver + driver_store_path /sys/devices/platform/usb_mass_storage/lun0/file + ## use this for android_usb composite gadget driver + ##driver_store_path /sys/devices/platform/msm_hsusb/gadget/lun0/file } diff --git a/rootdir/init.rc b/rootdir/init.rc index 23daa0b..3f8c6a0 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -1,6 +1,8 @@ on init +sysclktz 0 + loglevel 3 # setup the global environment @@ -118,6 +120,12 @@ on boot chown radio system /sys/android_power/acquire_full_wake_lock chown radio system /sys/android_power/acquire_partial_wake_lock chown radio system /sys/android_power/release_wake_lock + chown radio system /sys/power/state + chown radio system /sys/power/wake_lock + chown radio system /sys/power/wake_unlock + chmod 0660 /sys/power/state + chmod 0660 /sys/power/wake_lock + chmod 0660 /sys/power/wake_unlock chown system system /sys/class/timed_output/vibrator/enable chown system system /sys/class/leds/keyboard-backlight/brightness chown system system /sys/class/leds/lcd-backlight/brightness @@ -193,6 +201,7 @@ service ril-daemon /system/bin/rild service zygote /system/bin/app_process -Xzygote /system/bin --zygote --start-system-server socket zygote stream 666 onrestart write /sys/android_power/request_state wake + onrestart write /sys/power/state on service media /system/bin/mediaserver user media @@ -208,7 +217,8 @@ service dbus /system/bin/dbus-daemon --system --nofork user bluetooth group bluetooth net_bt_admin -service hcid /system/bin/hcid -s -n -f /etc/hcid.conf +#STOPSHIP: disable the verbose logging +service hcid /system/bin/logwrapper /system/bin/hcid -d -s -n -f /etc/bluez/hcid.conf socket bluetooth stream 660 bluetooth bluetooth socket dbus_bluetooth stream 660 bluetooth bluetooth # init.rc does not yet support applying capabilities, so run as root and |