summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* update adbd to use the new screencap command for taking screenshots.Mathias Agopian2010-09-261-41/+48
| | | | Change-Id: I02c49240f9db9258824020f3f5f04463e17a537a
* Merge "Add definitions for store barrier."Brian Carlstrom2010-09-243-3/+33
|\
| * Add definitions for store barrier.Brian Carlstrom2010-09-243-3/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I usually call this a "store/store barrier" for maximum clarity, but the common way of describing it is "store barrier" or "store fence". This doesn't use "dmb st" yet since we're waiting on the toolchain update, but it gets the various macros and inline functions in place so we can use them in the VM. Bug 3003477 git cherry-pick 2ba5eec3972b4ce46feb677116534fcd3d136e0a Change-Id: Ifd2d3588be96aa529d490789436cf48c962021ba
* | Partially implement SETATTR for sdcard/FUSEPaul Eastham2010-09-241-2/+20
|/ | | | | | | | Handle truncate cases within SETATTR so that truncate() and ftruncate() call will work. Change-Id: I5a9862dcaa6ca7b5e9115cb5d3bfed88787fa7ac Signed-off-by: Paul Eastham <eastham@google.com>
* am 33357f54: am 6490257d: Make netd restart when system server hangs on it.Brad Fitzpatrick2010-09-211-0/+1
|\ | | | | | | | | | | | | Merge commit '33357f5477a24cb16bd3dd692fe5ca14755ab033' * commit '33357f5477a24cb16bd3dd692fe5ca14755ab033': Make netd restart when system server hangs on it.
| * am 6490257d: Make netd restart when system server hangs on it.Brad Fitzpatrick2010-09-211-0/+1
| |\ | | | | | | | | | | | | | | | | | | Merge commit '6490257d116c35d3da927ee7b91179dde64ef713' into gingerbread-plus-aosp * commit '6490257d116c35d3da927ee7b91179dde64ef713': Make netd restart when system server hangs on it.
| | * Make netd restart when system server hangs on it.Brad Fitzpatrick2010-09-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | netd has been seen hanging (cause suspected but unconfirmed) which then brings down the system server which blocks forever on its main thread trying to connect to netd with its hung event loop. This then results in an infinite watchdog runtime restart loop because the situation never improves: netd is still borked. Instead, we should kill netd and give it another chance when the system server dies. Bug: 3018996 Bug: 3017876 Change-Id: Ibf9ecf0ffcb78e48c38e5167f21cbeefe0e2a47f
* | | resolved conflicts for merge of 3b5214a6 to masterBrian Swetland2010-09-193-11/+25
|\ \ \ | |/ / | | | | | | Change-Id: Id73c53c6c2e9c21eb9b1d1e624aaeb25097ea7a4
| * | am 02863b95: add /vendor supportBrian Swetland2010-09-193-11/+26
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '02863b957cfbfc302d3136ed78c0cba86accacd8' into gingerbread-plus-aosp * commit '02863b957cfbfc302d3136ed78c0cba86accacd8': add /vendor support
| | * add /vendor supportBrian Swetland2010-09-193-11/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - look in /vendor/firmware/... in addition to /system/etc/firmware/... for firmware loading - add /vendor/bin to path before /system/bin - add /vendor/lib to ldpath before /system/lib - configure appropriate permissions for /system/vendor/bin - symlink /vendor -> /system/vendor Change-Id: I0c06ca1e38a44f0c7024cee6cea8907aa93a4532
* | | am 06b21887: am 2da0032c: add graphics events to the eventlog definitionsMathias Agopian2010-09-151-0/+18
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '06b21887e8f5719e9b421371b4a47ef371c972b5' * commit '06b21887e8f5719e9b421371b4a47ef371c972b5': add graphics events to the eventlog definitions
| * | am 2da0032c: add graphics events to the eventlog definitionsMathias Agopian2010-09-141-0/+18
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '2da0032c9447d0e259be31872e123559b5442d8f' into gingerbread-plus-aosp * commit '2da0032c9447d0e259be31872e123559b5442d8f': add graphics events to the eventlog definitions
| | * add graphics events to the eventlog definitionsMathias Agopian2010-09-141-0/+18
| | | | | | | | | | | | | | | | | | by default this logging is turned off Change-Id: Ic7e5fe2b377c4760e1673e7d19a69d34cc9333c9
* | | am 1db75e7b: am 6fd75635: Merge "Fetch peer credentials for local sockets" ↵Kenny Root2010-09-152-2/+31
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit '1db75e7b9b5159fa3bcf1cfdc4efba62c570d860' * commit '1db75e7b9b5159fa3bcf1cfdc4efba62c570d860': Fetch peer credentials for local sockets
| * | am 6fd75635: Merge "Fetch peer credentials for local sockets" into gingerbreadKenny Root2010-09-142-2/+31
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '6fd75635d820754295557c300ccee89c643864cc' into gingerbread-plus-aosp * commit '6fd75635d820754295557c300ccee89c643864cc': Fetch peer credentials for local sockets
| | * Merge "Fetch peer credentials for local sockets" into gingerbreadKenny Root2010-09-142-2/+31
| | |\
| | | * Fetch peer credentials for local socketsKenny Root2010-09-142-2/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fetch the PID, UID, and GID of the remote side of a local socket connection in case any users of this library class want to check it. Change-Id: Ia3230e6bc68ab6f93160df9f5996d2bf744b872c
* | | | am 2c42e440: am 9915e3fd: Add dvm_lock_sample\'s new fields.Brad Fitzpatrick2010-09-151-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '2c42e4404bba0a1b065d223a1e84ef7184e1a987' * commit '2c42e4404bba0a1b065d223a1e84ef7184e1a987': Add dvm_lock_sample's new fields.
| * | | am 9915e3fd: Add dvm_lock_sample\'s new fields.Brad Fitzpatrick2010-09-141-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '9915e3fd389519764436ad029ef2f172eb1cc0ca' into gingerbread-plus-aosp * commit '9915e3fd389519764436ad029ef2f172eb1cc0ca': Add dvm_lock_sample's new fields.
| | * | Add dvm_lock_sample's new fields.Brad Fitzpatrick2010-09-141-1/+1
| | |/ | | | | | | | | | Change-Id: I2ec442834c38d3716695ab90bf0db220bd8dae27
* | | am 0e6242f7: am 40c2b7cb: Merge "Add missing lock in SocketListener." into ↵Brad Fitzpatrick2010-09-151-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '0e6242f7e2c1181d486ae8f86592619738574dd3' * commit '0e6242f7e2c1181d486ae8f86592619738574dd3': Add missing lock in SocketListener.
| * | am 40c2b7cb: Merge "Add missing lock in SocketListener." into gingerbreadBrad Fitzpatrick2010-09-141-0/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '40c2b7cbedff612ce8bc7a51589a952cc1d047b6' into gingerbread-plus-aosp * commit '40c2b7cbedff612ce8bc7a51589a952cc1d047b6': Add missing lock in SocketListener.
| | * Merge "Add missing lock in SocketListener." into gingerbreadBrad Fitzpatrick2010-09-141-0/+1
| | |\
| | | * Add missing lock in SocketListener.Brad Fitzpatrick2010-09-141-0/+1
| | | | | | | | | | | | | | | | Change-Id: I3d97a06381fce67ef13b1ccdeaa4e8e2830ab2aa
* | | | am c3fa6149: am f31d2ed1: Return false on socket read errorKenny Root2010-09-151-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit 'c3fa6149284058b30e3eea5010c16d3133711afb' * commit 'c3fa6149284058b30e3eea5010c16d3133711afb': Return false on socket read error
| * | | am f31d2ed1: Return false on socket read errorKenny Root2010-09-141-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit 'f31d2ed1fd3a39a92bccc12eb66728594290ef3b' into gingerbread-plus-aosp * commit 'f31d2ed1fd3a39a92bccc12eb66728594290ef3b': Return false on socket read error
| | * | Return false on socket read errorKenny Root2010-09-141-1/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FrameworkListener was returning the errno from a function marked as returning bool which caused an implicit conversion to true since we were in an error block where errno was set to something non-zero. This caused the clients that had errors to stick around forever and not get removed from the set of file descriptors that SocketListener was listening to. Change-Id: Ia27a4cac47459f3a3c2bb6a7f66803a3165c894a
* | | am 5833769d: am 09dd3e57: make df more readableBrian Swetland2010-09-111-8/+24
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '5833769d9aa41dfb28a74c665fda0fca9c321fc1' * commit '5833769d9aa41dfb28a74c665fda0fca9c321fc1': make df more readable
| * | am 09dd3e57: make df more readableBrian Swetland2010-09-111-8/+24
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '09dd3e57b920c8f65cb486313a4c0f35b8cb9f46' into gingerbread-plus-aosp * commit '09dd3e57b920c8f65cb486313a4c0f35b8cb9f46': make df more readable
| | * make df more readableBrian Swetland2010-09-111-8/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Filesystem Size Used Free Blksize /dev 164M 32K 164M 4096 /system 442M 117M 325M 4096 /cache 492M 8M 483M 4096 /data 984M 59M 925M 4096 /mnt/sdcard 12G 27M 12G 32768 Change-Id: I9a84b7b84ae528ee5cf0b1e92a8bee032b87703b
* | | am 1d10577e: manual merge from readonly-korg-masterJean-Baptiste Queru2010-09-103-6/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '1d10577e9b474a5099d0f5a09468c55a0324d876' * commit '1d10577e9b474a5099d0f5a09468c55a0324d876': Don't alias 'stop' to 'kill -STOP'
| * | manual merge from readonly-korg-masterJean-Baptiste Queru2010-09-103-6/+5
| |\ \ | | | | | | | | | | | | Change-Id: Id4a09fa11fee4262d9b945369b595644cca6d330
| | * | Don't alias 'stop' to 'kill -STOP'Jeff Hamilton2010-09-103-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android has already has a stop command used to stop the main runtime and the alias interferes with testing tools that expect stop to kill the runtime. Change-Id: I02b7efb9203dc39e97f63eb702a54ff79935b316
* | | | am 26ce6e0e: manual merge from readonly-korg-masterJean-Baptiste Queru2010-09-102-0/+16
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '26ce6e0e1608a9e804fa9721cc6326cdbaa5b7c1' * commit '26ce6e0e1608a9e804fa9721cc6326cdbaa5b7c1': - Add drm and drmio service
| * | | manual merge from readonly-korg-masterJean-Baptiste Queru2010-09-102-0/+16
| |\ \ \ | | |/ / | | | | | | | | Change-Id: Id17f69d22fbbc84578be5aadd5e8e906ff0eb548
| | * | Merge "- Add drm and drmio service - Add /data/drm directory for storing DRM ↵Jean-Baptiste Queru2010-09-092-0/+16
| | |\ \ | | | | | | | | | | | | | | | related data"
| | | * | - Add drm and drmio serviceaimitakeshi2010-07-272-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add /data/drm directory for storing DRM related data Change-Id: Ifd8922a3de109dbf5cd3f9cabbf4e5689b16c1d7
* | | | | am 8df3a4a5: am 4012c0a4: Merge "remount / as read-only only on post-fs to ↵Brian Swetland2010-09-081-2/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | allow per-target config of /" into gingerbread Merge commit '8df3a4a554184afba71887995c5f0983ce81196f' * commit '8df3a4a554184afba71887995c5f0983ce81196f': remount / as read-only only on post-fs to allow per-target config of /
| * | | | am 4012c0a4: Merge "remount / as read-only only on post-fs to allow ↵Brian Swetland2010-09-081-2/+3
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | per-target config of /" into gingerbread Merge commit '4012c0a46ab2ebdf6a1298bc4e85ed3368d1b8a4' into gingerbread-plus-aosp * commit '4012c0a46ab2ebdf6a1298bc4e85ed3368d1b8a4': remount / as read-only only on post-fs to allow per-target config of /
| | * | | Merge "remount / as read-only only on post-fs to allow per-target config of ↵Brian Swetland2010-09-081-2/+3
| | |\ \ \ | | | | | | | | | | | | | | | | | | /" into gingerbread
| | | * | | remount / as read-only only on post-fs to allow per-target config of /Brian Swetland2010-09-081-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia89dd2021e0f960201b4cee573227f0addd48431
* | | | | | am 1f43492e: am deb9188f: It seems that Windows actually does have a header ↵Dan Bornstein2010-09-070-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for <stdbool.h>. Merge commit '1f43492e48fb6630f3200a9b3887c76377f1850d' * commit '1f43492e48fb6630f3200a9b3887c76377f1850d': It seems that Windows actually does have a header for <stdbool.h>.
| * | | | | am deb9188f: It seems that Windows actually does have a header for <stdbool.h>.Dan Bornstein2010-09-070-0/+0
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'deb9188f4f64d5d475ae28e0cc9eecc6c1f61312' into gingerbread-plus-aosp * commit 'deb9188f4f64d5d475ae28e0cc9eecc6c1f61312': It seems that Windows actually does have a header for <stdbool.h>.
| | * | | | It seems that Windows actually does have a header for <stdbool.h>.Dan Bornstein2010-09-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I25d7846c066135f0af1fef2995bcb86397b23226
* | | | | | am 49b8124a: am 17dcc5c5: Use makedev helper for device major and minor numbersColin Cross2010-09-031-4/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '49b8124a1759cb8b27e0c21a1a5a54b8a81bdb19' * commit '49b8124a1759cb8b27e0c21a1a5a54b8a81bdb19': Use makedev helper for device major and minor numbers
| * | | | | am 17dcc5c5: Use makedev helper for device major and minor numbersColin Cross2010-09-031-4/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '17dcc5c57dcffb919f3de65ff7a0134ffa3bd874' into gingerbread-plus-aosp * commit '17dcc5c57dcffb919f3de65ff7a0134ffa3bd874': Use makedev helper for device major and minor numbers
| | * | | | Use makedev helper for device major and minor numbersColin Cross2010-09-031-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Major and minor numbers can be greater than 255. Major numbers are 12 bits, and minor numbers are 20 bits. Supporting major and minor numbers > 255 allows the use of the extended block device for extra mmc partitions. Change-Id: I4c42bfe0781069e8e4cb13ebe26e860cdc03f866
* | | | | | Merge "Remove ACC which has been replaced with llvm. Free up space in build."Jason Sams2010-09-0358-11423/+0
|\ \ \ \ \ \
| * | | | | | Remove ACC which has been replaced with llvm.Jason Sams2010-09-0158-11423/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Free up space in build. Change-Id: Ic5cc48bacca47b45809b9bc649ae5b629b7427ed
* | | | | | | am 556f09c4: am f74af26d: It seems that Windows actually does have a header ↵Dan Bornstein2010-09-011-1/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for <stdbool.h>. Merge commit '556f09c426084b62c34742ee0810fc97ae37abf7' * commit '556f09c426084b62c34742ee0810fc97ae37abf7': It seems that Windows actually does have a header for <stdbool.h>.