summaryrefslogtreecommitdiffstats
path: root/cmds
Commit message (Collapse)AuthorAgeFilesLines
* am 9d591860: am 3a9cc8ce: Merge "Squashed commit of the following:" into ↵Andreas Huber2010-09-281-0/+6
|\ | | | | | | | | | | | | | | | | gingerbread Merge commit '9d59186068891834272c2e3ee6f9c4228af24656' * commit '9d59186068891834272c2e3ee6f9c4228af24656': Squashed commit of the following:
| * am 3a9cc8ce: Merge "Squashed commit of the following:" into gingerbreadAndreas Huber2010-09-281-0/+6
| |\ | | | | | | | | | | | | | | | | | | Merge commit '3a9cc8cef49165d6b1a1eb37b15a0ae21b0042f7' into gingerbread-plus-aosp * commit '3a9cc8cef49165d6b1a1eb37b15a0ae21b0042f7': Squashed commit of the following:
| | * Merge "Squashed commit of the following:" into gingerbreadAndreas Huber2010-09-281-0/+6
| | |\
| | | * Squashed commit of the following:Andreas Huber2010-09-271-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 29a4d3effb05a2e074cb0693316ab1977baeb0b6 Author: Andreas Huber <andih@google.com> Date: Mon Sep 27 12:01:32 2010 -0700 Fully working implementation of MPEG2TSWriter (for AAC and AVC sources). Change-Id: I8a32a47565b647bf6c078c520e39565e08ea0d84 commit f4dec4c3899f3be393508e180d6c07e249d3335e Author: Andreas Huber <andih@google.com> Date: Mon Sep 27 10:36:31 2010 -0700 More reliable identification of MPEG2 transport streams. Don't keep scanning forever in case the stream does not have both audio and video tracks. Change-Id: Icc5b4e8be145b2805e8776559546a6818342aea7 commit 4fe3cc942f9b3d3cf54138b828c41214aa916dd2 Author: Andreas Huber <andih@google.com> Date: Mon Sep 27 08:23:39 2010 -0700 test code Change-Id: I16560a17661407d06497f99ff88230724bb898af commit 64d988b24f49f179a90fa677be11c823959e734b Author: Andreas Huber <andih@google.com> Date: Thu Sep 23 14:42:52 2010 -0700 First shot at supporting writing to an MPEG2 transport stream. Change-Id: Ie537939a99fa3ddc0c7661c47c18277584817c74 Change-Id: If78fd034af8f6e8ceac8dbeff96d5ecb3f6b96dc
* | | | resolved conflicts for merge of 2a36a778 to masterHung-ying Tyan2010-09-281-0/+1
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: Ia70adeef06afddd29c827405fb5657bf9f5a29a3
| * | | am 68ef7f3c: Merge "Move SipService out of SystemServer to phone process." ↵Hung-ying Tyan2010-09-271-0/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit '68ef7f3c3a8deb0e14b0b6325876b23cecc191b3' into gingerbread-plus-aosp * commit '68ef7f3c3a8deb0e14b0b6325876b23cecc191b3': Move SipService out of SystemServer to phone process.
| | * | Move SipService out of SystemServer to phone process.Hung-ying Tyan2010-09-281-0/+1
| | |/ | | | | | | | | | | | | | | | | | | Companion CL: https://android-git/g/#change,70187 http://b/issue?id=2998069 Change-Id: I90923ac522ef363a4e04292f652d413c5a1526ad
* | | new screencap commandMathias Agopian2010-09-262-0/+71
| | | | | | | | | | | | | | | | | | | | | this captures the framebuffer via surfaceflinger APIs and outputs it to stdout. this is intended to be used by adbd. Change-Id: I0cfa6a47ec121edcd93f46b64870f9a553f653ff
* | | am deaa8ff1: am a7ef18fc: Merge "Some debugging support." into gingerbreadDianne Hackborn2010-09-242-13/+105
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'deaa8ff1b10d38add4f7c276e7be2ffc19359a14' * commit 'deaa8ff1b10d38add4f7c276e7be2ffc19359a14': Some debugging support.
| * | am a7ef18fc: Merge "Some debugging support." into gingerbreadDianne Hackborn2010-09-242-13/+105
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit 'a7ef18fca50d0db99a161d8c7e2d8979f0445503' into gingerbread-plus-aosp * commit 'a7ef18fca50d0db99a161d8c7e2d8979f0445503': Some debugging support.
| | * Some debugging support.Dianne Hackborn2010-09-242-13/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - New feature to "am monitor" to have it automatically launch gdbserv for you when a crash/ANR happens, and tell you how to run the client. - Update dumpstate to match new location of binder debug logs - Various commented out logs that are being used to track down issues. Change-Id: Ia5dd0cd2df983a1fc6be697642a4590aa02a26a5
* | | am a1c7b096: am 6d8fae72: Merge "Instead of just writing one track to the ↵Andreas Huber2010-09-241-42/+111
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | .mp4 file, write all of them (at most 1 video and 1 audio track). Also support httplive URIs in the stagefright commandline tool." into gingerbread Merge commit 'a1c7b096dfadc9ba7ee2ef432569eb3180f9bf34' * commit 'a1c7b096dfadc9ba7ee2ef432569eb3180f9bf34': Instead of just writing one track to the .mp4 file, write all of them (at most 1 video and 1 audio track). Also support httplive URIs in the stagefright commandline tool.
| * | am 6d8fae72: Merge "Instead of just writing one track to the .mp4 file, ↵Andreas Huber2010-09-241-42/+111
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | write all of them (at most 1 video and 1 audio track). Also support httplive URIs in the stagefright commandline tool." into gingerbread Merge commit '6d8fae722cfb2833dd542b2a5e613582a9096fc6' into gingerbread-plus-aosp * commit '6d8fae722cfb2833dd542b2a5e613582a9096fc6': Instead of just writing one track to the .mp4 file, write all of them (at most 1 video and 1 audio track). Also support httplive URIs in the stagefright commandline tool.
| | * Instead of just writing one track to the .mp4 file, write all of them (at ↵Andreas Huber2010-09-241-42/+111
| | | | | | | | | | | | | | | | | | most 1 video and 1 audio track). Also support httplive URIs in the stagefright commandline tool. Change-Id: I67b287cf76546191f398939aabe4480d9e79a948
* | | am 19fe783d: am 37155854: Merge "Proper sync-frame detection for sources ↵Andreas Huber2010-09-241-12/+105
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | that don\'t already provide it." into gingerbread Merge commit '19fe783d83b10ecfae3494f7b1ceff9584ad3839' * commit '19fe783d83b10ecfae3494f7b1ceff9584ad3839': Proper sync-frame detection for sources that don't already provide it.
| * | am 37155854: Merge "Proper sync-frame detection for sources that don\'t ↵Andreas Huber2010-09-241-12/+105
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | already provide it." into gingerbread Merge commit '37155854b4d9ca405e5c41c4ab271006a4716193' into gingerbread-plus-aosp * commit '37155854b4d9ca405e5c41c4ab271006a4716193': Proper sync-frame detection for sources that don't already provide it.
| | * Merge "Proper sync-frame detection for sources that don't already provide ↵Andreas Huber2010-09-241-12/+105
| | |\ | | | | | | | | | | | | it." into gingerbread
| | | * Proper sync-frame detection for sources that don't already provide it.Andreas Huber2010-09-231-12/+105
| | | | | | | | | | | | | | | | Change-Id: Iafeee847b015c5cf6bec6dd5fac22a8d3e8cb78e
* | | | resolved conflicts for merge of 8952a448 to masterDianne Hackborn2010-09-231-0/+215
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I9c752a5d10ae8d8e5ead1243b6abd4795204fc0b
| * | | am 287952c3: Fix issue #3022508: Crash during media scanDianne Hackborn2010-09-231-0/+214
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '287952c35e148811c106bc0f5036eabf20f71562' into gingerbread-plus-aosp * commit '287952c35e148811c106bc0f5036eabf20f71562': Fix issue #3022508: Crash during media scan
| | * | Fix issue #3022508: Crash during media scanDianne Hackborn2010-09-231-0/+214
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't kill processes for excessive wake lock use, even if they are in the background, as long as they have running services. Also fix some problems with this, such as not noting the kill in battery stats. And add killing of processes for cpu usage as well, along with some optimizations to computing CPU usage. And fix BatteryWaster to be better behaving for testing these cases. Add new "monitor" command to am to watch as the activity manager does stuff (so we can catch things at the point of ANR). Finally some miscellaneous debug output for the stuff here, as well as in progress debugging of an ANR. Change-Id: Ib32f55ca50fb7486b4be4eb5e695f8f60c882cd1
* | | am 7e8a16e8: am d3c9fce3: Merge "Allow record to set input color format as a ↵James Dong2010-09-211-11/+49
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | command line option" into gingerbread Merge commit '7e8a16e884632c85a54dc351c0b4f79aea116237' * commit '7e8a16e884632c85a54dc351c0b4f79aea116237': Allow record to set input color format as a command line option
| * | am d3c9fce3: Merge "Allow record to set input color format as a command line ↵James Dong2010-09-211-11/+49
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | option" into gingerbread Merge commit 'd3c9fce36caa3991b2bc035ab80f92e110b0c0b3' into gingerbread-plus-aosp * commit 'd3c9fce36caa3991b2bc035ab80f92e110b0c0b3': Allow record to set input color format as a command line option
| | * Allow record to set input color format as a command line optionJames Dong2010-09-191-11/+49
| | | | | | | | | | | | | | | | | | o Only YUV420SP and YUV420P are supported Change-Id: I425e8b29d9dca8c05066c1cd777f8bdede52964a
* | | am 23c6ad7a: am 549629d3: Merge "Make sure stagefright -o terminates even if ↵Andreas Huber2010-09-161-1/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | we\'re using a raw audio source (such as .wav pcm)" into gingerbread Merge commit '23c6ad7aedecb5bc4be9ed61c2550c43715b47b0' * commit '23c6ad7aedecb5bc4be9ed61c2550c43715b47b0': Make sure stagefright -o terminates even if we're using a raw audio source (such as .wav pcm)
| * | am 549629d3: Merge "Make sure stagefright -o terminates even if we\'re using ↵Andreas Huber2010-09-161-1/+3
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | a raw audio source (such as .wav pcm)" into gingerbread Merge commit '549629d36690ac09498d0a9b2aac4ae4ceb7eead' into gingerbread-plus-aosp * commit '549629d36690ac09498d0a9b2aac4ae4ceb7eead': Make sure stagefright -o terminates even if we're using a raw audio source (such as .wav pcm)
| | * Make sure stagefright -o terminates even if we're using a raw audio source ↵Andreas Huber2010-09-161-1/+3
| | | | | | | | | | | | | | | | | | (such as .wav pcm) Change-Id: Iec809df89e6b75706cf5b1ce21006c2e217e018f
* | | resolved conflicts for merge of 53686433 to masterDianne Hackborn2010-09-131-1/+1
|\ \ \ | |/ / | | | | | | Change-Id: I27004dc464f5771d3205ae5757c6eccc5b16854d
| * | am 7e9f4eb2: Track client requests through location manager.Dianne Hackborn2010-09-131-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '7e9f4eb2608148436cef36c9969bf8a599b39e72' into gingerbread-plus-aosp * commit '7e9f4eb2608148436cef36c9969bf8a599b39e72': Track client requests through location manager.
| | * Track client requests through location manager.Dianne Hackborn2010-09-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a problem where applications could ask the location manager to do very heavy-weight things (like... say... update location every minute), which would get accounted against the system instead of the application because ultimately it is the system making the heavy calls (wake locks, etc). To solve this, we introduce a new class WorkSource representing the source of some work. Wake locks and Wifi locks allow you to set the source to use (but only if you are system code and thus can get the permission to do so), which is what will be reported to the battery stats until the actual caller. For the initial implementation, the location manager keeps track of all clients requesting periodic updates, and tells its providers about them as a WorkSource param when setting their min update time. The network location provider uses this to set the source on the wake and wifi locks it acquires, when doing work because of the update period. This should also be used elsewhere, such as in the GPS provider, but this is a good start. Change-Id: I2b6ffafad9e90ecf15d7c502e2db675fd52ae3cf
* | | am 09f1e2b2: resolved conflicts for merge of 56aa3c76 to gingerbread-plus-aospJean-Baptiste Queru2010-09-101-0/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '09f1e2b2151ea18c05b9138a0a5cb63af18ea373' * commit '09f1e2b2151ea18c05b9138a0a5cb63af18ea373': Initial contribution from Sony Corporation.
| * | resolved conflicts for merge of 56aa3c76 to gingerbread-plus-aospJean-Baptiste Queru2010-09-101-0/+2
| |\ \ | | | | | | | | | | | | Change-Id: I3d36a665f93f976824592edf35f6d6a205cc7617
| | * | Initial contribution from Sony Corporation.aimitakeshi2010-09-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add DRM Framework to support DRM content playback together with StageFright. - DRM Framework code is added - include/drm - drm - api/current.xml is updated to include DRM Framework Java APIs - cmds/servicemanager/service_manager.c is modified to add drmManager and drmIOService. Change-Id: I6d7bc9c7067362b500e530988a9ce241761866fb
* | | | Merge "Add support for giving arrays of ints and longs to the "am" command."Jack Veenstra2010-09-081-1/+22
|\ \ \ \
| * | | | Add support for giving arrays of ints and longs to the "am" command.Jack Veenstra2010-09-081-1/+22
| | | | | | | | | | | | | | | | | | | | Change-Id: Ibc4ae63fb5f8025a847bec7d37a1fce5abd81b39
* | | | | am 000ef46f: am 25429378: Merge "Allow installd to handle large partitions" ↵Kenny Root2010-09-073-21/+27
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit '000ef46f5b0f84d08342711b00e8de560ea504af' * commit '000ef46f5b0f84d08342711b00e8de560ea504af': Allow installd to handle large partitions
| * | | am 25429378: Merge "Allow installd to handle large partitions" into gingerbreadKenny Root2010-09-073-21/+27
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | Merge commit '254293782a94652fd601d6b3f04ad447c072f714' into gingerbread-plus-aosp * commit '254293782a94652fd601d6b3f04ad447c072f714': Allow installd to handle large partitions
| | * | Allow installd to handle large partitionsKenny Root2010-09-073-21/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use int64_t because we're RPCing over to Java which uses a Long to represent the filesystem space. Change-Id: I842b2cf9f2ff8f980ff5895c1c8eb9ebefa1ea31
* | | | Merge "Doc Change:ActivityManager usage doc:running test package"Joe Malin2010-09-031-1/+6
|\ \ \ \
| * | | | Doc Change:ActivityManager usage doc:running test packageJoe Malin2010-08-301-1/+6
| | | | | | | | | | | | | | | | | | | | Change-Id: I9a0c28e59f87e30c81d18162bee082b851d07a94
* | | | | Merge "Doc change: Update pm command usage for test packages"Joe Malin2010-09-031-1/+4
|\ \ \ \ \
| * | | | | Doc change: Update pm command usage for test packagesJoe Malin2010-08-311-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If9c51e0265394538023a913fa271dfb80f14a92e
* | | | | | am b4de2f99: am 05f0382b: When dropping privileges, check return values.Nick Kralevich2010-09-011-2/+12
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'b4de2f997591d3ee5f1eff92fbf2d4628cee5f2c' * commit 'b4de2f997591d3ee5f1eff92fbf2d4628cee5f2c': When dropping privileges, check return values.
| * | | | | am 05f0382b: When dropping privileges, check return values.Nick Kralevich2010-09-011-2/+12
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '05f0382bcf11d96760ee8cf9110099a1661eed7c' into gingerbread-plus-aosp * commit '05f0382bcf11d96760ee8cf9110099a1661eed7c': When dropping privileges, check return values.
| | * | | | When dropping privileges, check return values.Nick Kralevich2010-09-011-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setuid() and family can fail. Check return values to make sure this doesn't happen unexpectedly. Also call setgid() to drop root group permissions. Change-Id: Id06fbe6239e2ed2fe23368695e333514e0581e6d
* | | | | | bugreport: bcm4329: Add Wifi state dumpDmitry Shmidt2010-09-011-0/+2
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | Change-Id: I00a448bd44f3f5ca76948acad12ba20be794f3bd Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | | | am aa40b834: am 6aacad66: Merge "Add some encoding parameters for the ↵James Dong2010-08-311-1/+19
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | | | | | | | | | | | | | | | | | "record" utility" into gingerbread Merge commit 'aa40b834985023642b30fa2e0563c414a994bd3a' * commit 'aa40b834985023642b30fa2e0563c414a994bd3a': Add some encoding parameters for the "record" utility
| * | | am 6aacad66: Merge "Add some encoding parameters for the "record" utility" ↵James Dong2010-08-311-1/+19
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit '6aacad66eba2b51251f7e2dfb8c005b5242326ca' into gingerbread-plus-aosp * commit '6aacad66eba2b51251f7e2dfb8c005b5242326ca': Add some encoding parameters for the "record" utility
| | * | Add some encoding parameters for the "record" utilityJames Dong2010-08-311-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | - TODO: remove some of the hard coded values Change-Id: Ib58bbb8af45fd102176ac49da0a71613a12fa5fc
* | | | screenshot command: sound effect, filename incrementingDaniel Sandler2010-08-261-5/+58
| | | | | | | | | | | | | | | | Change-Id: I0302cda9791f14c23936dbdcce8a70711f65e07d