Commit Graph

1986 Commits

Author SHA1 Message Date
Colin Cross 90d07ae2b1 Merge "uptime: Use clock_gettime to get monotonic time" 2011-01-05 17:16:59 -08:00
Colin Cross 9d6d030f83 uptime: Use clock_gettime to get monotonic time
The first field in /proc/uptime is bootbased time, not monotonic
time.  If the kernel tracks bootbased time correctly, it counts
elapsed run time as well as sleep time, which is the same as the
elapsed time in the android alarm driver, and sleep time is
always returned as 0.

Use clock_gettime(CLOCK_MONOTONIC) instead, which will return
elapsed run time not counting sleep time on all platforms.

Change-Id: I28a22e8c93d78f62666ee8c877c7c6718a2b640a
2011-01-05 15:22:09 -08:00
Paul Eastham 6b8caf0bb0 Merge "Fix refcounting in the rename case." 2011-01-05 00:04:00 -08:00
Paul Eastham 77085c570e Fix refcounting in the rename case.
Change-Id: I59dbac8c92bda450e6d89f7f180241fd4b5bbae6
2011-01-04 21:06:03 -08:00
Colin Cross 8bc6fb3433 am bf10797e: am f7ca6040: Fix infinite loop in init when debugging is turned off
* commit 'bf10797e538f9fa252d72710bd5ecf0ef1f6f3e0':
  Fix infinite loop in init when debugging is turned off
2011-01-04 18:50:51 -08:00
Colin Cross bf10797e53 am f7ca6040: Fix infinite loop in init when debugging is turned off
* commit 'f7ca6040616f672a6f0039d55e39c610b7c1cf91':
  Fix infinite loop in init when debugging is turned off
2011-01-04 18:49:07 -08:00
Colin Cross f7ca604061 Fix infinite loop in init when debugging is turned off
If a keychord is pressed when debugging is turned off, the main
event poll in init will return an event on the keychord fd,
but handle_keychord never reads the data.  Once this happens,
the poll will always return immediately, and init enters an
infinite loop.  Fix it by always reading from the keychord fd,
but only handling the returned keychord if debugging is
enabled.

Change-Id: Ie4efa98247d3cc978d275dc8a4516b32aa710278
2011-01-04 18:21:22 -08:00
Jean-Baptiste Queru 512405a421 am f1c2a735: Merge "fastboot: Add help message for continue command"
* commit 'f1c2a7352f19cf729f91bf2559fc93ef12c74dca':
  fastboot: Add help message for continue command
2010-12-29 16:01:55 -08:00
Jean-Baptiste Queru f1c2a7352f Merge "fastboot: Add help message for continue command" 2010-12-29 13:12:10 -08:00
Bruce Beare 24ce4bc8d7 fastboot: Add help message for continue command
Change-Id: I578b1b7c2d74d09d44ce9100bfe582aaa25c31b1
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2010-12-29 13:11:53 -08:00
Mike Lockwood 7d700f8bdc libusbhost: Add usb_device_get_name_from_unique_id()
This allows converting from unique IDs to USB device names

Change-Id: I8e3b300790c01383aed8e3d4f547b54bcb7c2cd4
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-29 09:27:16 -05:00
Mike Lockwood 123538954b Change libusbhost from static to shared library
Change-Id: I0c16cc4536c4ab700c33433c8a6323ade7cfc95d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-29 08:33:24 -05:00
Irfan Sheriff bdd483830d Merge "Reduce polling interval to 200ms" 2010-12-21 11:44:41 -08:00
Irfan Sheriff b1723b6892 Reduce polling interval to 200ms
DHCP success can take up to 2 seconds to
be reported to the statemachine. Move wait
time after check and reduce it to 200ms

Change-Id: I6b2546f80435a84ee6f44f4d91f348bacfdc8433
2010-12-21 11:15:28 -08:00
Ken Sumrall 752923c168 Changes to init to support encrypted filesystems.
These are the changes to init and init.rc necessary to
support booting with and encrypted /data filesystem.
A corresponding change to init.<device>.rc goes along
with this change.

