summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* merge in ics-release history after reset to masterThe Android Automerger2011-09-280-0/+0
|\
| * merge in ics-release history after reset to masterThe Android Automerger2011-09-270-0/+0
| |\
| | * merge in ics-release history after reset to masterThe Android Automerger2011-09-260-0/+0
| | |\
| | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-250-0/+0
| | | |\
| | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-210-0/+0
| | | | |\
| | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-180-0/+0
| | | | | |\
| | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-150-0/+0
| | | | | | |\
| | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-130-0/+0
| | | | | | | |\
| | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-110-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-070-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-050-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-08-310-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-08-300-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-08-300-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-08-300-0/+0
| | | | | | | | | | | | | | |\ | | | | | | | | | | | | | |/ / | | | | | | | | | | | | |/| / | | | | | | | | | | | | | |/
| | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-08-290-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-08-230-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-08-220-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-08-170-0/+0
| | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-08-160-0/+0
| | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-08-150-0/+0
| | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | * libnl_2: Fix nested attribute settingDmitry Shmidt2011-08-114-75/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9dbf72a25e8a939ab6aa35eaf4adbf86d9ed97a1 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | | | | | | | | | | | | | | | | | | Merge "enable HAVE_DLADDR, since... we have it"Mathias Agopian2011-09-281-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | enable HAVE_DLADDR, since... we have itMathias Agopian2011-09-281-1/+1
| |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I02baa1f7d3383e93a43fa04de1d39f7398e971bc
* | | | | | | | | | | | | | | | | | | | Merge "Pick up on androidboot.hardware kernel cmd option"Vladimir Chtchetkine2011-09-284-39/+58
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Pick up on androidboot.hardware kernel cmd optionVladimir Chtchetkine2011-09-284-39/+58
| |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | x86 emulator passes hardware name through the androidboot.hardware kernel cmd option, and ueventd must pick up on it to locate proper ueventd.rc file for that hardware. Change-Id: Id61c5b67fe6275a15c7aa62556e0b89eda7968f8
* | | | | | | | | | | | | | | | | | | | am c59c6c31: am 52262788: Ignore beec0066 from gingerbread (already here)Jean-Baptiste Queru2011-09-280-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c59c6c31a7bb6c70dc8b4f2b2879db98cd617626': emulator: allow /dev/qemu_pipe access
| * | | | | | | | | | | | | | | | | | | am 52262788: Ignore beec0066 from gingerbread (already here)Jean-Baptiste Queru2011-09-280-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '52262788834da375b88cb97b995b42c4ffde0f60': emulator: allow /dev/qemu_pipe access
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Ignore beec0066 from gingerbread (already here)Jean-Baptiste Queru2011-09-280-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id124f8c7288e464f76bdb531dd97e10d5a22244a
| | | * | | | | | | | | | | | | | | | | | | emulator: allow /dev/qemu_pipe accessDavid 'Digit' Turner2011-09-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch is necessary to allow normal applications to access the special /dev/qemu_pipe device file at runtime. This is used to provide a high-speed communication channel with the emulator. Needed by OpenGLES emulation. Change-Id: Ic266bdcc4fd069d2b4355e6ea81723296a1a21d1
* | | | | | | | | | | | | | | | | | | | | | am 1a5ca61b: charger: use the new asset for almost full, and show full @ 95%Dima Zavin2011-09-261-4/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1a5ca61b28b3269b625b7a7162b4f50734f7fea9': charger: use the new asset for almost full, and show full @ 95%
| * | | | | | | | | | | | | | | | | | | | | | charger: use the new asset for almost full, and show full @ 95%Dima Zavin2011-09-261-4/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5f8729260ae068d35d981ff2c16d576c3d4dd82f Signed-off-by: Dima Zavin <dima@android.com>
* | | | | | | | | | | | | | | | | | | | | | | am fc44f5f4: charger: update assetsDima Zavin2011-09-268-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fc44f5f4d4b3b05d9eba1ee787b70e1dfe0f18c5': charger: update assets
| * | | | | | | | | | | | | | | | | | | | | | charger: update assetsDima Zavin2011-09-268-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0c0d1206fdc3aa30382a9ee86edb88bba1e21e63 Signed-off-by: Dima Zavin <dima@android.com>
* | | | | | | | | | | | | | | | | | | | | | | am e0c70dad: charger: show animation when the device is unpluggedDima Zavin2011-09-261-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / | | | | | / / / / / / / / / / / / / / / / / / | |_|_|_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | * commit 'e0c70dad4b4d417182e4c0ba8adae199f2622582': charger: show animation when the device is unplugged
| * | | | | | | | | | | | | | | | | | | | | charger: show animation when the device is unpluggedDima Zavin2011-09-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I54af1bc61c73bbc993d1dff37174b16e1de5b7a4 Signed-off-by: Dima Zavin <dima@android.com>
* | | | | | | | | | | | | | | | | | | | | | resolved conflicts for merge of 0052abda to masterDima Zavin2011-09-2510-61/+248
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / | | | | | / / / / / / / / / / / / / / / / / | |_|_|_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | Change-Id: Ia33ac80949bebaafd1a012b7b131dc3960eca862
| * | | | | | | | | | | | | | | | | | | | charger: update charger UI with official graphics and animationDima Zavin2011-09-2510-61/+248
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1b36fa9e380797fe01812b57ac5d8c2c38857993 Signed-off-by: Dima Zavin <dima@android.com>
* | | | | | | | | | | | | | | | | | | | | Skip argument when parsing adb installKenny Root2011-09-231-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A command line flag with an argument was checked in the Pm.java code, but it wasn't being checked by "adb install" so attempts to use it failed. Change-Id: I0b84a4203a416f7323fa823c0f1f1750670d0c76
* | | | | | | | | | | | | | | | | | | | | am 29656d34: qtaguid: shhhh. LOGI -> LOGVJP Abgrall2011-09-221-5/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '29656d34a21f4bc3899264027664c9321b0b94e0': qtaguid: shhhh. LOGI -> LOGV
| * | | | | | | | | | | | | | | | | | | | qtaguid: shhhh. LOGI -> LOGVJP Abgrall2011-09-221-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Less verbose output. Bug: 5360129 Change-Id: Id32a7c61d51b6a16f50a5c8bcc75a2feaa0e34b1
* | | | | | | | | | | | | | | | | | | | | Merge "emulator: Move qemu-props to core service"David 'Digit' Turner2011-09-222-4/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | emulator: Move qemu-props to core serviceDavid 'Digit' Turner2011-09-162-4/+12
| | |_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The qemu-props program is launched at boot to read a series of system property assignments from the emulator and apply them. This is necessary to deal with the dynamic nature of the emulated platform (e.g. the screen density which depends on the skin and cannot be hard-coded in the platform image). This patch ensures that qemu-props is started before any other service that may read one of these properties (e.g. surface flinger). This is done by encapsulating the program into a 'core' service. Core services are all stared before regular ones. Before the patch, qemu-props was started manually inside a script that is called from a late emulator-specific boot service (goldfish-setup). The problem was that sometimes qemu-props was run too late. This resulted in random flakiness, especially when running on a low-end host machine. Fix for bug 2161189 (and probably a few others) Change-Id: I2933a25dcb5fecbb1fc238f157264e621b8f295b
* | | | | | | | | | | | | | | | | | | | fix TINY_ANDROID build (exclude charger binary)Brian Swetland2011-09-201-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I28157cbadcb208df517052336f652f5810048cc1 Signed-off-by: Brian Swetland <swetland@google.com>
* | | | | | | | | | | | | | | | | | | | am 0c613613: Reduce connectivity logging.Wink Saville2011-09-201-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | / / / / / / / / / / / / / / | |_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | * commit '0c613613d757c544d6ec7e5678f49a631a99d72a': Reduce connectivity logging.
| * | | | | | | | | | | | | | | | | | Reduce connectivity logging.Wink Saville2011-09-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib71f3f17d56ba614436bcb18f9100196fd7e7ee6
* | | | | | | | | | | | | | | | | | | Merge "Add Positivo's vendor ID to adb."Xavier Ducrohet2011-09-161-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Add Positivo's vendor ID to adb.Xavier Ducrohet2011-09-161-1/+4
| |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ida6fc323d766249f4f12708bae1c50ae5d937b2c
* | | | | | | | | | | | | | | | | | charger: reduce timeout for power-on with power key to 2 secsDima Zavin2011-09-161-1/+1
|/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8d3a49678a7fc47282d7ab407722e7c1829e9187 Signed-off-by: Dima Zavin <dima@android.com>
* | | | | | | | | | | | | | | | | libcutils: qtaguid: Support new functions, add tag resource tracking.JP Abgrall2011-09-142-22/+156
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add support for deleteTagData(tag, uid) setCounterSet(counterSetNum, uid) setPacifier(on) * Add resource tracking (If only kernel process termination had a hook) Because the xt_qtaguid netfilter module needs to keep track of tagged sockets, it needs a way to know when the process owning the socket has died. Normally the app will untag the sockets. But not on crash. So the process opens the qtaguid misc dev, which is closed on crash, at which point the xt_qtaguid can force-untag the processes sockets, and thus allowing their refcount to go down and release them. * Add pacifier support Add function to enable/disable pacification of the xt_qtaguid kernel module. (mostly for debugging) Change-Id: I7f2228e65208046dd37ec1c7407ee307d5ba9b99