24660 Commits

Author SHA1 Message Date
Andreas Huber
d51c2cacce am 45bac57a: Support for writing the extracted data to an .mp4 file in the stagefright commandline tool.
Merge commit '45bac57aa00281e6b45756c691c588bdaf762521' into gingerbread-plus-aosp

* commit '45bac57aa00281e6b45756c691c588bdaf762521':
  Support for writing the extracted data to an .mp4 file in the stagefright commandline tool.
2010-07-01 10:07:17 -07:00
Andreas Huber
45bac57aa0 Support for writing the extracted data to an .mp4 file in the stagefright commandline tool.
Change-Id: I972324a8fc9757e6e8116b0270ec0882106f8733
2010-07-01 09:08:38 -07:00
Joe Onorato
393e145934 am a2dd4c17: put the status bar back in the system process
Merge commit 'a2dd4c17bbe47876b909b09f54505deda379d2b4' into gingerbread-plus-aosp

* commit 'a2dd4c17bbe47876b909b09f54505deda379d2b4':
  put the status bar back in the system process
2010-07-01 05:01:52 -07:00
Joe Onorato
6fd470fbdc am 6be4739e: quiet noisy debug spew
Merge commit '6be4739e1b302eb447dee195eaecbfcf82317310' into gingerbread-plus-aosp

* commit '6be4739e1b302eb447dee195eaecbfcf82317310':
  quiet noisy debug spew
2010-07-01 05:01:48 -07:00
Joe Onorato
a2dd4c17bb put the status bar back in the system process
Change-Id: I401b0ac8e3c96b61e787eb18341d18be75b3761d
2010-07-01 07:51:04 -04:00
Joe Onorato
6be4739e1b quiet noisy debug spew
Change-Id: I55c3b16f58bbe0ec4c6547c525863a7d16f8263d
2010-07-01 07:47:08 -04:00
Chih-Chung Chang
bda93c4cb9 am 09b90057: Add multiple camera support for in MediaProfiles.
Merge commit '09b9005769f2b717f637131578ce6cfa6bd62bd9' into gingerbread-plus-aosp

* commit '09b9005769f2b717f637131578ce6cfa6bd62bd9':
  Add multiple camera support for in MediaProfiles.
2010-06-30 20:22:40 -07:00
Chih-Chung Chang
09b9005769 Add multiple camera support for in MediaProfiles.
Change-Id: Ie89568a0f5f5fd08ede77e33f9a559215d6bed9a
2010-07-01 10:57:15 +08:00
Eric Laurent
e2dd8c4592 Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call.
Problem:
When the bluetooth device is removed, the AudioService clears all active SCO connections
and unlinks from the client application's binder interface death.
The problem is that the unlinking is done even if no more connections are active for a given client,
which throws a runtime exception that is not catched causing the system server to crash.

The fix consists in calling unlinkToDeath() in ScoClient.clearCount() only if the number of
active SCO connections for this client is not 0. The NoSuchElementException exception is also
catched when calling unlinkToDeath()

Change-Id: I29a28fcce1a579217cea271956a55778e05d3e37
2010-06-30 19:41:56 -07:00
Christopher Tate
d3233ae902 am 160edb36: Add ability to guard a thread against setting its own prio to bg
Merge commit '160edb3645f8b7012bab70ae6e6e8c4a5733082b' into gingerbread-plus-aosp

* commit '160edb3645f8b7012bab70ae6e6e8c4a5733082b':
  Add ability to guard a thread against setting its own prio to bg
2010-06-30 18:28:08 -07:00
Christopher Tate
160edb3645 Add ability to guard a thread against setting its own prio to bg
The guard is compiled out by default because it adds overhead to
android.os.Process.setPriority().

Change-Id: Ibb2a648c6349b381abb7ae62a358888b04fba871
2010-06-30 18:25:01 -07:00
Dianne Hackborn
177c405a24 am c6e1d880: Merge "Introduce official public NativeWindow type." into gingerbread
Merge commit 'c6e1d88022db800773401c16803e1ab27fd01a7e' into gingerbread-plus-aosp

