summaryrefslogtreecommitdiffstats
path: root/cmds
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge "Move LOG_ALWAYS_FATAL to end of app_process"Brian Carlstrom2010-10-071-1/+1
|\ \ \ \
| * | | | Move LOG_ALWAYS_FATAL to end of app_processBrian Carlstrom2010-10-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since LOG_ALWAYS_FATAL is always fatal and code after it is by definition unreachable, put the call after other diagnostic output. Change-Id: Ib3a515a04125d8e4f6e8af3a6f59226e8f0dd9cd
* | | | | Add two more options to "recordvideo" utilityJames Dong2010-10-061-49/+43
|/ / / / | | | | | | | | | | | | | | | | | | | | o also removed unused code Change-Id: I49471b0ac1cf70b5eedcde78a21e7770c312c5d6
* | | | am a4f1eb3d: am 9430f9d3: Merge "KeyStore: Update the parameters of ↵Chia-chi Yeh2010-10-011-24/+71
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | generating master keys." into gingerbread Merge commit 'a4f1eb3d775533d9b28248022e0a5b4ec05fc2e4' * commit 'a4f1eb3d775533d9b28248022e0a5b4ec05fc2e4': KeyStore: Update the parameters of generating master keys.
| * | | am 9430f9d3: Merge "KeyStore: Update the parameters of generating master ↵Chia-chi Yeh2010-10-011-24/+71
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | keys." into gingerbread Merge commit '9430f9d37ec169ce0654bc8950adb66ac974b761' into gingerbread-plus-aosp * commit '9430f9d37ec169ce0654bc8950adb66ac974b761': KeyStore: Update the parameters of generating master keys.
| | * | Merge "KeyStore: Update the parameters of generating master keys." into ↵Chia-chi Yeh2010-10-011-24/+71
| | |\ \ | | | | | | | | | | | | | | | gingerbread
| | | * | KeyStore: Update the parameters of generating master keys.Chia-chi Yeh2010-10-011-24/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To improve the security, the parameters to generate the master key has been changed. Special cares has been taken to prevent from permanent damages of the existing data during the transition process. Change-Id: I0c93f3de28a9fcd314932675ccfb65a7f11fa3ff
* | | | | Merge "refactored screenshot code"Mathias Agopian2010-10-011-18/+7
|\ \ \ \ \
| * | | | | refactored screenshot codeMathias Agopian2010-09-291-18/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the core screenshot function now can capture the screen at any lower resolution performing bilinear filtering. we also now have some client code to interface with the screenshot service. it's now possible to request a screenshot at a lower resolution. Change-Id: I5a3b0e431421800e3aad601d9af8f94adffbc71f
* | | | | | Merge "Add a video record utility"James Dong2010-10-012-0/+334
|\ \ \ \ \ \
| * | | | | | Add a video record utilityJames Dong2010-09-302-0/+334
| |/ / / / / | | | | | | | | | | | | | | | | | | Change-Id: I3aa7cadf399aa319ee9ca3f391fd8599742bfb7e
* | | | | | am 797bb4f8: am 73db5f02: Merge "Fix bug #3055578 ("adb shell bmgr list ↵Fabrice Di Meglio2010-10-011-1/+4
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sets" generates NPE and cannot be run again when device has no account setup)" into gingerbread Merge commit '797bb4f83dfcaf263c72b760dfa279e3fbb8d545' * commit '797bb4f83dfcaf263c72b760dfa279e3fbb8d545': Fix bug #3055578 ("adb shell bmgr list sets" generates NPE and cannot be run again when device has no account setup)
| * | | | | am 73db5f02: Merge "Fix bug #3055578 ("adb shell bmgr list sets" generates ↵Fabrice Di Meglio2010-10-011-1/+4
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NPE and cannot be run again when device has no account setup)" into gingerbread Merge commit '73db5f02a1e1a3fc3514ddbff1c28e22fec3aa7a' into gingerbread-plus-aosp * commit '73db5f02a1e1a3fc3514ddbff1c28e22fec3aa7a': Fix bug #3055578 ("adb shell bmgr list sets" generates NPE and cannot be run again when device has no account setup)
| | * | | | Merge "Fix bug #3055578 ("adb shell bmgr list sets" generates NPE and cannot ↵Fabrice Di Meglio2010-10-011-1/+4
| | |\ \ \ \ | | | |_|/ / | | |/| | | | | | | | | be run again when device has no account setup)" into gingerbread
| | | * | | Fix bug #3055578 ("adb shell bmgr list sets" generates NPE and cannot be run ↵Fabrice Di Meglio2010-10-011-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | again when device has no account setup) - fix NPE - code cleaning Change-Id: Ieb30b666d995de8cbd27ee6d17e2178e7ea670f6
* | | | | | am ab6327bc: am 20cb2310: Merge "KeyStore: Initialize IV correctly." into ↵Chia-chi Yeh2010-09-301-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit 'ab6327bc9ab70f3b4c1f509d038474982772207e' * commit 'ab6327bc9ab70f3b4c1f509d038474982772207e': KeyStore: Initialize IV correctly.
| * | | | | am 20cb2310: Merge "KeyStore: Initialize IV correctly." into gingerbreadChia-chi Yeh2010-09-301-1/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '20cb2310cffb787c54016d50b9b5fe320fc5b025' into gingerbread-plus-aosp * commit '20cb2310cffb787c54016d50b9b5fe320fc5b025': KeyStore: Initialize IV correctly.
| | * | | | KeyStore: Initialize IV correctly.Chia-chi Yeh2010-09-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idbf207dfcc11b92e606cbf4fd3732ed7a8aa3416
* | | | | | am 92cb1a02: am 2cbb56f9: Merge "KeyStore: Fix the return value when send() ↵Chia-chi Yeh2010-09-301-1/+4
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | or recv() has an error." into gingerbread Merge commit '92cb1a026a2d6c594a63c18d8906271147eed85b' * commit '92cb1a026a2d6c594a63c18d8906271147eed85b': KeyStore: Fix the return value when send() or recv() has an error.
| * | | | am 2cbb56f9: Merge "KeyStore: Fix the return value when send() or recv() has ↵Chia-chi Yeh2010-09-301-1/+4
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | an error." into gingerbread Merge commit '2cbb56f961e4893a3bf7ded560d4bdbf45eabd01' into gingerbread-plus-aosp * commit '2cbb56f961e4893a3bf7ded560d4bdbf45eabd01': KeyStore: Fix the return value when send() or recv() has an error.
| | * | | KeyStore: Fix the return value when send() or recv() has an error.Chia-chi Yeh2010-09-301-1/+4
| | |/ / | | | | | | | | | | | | Change-Id: I20a63c76bd29b1a9f8959a6c4fe5a5b8a9a971b4
* | | | 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.
generated by cgit v1.1 at 2025-02-19 11:22:04 +0000