summaryrefslogtreecommitdiffstats
path: root/cmds
Commit message (Collapse)AuthorAgeFilesLines
* Don't crash bmgr if there are no available restore setsChris Tate2010-11-011-5/+7
| | | | | | | | | | Properly guard against a null set of available restore sets when validating the token passed to 'bmgr restore TOKEN' against what's known to exist on the backend. Fixes bug 3153986 Change-Id: I74bdd4c6242f682833c1633baa4fefccb2b165a7
* am faf53c0b: am 40763914: Merge "Exit immediately on some linklib failures" ↵Kenny Root2010-10-221-4/+2
|\ | | | | | | into gingerbread
| * 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
* | | Change dumpstate so the logs use threadtime instead of time as the default.Wink Saville2010-10-221-3/+3
| | | | | | | | | | | | | | | | | | | | | The threadtime option display both the pid and tid which can assist pinpointing bugs. Change-Id: Ib4620d3534a59b291507b757352f9fecb06f7cef
* | | Show app services in adb bugreport (dumpstate).Joe Onorato2010-10-221-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a 60s timeout for this command. I'd rather do it as an individual timeout for each of the services, but this is easier and will probably cover for busted apps well enough. Also, this is running last in dumpstate, so if it's lost... oh well. Also, clean up the formatting of the service dump so it's more readable in bugreport. Change-Id: Ibd727f4b3366f7af9e7ef1e231868f5cedc48132
* | | am 9a430d8c: am 62d0970c: Merge "allow dumpstate to work for non-root ↵Nick Kralevich2010-10-211-13/+15
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | users." into gingerbread Merge commit '9a430d8c0e376160f287e50cdad99177e69ec384' * commit '9a430d8c0e376160f287e50cdad99177e69ec384': allow dumpstate to work for non-root users.
| * | 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
* | | Add missing NOTICE entries.David Deephanphongs2010-10-191-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | Add missing NOTICE block for TagSoup in general NOTICE file. Add comment in Android.mk to help reviewers locate the NOTICE for apache-http. Modify build rule for 'am' command to pull in the NOTICE file. Change-Id: I43c6c1468395b70d0942b3620f12e4b6f3d9a66b
* | | Remove one more opencore include pathJean-Baptiste Queru2010-10-181-1/+1
| | | | | | | | | | | | | | | Bug: 3101573 Change-Id: Id60845e4c46523e910504fe6e707f8247a3b6102
* | | Merge fb474872 from gingerbread-plus-aospJean-Baptiste Queru2010-10-181-3/+3
|\ \ \ | |/ / | | | | | | Change-Id: I1bbb845a86a7b7df44ea175df3af22e5f47c44e3
| * | 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>
* | | NFC: Move NFC service implementation out of system_server.Nick Pelly2010-10-171-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: If7f00cd8f2053acfc9319ca366d4a9c02bd396e6 Signed-off-by: Nick Pelly <npelly@google.com>
* | | am 0689b60b: am 54e01e0f: Merge "Symlink application lib directory when on ↵Kenny Root2010-10-103-0/+168
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | SD card" into gingerbread Merge commit '0689b60b8644d7c4c76e5cdf7e6ce5cc4c5be124' * commit '0689b60b8644d7c4c76e5cdf7e6ce5cc4c5be124': Symlink application lib directory when on SD card
| * | 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
* | | 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