* commit 'c6e1d88022db800773401c16803e1ab27fd01a7e':
  Introduce official public NativeWindow type.
2010-06-30 16:08:24 -07:00
Dianne Hackborn
c6e1d88022 Merge "Introduce official public NativeWindow type." into gingerbread 2010-06-30 16:05:30 -07:00
Mathias Agopian
e341a0b5e9 am 30fe6fa0: Merge "fix live wallpapers on Droid" into gingerbread
Merge commit '30fe6fa07a9b9c6e7498198608125add8eb40744' into gingerbread-plus-aosp

* commit '30fe6fa07a9b9c6e7498198608125add8eb40744':
  fix live wallpapers on Droid
2010-06-30 16:01:33 -07:00
The Android Open Source Project
c511d4f84c merge from open-source master
Change-Id: I99a88f61bc0f3ddcc233b6784e24427a7f8978be
2010-06-30 15:59:42 -07:00
Mathias Agopian
30fe6fa07a Merge "fix live wallpapers on Droid" into gingerbread 2010-06-30 15:59:02 -07:00
Mathias Agopian
4cfb3a69d2 fix live wallpapers on Droid
On omap3 h/w we force opaque formats to RGB_565 instead of RGBX_8888
because the GL driver doesn't support it. RGBX_8888 is always remapped
to RGBA_8888.

Change-Id: I0bfabeb98c8d3a399079e6797cf2a0ee95915324
2010-06-30 15:43:47 -07:00
Jeff Brown
0c2df98425 am d8ae2885: Merge "Fix injection of specially intercepted keys like HOME." into gingerbread
Merge commit 'd8ae28854e1ed9bd90d7407f94c2e5ed9028b712' into gingerbread-plus-aosp

* commit 'd8ae28854e1ed9bd90d7407f94c2e5ed9028b712':
  Fix injection of specially intercepted keys like HOME.
2010-06-30 15:33:41 -07:00
Christopher Tate
705a2df97c am c8525edc: Merge "Remove memory monitoring from the system watchdog" into gingerbread
Merge commit 'c8525edcba58cba7ce17ef72bc64fc3439943c08' into gingerbread-plus-aosp

* commit 'c8525edcba58cba7ce17ef72bc64fc3439943c08':
  Remove memory monitoring from the system watchdog
2010-06-30 15:33:35 -07:00
Daniel Sandler
9b4b74becf am 294c9fb8: Improved graphics for the intruder alert.
Merge commit '294c9fb8990ded73be52a3c1bfddbe1cebcd8b8e' into gingerbread-plus-aosp

* commit '294c9fb8990ded73be52a3c1bfddbe1cebcd8b8e':
  Improved graphics for the intruder alert.
2010-06-30 15:33:25 -07:00
Andreas Huber
86405cbd53 am caad0a5c: Merge "Support for vanilla YUV420sp => RGB565 color conversion." into gingerbread
Merge commit 'caad0a5c6318678902402362df1791d286636344' into gingerbread-plus-aosp

* commit 'caad0a5c6318678902402362df1791d286636344':
  Support for vanilla YUV420sp => RGB565 color conversion.
2010-06-30 15:33:09 -07:00
Doug Zongker
6db0ef09c4 am 24c737cc: am d581484e: Merge "Verify hostname where possible, and clarify where not." into froyo
Merge commit '24c737ccdd64475178d53677f90a300fcfbab79f' into gingerbread-plus-aosp

* commit '24c737ccdd64475178d53677f90a300fcfbab79f':
  Verify hostname where possible, and clarify where not.
2010-06-30 15:33:04 -07:00
Dianne Hackborn
7f6c6e8ffa am 3c80a4a0: Implement default key handling for native code.
Merge commit '3c80a4a044865bdf1289c7896baffa1c082d835c' into gingerbread-plus-aosp

* commit '3c80a4a044865bdf1289c7896baffa1c082d835c':
  Implement default key handling for native code.
