James Dong
b5e742397d
Output streamable MP4 file during MP4 file recording
...
When the reserved moov box space is not big enough,
fall back to non-streamable MP4 file.
Change-Id: I93382d037d657a3f3fe2af31e4ea26e1898b4d95
2010-05-11 10:36:43 -07:00
Dianne Hackborn
834910f51f
am 217f2686: am 7d5cea98: am 7e76b6d1: am 6d00151c: Merge "Hopefully fix issue #2662536 : Why is launcher being killed?" into froyo
2010-05-11 10:28:20 -07:00
Dirk Dougherty
e389ec59f9
am 775994e1: am c5803869: am 02168c41: am 1926c471: Merge "Doc change: Final api diffs 7 -> 8." into froyo
2010-05-11 10:28:16 -07:00
Dirk Dougherty
7d3563238e
am 2ecef59c: am 0ab047c7: am 769612e1: am b32c2402: Doc change: add toc references to tictactoe sample apps and screen shots.
2010-05-11 10:28:11 -07:00
Jim Miller
f5eaee96b0
am c8212613: am 99dcfe7c: am 4d89954d: am a2757901: Merge "Fix 2660488: Add LockScreen/InCallScreen resources to preloads" into froyo
2010-05-11 10:28:06 -07:00
Keith Ito
a52c85dab1
am 8528fcb1: am a8d8cb12: am be65399b: Merge "Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter" into froyo
2010-05-11 10:26:24 -07:00
Nicolas Roard
bfd6805a82
am 2f68be54: am 373b4913: am f78acacb: Fix the \'wobbling fixed elements\' bug. Cherry-picked from master. This CL has a corresponding C++ counterpart ( https://android-git.corp.google.com/g/#change,51149 )
2010-05-11 10:26:20 -07:00
Dianne Hackborn
217f2686a3
am 7d5cea98: am 7e76b6d1: am 6d00151c: Merge "Hopefully fix issue #2662536 : Why is launcher being killed?" into froyo
2010-05-11 10:26:15 -07:00
Dirk Dougherty
775994e12d
am c5803869: am 02168c41: am 1926c471: Merge "Doc change: Final api diffs 7 -> 8." into froyo
2010-05-11 10:26:11 -07:00
Dirk Dougherty
2ecef59cba
am 0ab047c7: am 769612e1: am b32c2402: Doc change: add toc references to tictactoe sample apps and screen shots.
2010-05-11 10:26:06 -07:00
Jim Miller
c821261345
am 99dcfe7c: am 4d89954d: am a2757901: Merge "Fix 2660488: Add LockScreen/InCallScreen resources to preloads" into froyo
2010-05-11 10:26:00 -07:00
Keith Ito
8528fcb199
am a8d8cb12: am be65399b: Merge "Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter" into froyo
...
Merge commit 'a8d8cb12b3dbe5e196a3ff2549f8594a704ecde4' into kraken
* commit 'a8d8cb12b3dbe5e196a3ff2549f8594a704ecde4':
Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter
2010-05-11 10:24:03 -07:00
Nicolas Roard
2f68be5417
am 373b4913: am f78acacb: Fix the \'wobbling fixed elements\' bug. Cherry-picked from master. This CL has a corresponding C++ counterpart ( https://android-git.corp.google.com/g/#change,51149 )
...
Merge commit '373b4913ab5398736551ab718eb8c39d6f76e5d0' into kraken
* commit '373b4913ab5398736551ab718eb8c39d6f76e5d0':
Fix the 'wobbling fixed elements' bug.
2010-05-11 10:24:00 -07:00
Dianne Hackborn
7d5cea988b
am 7e76b6d1: am 6d00151c: Merge "Hopefully fix issue #2662536 : Why is launcher being killed?" into froyo
...
Merge commit '7e76b6d191e1173bd85337a2861d9914922f5a0d' into kraken
* commit '7e76b6d191e1173bd85337a2861d9914922f5a0d':
Hopefully fix issue #2662536 : Why is launcher being killed?
2010-05-11 10:23:56 -07:00
Dirk Dougherty
c5803869ff
am 02168c41: am 1926c471: Merge "Doc change: Final api diffs 7 -> 8." into froyo
...
Merge commit '02168c41c444e4f601a2809d6d948e4b051b3a3e' into kraken
* commit '02168c41c444e4f601a2809d6d948e4b051b3a3e':
Doc change: Final api diffs 7 -> 8.
2010-05-11 10:23:52 -07:00
Dirk Dougherty
0ab047c732
am 769612e1: am b32c2402: Doc change: add toc references to tictactoe sample apps and screen shots.
...
Merge commit '769612e160c9be01c96371412e12d367e5063e9f' into kraken
* commit '769612e160c9be01c96371412e12d367e5063e9f':
Doc change: add toc references to tictactoe sample apps and screen shots.
2010-05-11 10:23:48 -07:00
Jim Miller
99dcfe7cda
am 4d89954d: am a2757901: Merge "Fix 2660488: Add LockScreen/InCallScreen resources to preloads" into froyo
...
Merge commit '4d89954dc4572a05339dc7a95ec683892558162b' into kraken
* commit '4d89954dc4572a05339dc7a95ec683892558162b':
Fix 2660488: Add LockScreen/InCallScreen resources to preloads
2010-05-11 10:23:42 -07:00
Keith Ito
a8d8cb12b3
am be65399b: Merge "Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter" into froyo
...
Merge commit 'be65399baf23855094596e27c25763ff92e9e027' into froyo-plus-aosp
* commit 'be65399baf23855094596e27c25763ff92e9e027':
Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter
2010-05-11 10:19:06 -07:00
Nicolas Roard
373b4913ab
am f78acacb: Fix the \'wobbling fixed elements\' bug. Cherry-picked from master. This CL has a corresponding C++ counterpart ( https://android-git.corp.google.com/g/#change,51149 )
...
Merge commit 'f78acacb0d7a8e4d9e85a1cd6eed0f6bb38d6776' into froyo-plus-aosp
* commit 'f78acacb0d7a8e4d9e85a1cd6eed0f6bb38d6776':
Fix the 'wobbling fixed elements' bug.
2010-05-11 10:18:59 -07:00
Dianne Hackborn
7e76b6d191
am 6d00151c: Merge "Hopefully fix issue #2662536 : Why is launcher being killed?" into froyo
...
Merge commit '6d00151c519d5c131cc1480978fe4417cc7bcc79' into froyo-plus-aosp
* commit '6d00151c519d5c131cc1480978fe4417cc7bcc79':
Hopefully fix issue #2662536 : Why is launcher being killed?
2010-05-11 10:18:55 -07:00
Dirk Dougherty
02168c41c4
am 1926c471: Merge "Doc change: Final api diffs 7 -> 8." into froyo
...
Merge commit '1926c471a3acde38931f2cbd55415decc9879d2d' into froyo-plus-aosp
* commit '1926c471a3acde38931f2cbd55415decc9879d2d':
Doc change: Final api diffs 7 -> 8.
2010-05-11 10:18:51 -07:00
Dirk Dougherty
769612e160
am b32c2402: Doc change: add toc references to tictactoe sample apps and screen shots.
...
Merge commit 'b32c2402c2b9d58b4f74be62dac6ce2781caec05' into froyo-plus-aosp
* commit 'b32c2402c2b9d58b4f74be62dac6ce2781caec05':
Doc change: add toc references to tictactoe sample apps and screen shots.
2010-05-11 10:18:47 -07:00
Jim Miller
4d89954dc4
am a2757901: Merge "Fix 2660488: Add LockScreen/InCallScreen resources to preloads" into froyo
...
Merge commit 'a27579016caf1438400a3637e3896bec653e3756' into froyo-plus-aosp
* commit 'a27579016caf1438400a3637e3896bec653e3756':
Fix 2660488: Add LockScreen/InCallScreen resources to preloads
2010-05-11 10:18:38 -07:00
Naveen Kalla
0a5174a6e9
Add support for EVDO Rev B
...
Change-Id: I8588e8b342c51f4b79bced8ef8fe60d57f07aefa
2010-05-11 10:12:07 -07:00
Andreas Huber
34c70709a6
Better seek handling and proper reset of the vorbis decoder after a discontinuity (seek)
...
Change-Id: I3c76d35da48e0964f7a0fa2816f8573b5e1a9436
related-to-bug: 2674036
QA-impact: low, only affects ogg-vorbis playback through http
2010-05-11 10:11:55 -07:00
Jeff Hamilton
3d32f6e522
Add Activity.isChangingConfiguration().
...
This allows activities to know if they're being
torn down due to a configuration change.
Bug: 2557550
Change-Id: Ibd9bf5a06c92dbe3789049b84133cf4754381873
2010-05-11 11:48:10 -05:00
Jean-Michel Trivi
aaa01b181c
Merge " Fix bug 2670395 and 2599698 When the user selects a "Silent" notification sound, the Uri encoded path is an empty string. Setting this Uri as the data source of the MediaPlayer used to play notifications caused the completion listener to not be called, which with the AudioFocus logic causes the Music app to pause and never resume. The NotificationPlayer modifications cause the MediaPlayer for the notification to only request audio focus when the data source is not empty. The audio focus code in AudioService is defensively synchronized against a unique lock, and the exception observed in bug 2670395 is explicitely caught in case another edge case wasn't caught by this fix. The AudioFocus handling in AudioManager is modified so only the requestAudioFocus and abandonAudioFocus methods are meant to be used, as registerAudioFocusListener and unregisterAudioFocusListener provided no additional functionality over the request/abandon methods. abandonAudioFocus() also removes the listener from the map in AudioManager since after abandonning focus, the listener would no longer be called." into froyo
2010-05-11 09:42:41 -07:00
Jean-Michel Trivi
392a2bbb52
Fix bug 2670395 and 2599698
...
When the user selects a "Silent" notification sound, the Uri encoded
path is an empty string. Setting this Uri as the data source of the
MediaPlayer used to play notifications caused the completion listener
to not be called, which with the AudioFocus logic causes the Music
app to pause and never resume. The NotificationPlayer modifications
cause the MediaPlayer for the notification to only request audio
focus when the data source is not empty.
The audio focus code in AudioService is defensively synchronized
against a unique lock, and the exception observed in bug 2670395
is explicitely caught in case another edge case wasn't caught by
this fix.
The AudioFocus handling in AudioManager is modified so only the
requestAudioFocus and abandonAudioFocus methods are meant to be
used, as registerAudioFocusListener and unregisterAudioFocusListener
provided no additional functionality over the request/abandon
methods. abandonAudioFocus() also removes the listener from the
map in AudioManager since after abandonning focus, the listener
would no longer be called.
Change-Id: I3b553ee8a8163c25e01117d7e5479dd5fdfa7c6b
2010-05-11 09:20:49 -07:00
Naveen Kalla
24440cf8a9
Support for User to User Signaling (UUS)
...
Enabling passing UUS information during MO and MT calls.
Change-Id: I31621c0a9d3c0607d99d18c49bb6c593cadd0327
2010-05-11 09:19:47 -07:00
Jean-Baptiste Queru
cf1250c149
Merge "Support to display message when operation is blocked due to FDN being enabled"
2010-05-11 09:13:19 -07:00
Naveen Kalla
18573e9281
Support to display message when operation is blocked due to FDN being enabled
...
The terminal disallows USSD, SMS, Voice Call and Supplementary services
operations for numbers not in the Fixed Dialing Number (FDN) list when the
FDN service is enabled. FDN_CHECK_FAILURE error is sent from the RIL and the
message needs to be displayed to indicate the failure.
Change-Id: I49bd63f69a3f0201125b17cd16db2e8fcf93ddc3
2010-05-11 09:12:00 -07:00
Jean-Baptiste Queru
ef2cf71420
Merge "Notify user regarding invalid number during MO call."
2010-05-11 09:08:24 -07:00
Robert Greenwalt
7819e1d72c
Merge "Fix throttle datafile parsing."
2010-05-11 07:38:52 -07:00
Robert Greenwalt
9e3983fbde
Fix throttle datafile parsing.
...
"Optimization" yesterday was buggy.
bug:2674511
Change-Id: I3b1dde35a75b2017117c20905fcd82de405d41b5
2010-05-11 07:31:42 -07:00
Steve Block
52ab0b39fc
Merge webkit.org at r58033 : Update the WebKit UA string and LayoutTest ignore list
...
Change-Id: I620e6da3f7318f329f3401075799e5659cacda82
2010-05-11 14:28:10 +01:00
Mike Lockwood
31ac8e9d56
Add new permission android.permission.ACCESS_USB to allow access to USB devices
...
Change-Id: Ib3dd573a5ef3950d20b21251fe7a3efad56b5c1f
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-05-11 08:29:19 -04:00
Bjorn Bringert
91882c4731
Merge "Added definitions for the ways in which VoiceIME can be started."
2010-05-11 03:23:02 -07:00
Joe Malin
9a5ce6146c
Doc Change: Testing Procedures documents testing_eclipse.html, testing_otheride.html, guide_toc.cs
...
Change-Id: I25cc9f10f4b677ae4ac87e8f23524c395c17955e
Conflicts:
docs/html/guide/guide_toc.cs
2010-05-10 22:36:14 -07:00
Wu-cheng Li
78624e41da
Add remove method in CameraParameters class.
...
bug:2672651
Change-Id: I537c817b5ca6a3d925f22febe9a5769156354d00
2010-05-11 12:54:14 +08:00
Keith Ito
be65399baf
Merge "Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter" into froyo
2010-05-10 20:41:47 -07:00
Mathias Agopian
06d0e59a43
Merge "Build software AGL library with correct get_tls() macro for ARMv7 based platforms"
2010-05-10 20:28:02 -07:00
Mathias Agopian
954cbf5b7f
Merge "Fix glReadPixels() to verify that both x and y are non-negative."
2010-05-10 20:26:24 -07:00
Wu-cheng Li
f0b8679b5d
am 0c3bba3e: am e1b2b3b0: Merge "Add continuous focus mode constant." into kraken
2010-05-10 20:07:54 -07:00
Wu-cheng Li
0c3bba3ee5
am e1b2b3b0: Merge "Add continuous focus mode constant." into kraken
2010-05-10 20:06:04 -07:00
Wu-cheng Li
e1b2b3b0d2
Merge "Add continuous focus mode constant." into kraken
2010-05-10 20:04:14 -07:00
Nicolas Roard
f78acacb0d
Fix the 'wobbling fixed elements' bug.
...
Cherry-picked from master.
This CL has a corresponding C++ counterpart (https://android-git.corp.google.com/g/#change,51149 )
Bug:2665696
Change-Id: I0a044661ff21ef601ba34782db8acdc9531f98e7
2010-05-10 19:31:54 -07:00
Costin Manolache
161c75a0f3
Bug 2673557: rename datamessaging
...
Change-Id: I583ac61c7b8fce69d60801dc76aeca9f13d250b2
2010-05-10 19:12:49 -07:00
Keith Ito
9114a8bb8b
Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter
...
Change-Id: I10b02306478d9c595dbcae0767b44c403d50e24a
2010-05-10 18:27:23 -07:00
Konstantin Lopyrev
6707341b28
Fixing bug 2660263, changed text for PIN unlock
...
Change-Id: I904c7c4753b68195fbd547e97207aa3cceef3c6d
2010-05-10 18:02:31 -07:00
Jamie Gennis
505cef3330
Add incStrong and decStrong methods to android_native_{window,buffer}_t.
...
This change adds the methods necessary to use sp<> to handle refcounting
android_native_window_t and android_native_buffer_t. The new methods forward
the refcounting operations to the corresponding android_native_base_t
functions.
Change-Id: I7de8e262728e439bc1efdf69374a2a9f6f432ced
2010-05-10 17:33:32 -07:00