summaryrefslogtreecommitdiffstats
path: root/cmds
Commit message (Collapse)AuthorAgeFilesLines
* am 40763914: Merge "Exit immediately on some linklib failures" into gingerbreadKenny Root2010-10-221-4/+2
|\
| * Exit immediately on some linklib failuresKenny Root2010-10-211-4/+2
| | | | | | | | | | | | | | | | If the library couldn't be printed to the string, installd should fail early instead of trying to chmod() back to uninitialized stat struct. Bug: 3121721 Change-Id: I8a3604954ae657a1e07c1ad8d5569aa80aff9e0a
* | am 62d0970c: Merge "allow dumpstate to work for non-root users." into ↵Nick Kralevich2010-10-211-13/+15
|\ \ | |/ | | | | | | | | | | | | | | gingerbread Merge commit '62d0970c82f9a2c17aea67379c207a3f17556c46' into gingerbread-plus-aosp * commit '62d0970c82f9a2c17aea67379c207a3f17556c46': allow dumpstate to work for non-root users.
| * allow dumpstate to work for non-root users.Nick Kralevich2010-10-211-13/+15
| | | | | | | | Change-Id: Iaad4a097f5e09914842955dafbc0a09cc7a1db48
* | am b04f356d: Merge "Include the framework copy of the OpenMAX headers ↵Andreas Huber2010-10-151-3/+3
|\ \ | |/ | | | | | | | | | | | | | | instead of referencing external/opencore." into gingerbread Merge commit 'b04f356d86eec74217fca8e3b85d801c4fcaa678' into gingerbread-plus-aosp * commit 'b04f356d86eec74217fca8e3b85d801c4fcaa678': Include the framework copy of the OpenMAX headers instead of referencing external/opencore.
| * Merge "Include the framework copy of the OpenMAX headers instead of ↵Andreas Huber2010-10-151-3/+3
| |\ | | | | | | | | | referencing external/opencore." into gingerbread
| | * Include the framework copy of the OpenMAX headers instead of referencing ↵Andreas Huber2010-10-151-3/+3
| | | | | | | | | | | | | | | | | | | | | external/opencore. Change-Id: I762f59acf5e1f770e4d7c2d89af362bfffebefa6 related-to-bug: 3101573
* | | Merge a851d8d0 from gingerbreadJean-Baptiste Queru2010-10-151-0/+1
|\ \ \ | |/ / | | | | | | Change-Id: Iea0e3fa1662d6326ab337821fe52a65a9dfd989a
| * | NFC: Move NFC service implementation out of system_server.Nick Pelly2010-10-151-0/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NFC service is now an application service in packages/apps/Nfc. NFC service is registered through ServiceManager.addService(), and the proxy object NfcAdapter obtains a handle to it through ServiceManager.getService(). **Important** Had to add new symbols AID_NFC / NFC_UID / android.uid.nfc and modify service_manager.c, Process.java and PackageManagerService.java in order to force the com.android.nfc process to take a fixed uid, so that it can use ServiceManager.addService(). Most of the JNI has moved to packages/apps/Nfc/jni. However NdefRecord and NdefMessage require some in-process native code, so android_com_NdefMessage.cpp and android_com_NdefRecord.cpp stay in frameworks/base/core/jni. They link to a very small library libnfc_ndef.so that implements NDEF message parsing. This has been added to core.mk so all devices (even without NFC hardware) can work with NDEF data. Bug: 3041259 Bug: 3097445 Change-Id: If8f00ce8f2053acfc9319ca366d4a9c02bd396e6 Signed-off-by: Nick Pelly <npelly@google.com>
* | am 54e01e0f: Merge "Symlink application lib directory when on SD card" into ↵Kenny Root2010-10-073-0/+168
|\ \ | |/ | | | | | | | | | | | | | | gingerbread Merge commit '54e01e0f980cfb78153d5481f7e67cef90416174' into gingerbread-plus-aosp * commit '54e01e0f980cfb78153d5481f7e67cef90416174': Symlink application lib directory when on SD card
| * Symlink application lib directory when on SD cardKenny Root2010-10-073-0/+168
| | | | | | | | | | | | | | | | This will help legacy games that use dlopen() to directly access the /data/data/<app>/lib directory before the ApplicationInfo.nativeLibraryDir was part of the API. Change-Id: Ie9f3e7239b6334708b5d086ffafe66a507f6d9da
* | am 19058877: Merge "refactored screenshot code" into gingerbreadMathias Agopian2010-10-041-18/+7
|\ \ | |/ | | | | | | | | | | Merge commit '19058877df9bf94f197a72855f810f7f6bf8d068' into gingerbread-plus-aosp * commit '19058877df9bf94f197a72855f810f7f6bf8d068': refactored screenshot code
| * refactored screenshot codeMathias Agopian2010-10-041-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: I33689bba98507ab928d0898b21596d0d2fe4b953
* | am b9aacfdf: Merge "new screencap command" into gingerbreadMathias Agopian2010-10-042-0/+71
|\ \ | |/ | | | | | | | | | | Merge commit 'b9aacfdfb014cc0299f7999d2a8940cd60a4cc59' into gingerbread-plus-aosp * commit 'b9aacfdfb014cc0299f7999d2a8940cd60a4cc59': new screencap command
| * new screencap commandMathias Agopian2010-10-042-0/+71
| | | | | | | | | | | | | | this captures the framebuffer via surfaceflinger APIs and outputs it to stdout. this is intended to be used by adbd. Change-Id: I057e331d28dd92bd45a2c7037ab93e220bbd65f3
* | 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
* | | 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 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 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 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
* | | 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
* | 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 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 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
* | | 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 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 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
* | 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
* | 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
* | | 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
* | | 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.