684 Commits

Author SHA1 Message Date
James Dong
75611c8a97 Switch to use kKeyFrameRate for recordvideo utility
Change-Id: I3f6abfed9c39223fe5c1a1b9c094b7ce8a8ca67f
2010-11-14 10:57:28 -08:00
Andreas Huber
93e496f0ba Added a commandline option "-x" to the stagefright commandline tool.
To display a histogram of decoding times and ideal frame rate distributions.

Change-Id: Id8d70fd2960858c75f5f91ae9ebb9902ad5c37d3
2010-11-09 11:16:03 -08:00
Dmitry Shmidt
975d24d5af Merge "bugreport: Add bcm4329 internal counters dump" 2010-11-04 14:53:17 -07:00
Dmitry Shmidt
2b799198bb bugreport: Add bcm4329 internal counters dump
Change-Id: I8e74bc1bf9a269e2a429ada1b1141d10cb7d914f
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2010-11-04 14:39:24 -07:00
Jean-Baptiste Queru
e9418ffc5b am 0d7c66b3: Merge 42c94791 from open-source master
* commit '0d7c66b3a555356315c17da48969fee28181ceda':
  Fix the animation disappeared issue
2010-11-04 10:57:34 -07:00
Jean-Baptiste Queru
0d7c66b3a5 Merge 42c94791 from open-source master
Change-Id: Id17a1a787b6d46c44ba39d628129a3a27f6d70be
2010-11-04 07:22:44 -07:00
Dmitry Shmidt
2c3197bf46 bugreport: Fix dump of netcfg command
Change-Id: Id2f507f4b094cd9cbe5c5eae9030321d1c3ed71a
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2010-11-03 16:59:47 -07:00
Chih-Wei Huang
2978751310 Fix the animation disappeared issue
The animation movie disappears due to the incorrect logic of
commit c11f46259a1e8f4e7e58925aefd1ed9eaf57a7fc.

Change-Id: I9c0eac2bf2950fe20e931da367036ddf38d81f52
2010-11-03 15:33:00 +08:00
Chris Tate
7a0fc87767 Don't crash bmgr if there are no available restore sets
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
2010-11-01 15:50:35 -07:00
Kenny Root
95fb8396ca am faf53c0b: am 40763914: Merge "Exit immediately on some linklib failures" into gingerbread 2010-10-22 12:31:26 -07:00
Kenny Root
faf53c0bf2 am 40763914: Merge "Exit immediately on some linklib failures" into gingerbread 2010-10-22 12:18:46 -07:00
Wink Saville
2f791fd868 Change dumpstate so the logs use threadtime instead of time as the default.
The threadtime option display both the pid and tid which can
assist pinpointing bugs.

Change-Id: Ib4620d3534a59b291507b757352f9fecb06f7cef
2010-10-22 09:48:19 -07:00
Joe Onorato
eb95b0877a Show app services in adb bugreport (dumpstate).
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
2010-10-22 12:36:07 -04:00
Kenny Root
0332d1c5a5 Exit immediately on some linklib failures
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
2010-10-21 16:14:06 -07:00
Nick Kralevich
c791244444 am 9a430d8c: am 62d0970c: Merge "allow dumpstate to work for non-root users." into gingerbread
Merge commit '9a430d8c0e376160f287e50cdad99177e69ec384'

* commit '9a430d8c0e376160f287e50cdad99177e69ec384':
  allow dumpstate to work for non-root users.
2010-10-21 15:31:07 -07:00
Nick Kralevich
9a430d8c0e am 62d0970c: Merge "allow dumpstate to work for non-root users." into gingerbread
Merge commit '62d0970c82f9a2c17aea67379c207a3f17556c46' into gingerbread-plus-aosp

* commit '62d0970c82f9a2c17aea67379c207a3f17556c46':
  allow dumpstate to work for non-root users.