2010-06-30 15:32:54 -07:00
Scott Main
b2d1a71bcc am 92dbad8a: am b4d2e42a: docs: revise menu guide to focus more on using menu resources instead of defining menus in code. And revise some style.
Merge commit '92dbad8ab0c8e242c4c3e52c339ed3296ae7901c' into gingerbread-plus-aosp

* commit '92dbad8ab0c8e242c4c3e52c339ed3296ae7901c':
  docs: revise menu guide to focus more on using menu resources
2010-06-30 15:32:28 -07:00
Dianne Hackborn
8b49bd1a2f Introduce official public NativeWindow type.
Not yet hooked up to anything in the NDK, but requires renaming
the existing android_native_window_t type everywhere.

Change-Id: Iffee6ea39c93b8b34e20fb69e4d2c7c837e5ea2e
2010-06-30 15:32:04 -07:00
Jeff Brown
d8ae28854e Merge "Fix injection of specially intercepted keys like HOME." into gingerbread 2010-06-30 15:03:04 -07:00
Christopher Tate
c8525edcba Merge "Remove memory monitoring from the system watchdog" into gingerbread 2010-06-30 14:55:44 -07:00
Christopher Tate
c27181c7f3 Remove memory monitoring from the system watchdog
This was originally written as an in-case-we-need-it facility, but was
never actually used in production.  It also soaked up a surprising amount
of cpu on occasion, as well as doing sketchy things like demoting the
system_server's primary looper thread to the background cgroup at times.

Change-Id: I9a81a8d1e9caea9e0a1277d97785fe96add438d7
2010-06-30 14:53:39 -07:00
Jeff Brown
d009787182 Fix injection of specially intercepted keys like HOME.
This change mainly unwinds a premature optimization in the
dispatch pipeline.
To test HOME injection, run 'adb shell input keyevent 3'.

Change-Id: I1c4b7377c205da7c898014b8b07fc6dc1d46e4dd
2010-06-30 14:41:59 -07:00
Daniel Sandler
294c9fb899 Improved graphics for the intruder alert.
Change-Id: I9aa6c8995da39f332b724fabe67ed5efe584552f
2010-06-30 15:32:26 -04:00
Andreas Huber
caad0a5c63 Merge "Support for vanilla YUV420sp => RGB565 color conversion." into gingerbread 2010-06-30 11:32:31 -07:00
Doug Zongker
24c737ccdd am d581484e: Merge "Verify hostname where possible, and clarify where not." into froyo
Merge commit 'd581484ef8fac80c15ebf652e66f918374df5109' into gingerbread

* commit 'd581484ef8fac80c15ebf652e66f918374df5109':
  Verify hostname where possible, and clarify where not.
2010-06-30 11:17:00 -07:00
Doug Zongker
d581484ef8 Merge "Verify hostname where possible, and clarify where not." into froyo 2010-06-30 11:12:19 -07:00
Dianne Hackborn
3c80a4a044 Implement default key handling for native code.
The native code now maintains a list of all keys that may use
default handling.  If the app finishes one of these keys
without handling it, the key will be passed back off to Java
for default treatment.

Change-Id: I6a842a0d728eeafa4de7142fae573f8c11099e18
2010-06-30 10:49:40 -07:00
Andreas Huber
c543a21a40 Support for vanilla YUV420sp => RGB565 color conversion.
Change-Id: I22e5b554909e169eaf153d1f25b636f6f04a1871
2010-06-30 10:32:39 -07:00
Scott Main
92dbad8ab0 am b4d2e42a: docs: revise menu guide to focus more on using menu resources instead of defining menus in code. And revise some style.
Merge commit 'b4d2e42a8508a09f944b13f27c043952eef6c1cc' into gingerbread

* commit 'b4d2e42a8508a09f944b13f27c043952eef6c1cc':
  docs: revise menu guide to focus more on using menu resources
2010-06-30 09:01:01 -07:00
Mike Lockwood
2a28f4b40c am 5b8364a9: GPS: stifle some logging
Merge commit '5b8364a929e26b30d55de9d330e1cb9a11df6208' into gingerbread-plus-aosp