Change-Id: I0c7e2cc39568358014a82e317735c0eae14dd683
2010-12-18 19:03:54 -08:00
Stan Chesnutt 36f93f0120 fix undefined behavior with certain left-shift count values
Change-Id: I1b71de28312a56a3b1d27fcfaf0a7b71d5777e6c
2010-12-16 10:59:48 -08:00
Mike Lockwood e88a1b9e3d Merge "libusbhost: Fix breakage due to not storing dev_name in struct usb_device" 2010-12-15 12:59:08 -08:00
Mike Lockwood 93aff72d9b libusbhost: Fix breakage due to not storing dev_name in struct usb_device
Change-Id: Iefac9b31f900edb2dbd594f9eff9113b2038757d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-15 12:58:04 -08:00
Nick Kralevich 333f24bfbd don't run services with gid=0
Ensure that we drop privileges for servicemanager
and drmioserver.  These should not be running with
gid=0.

Bug: 3275526
Testing: Applied change and successfully rebooted
the device.  No obvious bugs.

Change-Id: I782fbda812cb88e0a365788b45b3b32894623177
2010-12-15 11:09:21 -08:00
Mike Lockwood ee878753f9 adb: Don't report negative number of bytes after pushing file > 2 gigabytes
BUG: 3198322

Change-Id: I6067857b9490984a21b597f6ee338446a9decaf5
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-14 23:08:43 -08:00
Paul Eastham 3227b5c25f Prevent rollover when dumping data around PC, SP, etc.
Change-Id: Ifc5f0e8eb5fed191c39f0878869e04b4d4f3b9ca
2010-12-14 16:07:58 -08:00
Jean-Baptiste Queru 4387ed1356 am 660c8b71: am cbb9257a: Merge "Fix debuggerd (native crash dump)."
* commit '660c8b71952c4067fd9d9ae1d6def3d2a3127ddc':
  Fix debuggerd (native crash dump).
2010-12-14 13:41:04 -08:00
Jean-Baptiste Queru 660c8b7195 am cbb9257a: Merge "Fix debuggerd (native crash dump)."
* commit 'cbb9257a872a0f35b0aa1018410ca6025e628c36':
  Fix debuggerd (native crash dump).
2010-12-14 13:32:45 -08:00
Jean-Baptiste Queru cbb9257a87 Merge "Fix debuggerd (native crash dump)." 2010-12-14 13:21:11 -08:00
Mike Dodd 0b4836f2cd Fix debuggerd (native crash dump).
Change 44659e90f (6cc4923087 in AOSP) introduced walking
both the symbol table and dynamic symbol table. The problem
is that it was dereferencing values whether or not the two tables
were both present, which could wind up reading from invalid memory.
The read from a bad address would cause debuggerd itself to crash,
which isn't handled.

Change-Id: Ie936f660018b1980dee5b6ed669588db861f1a79
2010-12-14 13:15:47 -08:00
Mike Dodd 584b8e30bc Fix debuggerd (native crash dump).
Change 44659e90f (6cc4923087 in AOSP) introduced walking
both the symbol table and dynamic symbol table. The problem
is that it was dereferencing values whether or not the two tables
were both present, which could wind up reading from invalid memory.
The read from a bad address would cause debuggerd itself to crash,
which isn't handled.

Change-Id: Ie936f660018b1980dee5b6ed669588db861f1a79
2010-12-14 12:16:23 -08:00
Mike Lockwood ec34ef5880 Merge "libusbhost: Add accessor for the USB device descriptor" 2010-12-13 19:09:28 -08:00
Mike Lockwood 11549b08a3 Merge "libusbhost: Add support for creating a usb_device struct from an existing fd" 2010-12-13 19:09:18 -08:00
Mike Lockwood 50372073d2 libusbhost: Add accessor for the USB device descriptor
Change-Id: Ic3a54e2a06f3b4fa72f99b64025a911fbf525daf
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-13 19:08:27 -08:00
Mike Lockwood cd185f23cc libusbhost: Add support for creating a usb_device struct from an existing fd
We will use this for sharing USB file descriptors across address spaces via Binder