2010-10-21 11:50:55 -07:00
Nick Kralevich
77d87aa7ff allow dumpstate to work for non-root users.
Change-Id: Iaad4a097f5e09914842955dafbc0a09cc7a1db48
2010-10-21 09:14:14 -07:00
David Deephanphongs
62f2ada64f Add missing NOTICE entries.
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
2010-10-19 16:56:02 -07:00
Jean-Baptiste Queru
ac2a88061d Remove one more opencore include path
Bug: 3101573
Change-Id: Id60845e4c46523e910504fe6e707f8247a3b6102
2010-10-18 08:41:14 -07:00
Jean-Baptiste Queru
5582cc3a68 Merge fb474872 from gingerbread-plus-aosp
Change-Id: I1bbb845a86a7b7df44ea175df3af22e5f47c44e3
2010-10-18 08:33:38 -07:00
Nick Pelly
cd0e839a24 NFC: Move NFC service implementation out of system_server.
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>
2010-10-17 18:35:29 -07:00
Andreas Huber
fb47487259 am b04f356d: Merge "Include the framework copy of the OpenMAX headers 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.
2010-10-15 18:25:14 -07:00
Jean-Baptiste Queru
36e7790b6b Merge a851d8d0 from gingerbread
Change-Id: Iea0e3fa1662d6326ab337821fe52a65a9dfd989a
2010-10-15 17:02:57 -07:00
Andreas Huber
b04f356d86 Merge "Include the framework copy of the OpenMAX headers instead of referencing external/opencore." into gingerbread 2010-10-15 14:58:54 -07:00
Andreas Huber
a4f391c9bf Include the framework copy of the OpenMAX headers instead of referencing external/opencore.
Change-Id: I762f59acf5e1f770e4d7c2d89af362bfffebefa6
related-to-bug: 3101573
2010-10-15 13:31:29 -07:00
Nick Pelly
bc21fdefdf NFC: Move NFC service implementation out of system_server.
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>
2010-10-15 02:12:32 -07:00
Kenny Root
5bc3addb45 am 0689b60b: am 54e01e0f: Merge "Symlink application lib directory when on SD card" into gingerbread
Merge commit '0689b60b8644d7c4c76e5cdf7e6ce5cc4c5be124'

* commit '0689b60b8644d7c4c76e5cdf7e6ce5cc4c5be124':
  Symlink application lib directory when on SD card
2010-10-10 14:19:52 -07:00
Kenny Root
0689b60b86 am 54e01e0f: Merge "Symlink application lib directory when on SD card" into gingerbread
Merge commit '54e01e0f980cfb78153d5481f7e67cef90416174' into gingerbread-plus-aosp

* commit '54e01e0f980cfb78153d5481f7e67cef90416174':
  Symlink application lib directory when on SD card
2010-10-07 17:41:05 -07:00
Kenny Root
6a6b007c77 Symlink application lib directory when on SD card
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
2010-10-07 17:20:26 -07:00
Brian Carlstrom
c4838afb34 Merge "Move LOG_ALWAYS_FATAL to end of app_process" 2010-10-07 16:32:02 -07:00
Brian Carlstrom
de6d1d889e Move LOG_ALWAYS_FATAL to end of app_process
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
2010-10-07 16:02:11 -07:00
James Dong
10649792d6 Add two more options to "recordvideo" utility
o also removed unused code

Change-Id: I49471b0ac1cf70b5eedcde78a21e7770c312c5d6
2010-10-06 19:07:40 -07:00
Mathias Agopian
bba3b8efbe am 19058877: Merge "refactored screenshot code" into gingerbread
Merge commit '19058877df9bf94f197a72855f810f7f6bf8d068' into gingerbread-plus-aosp

* commit '19058877df9bf94f197a72855f810f7f6bf8d068':
  refactored screenshot code
2010-10-04 20:06:51 -07:00
Mathias Agopian
9fa7926bea am b9aacfdf: Merge "new screencap command" into gingerbread
Merge commit 'b9aacfdfb014cc0299f7999d2a8940cd60a4cc59' into gingerbread-plus-aosp

* commit 'b9aacfdfb014cc0299f7999d2a8940cd60a4cc59':
  new screencap command
2010-10-04 20:06:47 -07:00
Mathias Agopian
597c7f67b5 refactored screenshot code
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
2010-10-04 17:36:17 -07:00
Mathias Agopian
541d942000 new screencap command
this captures the framebuffer via surfaceflinger APIs and outputs
it to stdout. this is intended to be used by adbd.