* commit '5b8364a929e26b30d55de9d330e1cb9a11df6208':
  GPS: stifle some logging
2010-06-30 07:04:28 -07:00
Mike Lockwood
5b8364a929 GPS: stifle some logging
Change-Id: Ifc68f27a6cb841240db182f4c77ddd8085a8c149
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-30 09:59:46 -04:00
Dan Egnor
7fc93c36ae Verify hostname where possible, and clarify where not.
Bug: 2807409
Change-Id: I6f6a6b22a48149d9f1f45ff8f53103b25706ecc0
2010-06-29 19:19:10 -07:00
James Dong
42dd99084d am f7679a04: Merge "Added encoding parameters set up for H263 video encoder" into gingerbread
Merge commit 'f7679a0493d59da8c759a6be639be5110c50fb98' into gingerbread-plus-aosp

* commit 'f7679a0493d59da8c759a6be639be5110c50fb98':
  Added encoding parameters set up for H263 video encoder
2010-06-29 17:27:29 -07:00
James Dong
f7679a0493 Merge "Added encoding parameters set up for H263 video encoder" into gingerbread 2010-06-29 17:24:10 -07:00
Scott Main
b4d2e42a85 docs: revise menu guide to focus more on using menu resources
instead of defining menus in code.
And revise some style.

Change-Id: I0a5a19a51062d72cdb9045c9607cab04b69f554c
2010-06-29 17:13:02 -07:00
Chris Tate
af4a2d1f52 am ddcb543a: Merge "Fix native input dispatch in the emulator." into gingerbread
Merge commit 'ddcb543ac8d9615ea78fbf8341949f54d86e6fbc' into gingerbread-plus-aosp

* commit 'ddcb543ac8d9615ea78fbf8341949f54d86e6fbc':
  Fix native input dispatch in the emulator.
2010-06-29 17:03:43 -07:00
Chris Tate
ddcb543ac8 Merge "Fix native input dispatch in the emulator." into gingerbread 2010-06-29 17:01:04 -07:00
Jeff Brown
0b72e82c5f Fix native input dispatch in the emulator.
Set a default orientation of ROTATION_0.
Added some more careful checks based on whether we have valid
absolute axis information from the driver.
Reset key repeating during configuration changes since the keyboard
device may have been removed.

Change-Id: I685960828acffcb17595fc5683309e8064a76714
2010-06-29 16:52:21 -07:00
James Dong
c0ab2a6458 Added encoding parameters set up for H263 video encoder
Also:
- Allowed start() call when encoder already starts and stop() call when encoder has not started yet
- Handled default value for audio/video sources/encoders and file output format

Change-Id: I03b2f7d3cf570baa0fd011a8c0ad200f2f2a5da1
2010-06-29 16:44:19 -07:00
Scott Main
7c8ca29e70 am e42b1867: am 4fb91d9f: docs: fix typo
Merge commit 'e42b18677e11d27fa1d3eaa1ffcb1f98c5fc8cbf' into gingerbread-plus-aosp

* commit 'e42b18677e11d27fa1d3eaa1ffcb1f98c5fc8cbf':
  docs: fix typo
2010-06-29 15:49:37 -07:00
Scott Main
e42b18677e am 4fb91d9f: docs: fix typo
Merge commit '4fb91d9f1bede8ad49365913804532ca57206455' into gingerbread

* commit '4fb91d9f1bede8ad49365913804532ca57206455':
  docs: fix typo
2010-06-29 15:47:42 -07:00
Mathias Agopian
33df868bb3 am 1eb442ee: Merge "remove a hack that was used only used on h/w we no longer support." into gingerbread
Merge commit '1eb442eef737051bd2734d823fa4c12c17c1da36' into gingerbread-plus-aosp

* commit '1eb442eef737051bd2734d823fa4c12c17c1da36':
  remove a hack that was used only used on h/w we no longer support.
2010-06-29 15:35:13 -07:00
Mathias Agopian
1eb442eef7 Merge "remove a hack that was used only used on h/w we no longer support." into gingerbread 2010-06-29 15:33:36 -07:00