Change-Id: Iadbd3e0a4178f79d1d778fdfd5175f6fe0e2aaf5
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-13 19:08:14 -08:00
Alex Sakhartchouk bf5ababdb0 Merge "Adding Texas Instruments to the VID list." 2010-12-13 15:21:22 -08:00
Alex Sakhartchouk ffe55f760d Adding Texas Instruments to the VID list.
Change-Id: Ifd35587c93ae7d5c8253f477a92cca2345dc8bb5
2010-12-13 14:26:18 -08:00
Jaikumar Ganesh 07eddd885a Merge "Remove services for adding SDP records." 2010-12-13 13:48:29 -08:00
Jaikumar Ganesh 1612425c50 Remove services for adding SDP records.
This was an inefficient way of doing things and was
temporary. There are now direct calls to Bluez to add reserved
SDP records.

This improves connection time after turning on BT by 6-8 secs.

Change-Id: I8750f44e1de73c9cc935d68710b8964e3f50c3a6
2010-12-13 13:47:27 -08:00
Jean-Baptiste Queru abf7378f1e am 44659e90: am d3f59eab: Merge "debuggerd: IA version"
* commit '44659e90fe8df25c71195936eabe0cc9158c18a6':
  debuggerd: IA version
2010-12-13 12:32:04 -08:00
Jean-Baptiste Queru 44659e90fe am d3f59eab: Merge "debuggerd: IA version"
* commit 'd3f59eab07d102b9506978aca9541dd62dcea919':
  debuggerd: IA version
2010-12-13 11:37:40 -08:00
Jean-Baptiste Queru d3f59eab07 Merge "debuggerd: IA version" 2010-12-13 11:32:21 -08:00
Jean-Baptiste Queru 5599029c8d Manual merge of 144773f9
Change-Id: I0ac3f88ac85bbc604fdc151768da20e86318fb46
2010-12-13 11:31:04 -08:00
Jean-Baptiste Queru 144773f9e1 am e382cc99: Merge "debuggerd: Reorganize to facilitate IA commit"
* commit 'e382cc999e48b3faabea7743ec8cec303b6005ba':
  debuggerd: Reorganize to facilitate IA commit
2010-12-13 11:14:26 -08:00
Jean-Baptiste Queru e382cc999e Merge "debuggerd: Reorganize to facilitate IA commit" 2010-12-13 10:48:08 -08:00
Mike Lockwood 127fd070f0 Merge "init: Allow non-root adbd to switch between TCP and USB modes" 2010-12-10 11:56:22 -08:00
Mike Lockwood 58aa5b0ee0 init: Allow non-root adbd to switch between TCP and USB modes
Change-Id: I9e93ceefadfaa2a4f8ec25cfa05fa4821fd98093
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-10 09:48:41 -08:00
Erik Gilling 535615cf4f Merge "toolbox: add verbose option for lsusb" 2010-12-09 18:45:32 -08:00
Erik Gilling bec29d4b48 toolbox: add verbose option for lsusb
Change-Id: If9c51d96af7d69395917af55bb337352576f9422
2010-12-09 17:14:27 -08:00
Erik Gilling 67ebdce982 Merge changes I4dcadf8e,I166d2859
* changes:
  libusbhost: add usb chapter 9 include to usbhost.h
  toolbox: add lsusb command
2010-12-09 15:53:03 -08:00
Erik Gilling 3af05b09eb libusbhost: add usb chapter 9 include to usbhost.h
Change-Id: I4dcadf8e8d9b25782351c9aeefb0d2cea81bbc9e
2010-12-09 15:28:06 -08:00
Erik Gilling fd1e855323 toolbox: add lsusb command
Change-Id: I166d2859633ba4e15f170938262dcf6505b78dd3
2010-12-09 15:27:52 -08:00
Dima Zavin 8d758271d4 sh: null check signame list since sig 0 is not valid
Change-Id: I1b293246ea1d822e098d0581830500e93633a879
Signed-off-by: Dima Zavin <dima@android.com>
2010-12-09 14:20:16 -08:00
Ying Wang 90493929b2 Merge "dist for dist_files" 2010-12-09 10:55:06 -08:00
Ying Wang 1c061b9ea9 dist for dist_files
Change-Id: I665572a2212f1239b02b7816e37ada210afbdb48
2010-12-09 10:33:27 -08:00