Change-Id: I057e331d28dd92bd45a2c7037ab93e220bbd65f3
2010-10-04 17:35:34 -07:00
Chia-chi Yeh
82a1372070 am a4f1eb3d: am 9430f9d3: Merge "KeyStore: Update the parameters of generating master keys." into gingerbread
Merge commit 'a4f1eb3d775533d9b28248022e0a5b4ec05fc2e4'

* commit 'a4f1eb3d775533d9b28248022e0a5b4ec05fc2e4':
  KeyStore: Update the parameters of generating master keys.
2010-10-01 17:08:30 -07:00
Chia-chi Yeh
a4f1eb3d77 am 9430f9d3: Merge "KeyStore: Update the parameters of generating master keys." into gingerbread
Merge commit '9430f9d37ec169ce0654bc8950adb66ac974b761' into gingerbread-plus-aosp

* commit '9430f9d37ec169ce0654bc8950adb66ac974b761':
  KeyStore: Update the parameters of generating master keys.
2010-10-01 16:16:17 -07:00
Chia-chi Yeh
9430f9d37e Merge "KeyStore: Update the parameters of generating master keys." into gingerbread 2010-10-01 15:34:43 -07:00
Mathias Agopian
2a471bb690 Merge "refactored screenshot code" 2010-10-01 12:15:12 -07:00
James Dong
e15119fee6 Merge "Add a video record utility" 2010-10-01 12:10:10 -07:00
Fabrice Di Meglio
d1e5ddaf4d am 797bb4f8: am 73db5f02: Merge "Fix bug #3055578 ("adb shell bmgr list 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)
2010-10-01 11:35:37 -07:00
Fabrice Di Meglio
797bb4f83d am 73db5f02: Merge "Fix bug #3055578 ("adb shell bmgr list sets" generates 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)
2010-10-01 11:32:56 -07:00
Fabrice Di Meglio
73db5f02a1 Merge "Fix bug #3055578 ("adb shell bmgr list sets" generates NPE and cannot be run again when device has no account setup)" into gingerbread 2010-10-01 11:30:50 -07:00
Fabrice Di Meglio
04686f4289 Fix bug #3055578 ("adb shell bmgr list sets" generates NPE and cannot be run again when device has no account setup)
- fix NPE
- code cleaning

Change-Id: Ieb30b666d995de8cbd27ee6d17e2178e7ea670f6
2010-10-01 11:16:10 -07:00
James Dong
b5742452e0 Add a video record utility
Change-Id: I3aa7cadf399aa319ee9ca3f391fd8599742bfb7e
2010-09-30 21:40:14 -07:00
Chia-chi Yeh
281d114ce8 am ab6327bc: am 20cb2310: Merge "KeyStore: Initialize IV correctly." into gingerbread
Merge commit 'ab6327bc9ab70f3b4c1f509d038474982772207e'

* commit 'ab6327bc9ab70f3b4c1f509d038474982772207e':
  KeyStore: Initialize IV correctly.
2010-09-30 13:36:55 -07:00
Chia-chi Yeh
59c1da6342 am 92cb1a02: am 2cbb56f9: Merge "KeyStore: Fix the return value when send() or recv() has an error." into gingerbread
Merge commit '92cb1a026a2d6c594a63c18d8906271147eed85b'

* commit '92cb1a026a2d6c594a63c18d8906271147eed85b':
  KeyStore: Fix the return value when send() or recv() has an error.
2010-09-30 13:36:43 -07:00
Chia-chi Yeh
2509976269 KeyStore: Update the parameters of generating master keys.
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
2010-10-01 01:42:55 +08:00
Chia-chi Yeh
ab6327bc9a am 20cb2310: Merge "KeyStore: Initialize IV correctly." into gingerbread
Merge commit '20cb2310cffb787c54016d50b9b5fe320fc5b025' into gingerbread-plus-aosp

* commit '20cb2310cffb787c54016d50b9b5fe320fc5b025':
  KeyStore: Initialize IV correctly.
2010-09-30 10:11:16 -07:00