drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,949 Commits 1 Branch 0 Tags
Commit Graph

58949 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Huber
2378341174 Support multiple NAL fragments per .mkv payload 
Apparently the payload for an h.264 track in an .mkv file can contain multiple
NAL fragments, we used to discard everything after the first one before, now
we preserve them all.

Change-Id: Ic7187365309f3880a3256982879a45df50db697d
related-to-bug: 5337218
 2011-09-28 15:06:46 -07:00
Andreas Huber
781ae92f11 Merge "Support AMR, G.711 and vorbis audio in ACodec and friends." 2011-09-28 13:13:33 -07:00
Xia Wang
0a6cd02b48 am b2d17234: Merge "Reorganize media framework functional tests. Group tests into sub-packages" into ics-factoryrom 
* commit 'b2d17234b77cda555905e0da997f543708374246':
  Reorganize media framework functional tests. Group tests into sub-packages
 2011-09-28 12:40:07 -07:00
Xia Wang
b2d17234b7 Merge "Reorganize media framework functional tests. Group tests into sub-packages" into ics-factoryrom 2011-09-28 12:38:15 -07:00
Andreas Huber
3e408f39ef Support AMR, G.711 and vorbis audio in ACodec and friends. 
Change-Id: I08c03219bf2d60fc5c6e89957bd4b4c615570983
 2011-09-28 12:37:36 -07:00
Fred Quintana
40047fa14d am 272101b3: Merge "Fix a bug in the account chooser where relaunching an in-progress flow results in a blank screen." into ics-factoryrom 
* commit '272101b308c7eb0a4639bed0106830a8d6b0f2a1':
  Fix a bug in the account chooser where relaunching an in-progress flow results in a blank screen.
 2011-09-28 11:47:46 -07:00
Fred Quintana
272101b308 Merge "Fix a bug in the account chooser where relaunching an in-progress flow results in a blank screen." into ics-factoryrom 2011-09-28 11:45:52 -07:00
John Reck
55b039f1b7 Merge "Support for correctly scaling text selection handles" 2011-09-28 11:11:57 -07:00
Steve Block
0a20d6a4c3 Merge "Always call WebView.onPageStarted(), regardless of whether a WebViewClient has been set" 2011-09-28 10:11:55 -07:00
Elliott Hughes
87e12b05f1 Merge "Add ICS-specific notes to the JNI tips documentation." 2011-09-28 09:56:11 -07:00
Marco Nelissen
8df38890d4 Merge "Log a warning when a MediaPlayer is finalized without having being released. b/5382634" 2011-09-28 09:41:12 -07:00
Marco Nelissen
8dc208476f Log a warning when a MediaPlayer is finalized without having being released. 
b/5382634

Change-Id: I756d09d16a92ab8ce736c16a24e319a87be6c8de
 2011-09-28 09:21:11 -07:00
Brian Colonna
9a3d51ed10 Merge "Added landscape views for Face Unlock" 2011-09-28 06:13:53 -07:00
Brian Colonna
0c66f05267 Merge "Fix 5323545 - FaceLock no longer appears when taking a call" 2011-09-28 06:13:44 -07:00
Chih-Chung Chang
d83baa4ef3 Merge "Fix 5158468: Update floating window size when the anchor view size changes." 2011-09-28 04:48:06 -07:00
Flavio Lerda
d0bc6afbbd Merge "Do not format numbers starting with hash or star." 2011-09-28 04:38:00 -07:00
Chih-Chung Chang
85d4ea6fe4 Fix 5158468: Update floating window size when the anchor view size changes. 
Originally when surfaceChanged() happens, we remove the old window and
create a new window. This causes flickering. Now we just update the window
layout according to the size of the anchor view.

Change-Id: Id741dac07872e473f2c9829b626c5c9568e7e22d
 2011-09-28 18:00:29 +08:00
Steve Block
aae19fb90c Merge "Hook up WebView.clearSslPreferences() for the Chromium HTTP stack" 2011-09-28 02:45:28 -07:00
Steve Block
a0d767c822 Always call WebView.onPageStarted(), regardless of whether a WebViewClient has been set 
This makes sure that the page's SSL certificate is cleared when the page load
starts.

Follows on from https://android-git.corp.google.com/g/#/c/138147.

Bug: 5287216
Change-Id: I40f74a72dc495c48d7167b7b70a845a8481feb85
 2011-09-28 10:44:11 +01:00
Kristian Monsen
d9151bf1cc Hook up WebView.clearSslPreferences() for the Chromium HTTP stack 
Note that this is an incomplete fix, as we do not clear the responses for
connections currently in use, as they maintain their own cache. See
http:/b/5324235.

Bug: 5287216
Change-Id: I18f6638efeff0bee1e7ffed606be1444d683bebd
 2011-09-28 10:44:11 +01:00
Mathew Inwood
d0e8fb431a Merge "Document thrown IllegalArgumentException." 2011-09-28 01:20:04 -07:00
John Reck
1cfe8ddf62 Support for correctly scaling text selection handles 
Bug: 5367280

Change-Id: If32fdc9cd82d1a66bc96446a123c44d9edd9d340
 2011-09-27 20:14:39 -07:00
Fabrice Di Meglio
8f0bb4bc17 Merge "Fix bug # 5376028 Arabic text is kinda broken - disappearing glyphs" 2011-09-27 18:45:57 -07:00
Guang Zhu
25438e2199 Merge "Use CPU upload path in DRT" 2011-09-27 18:27:36 -07:00
Guang Zhu
ef4d25c885 Use CPU upload path in DRT 
This makes it the same as default browser settings (for now). Otherwise
the test may crash due to GPU OOM.

This is to be a workaround only, and should be reverted after the bug is
fixed.

Bug: 5382134

Change-Id: I82a8dd83b69c8fceb657af9e32a2c5fa66ead2ce
 2011-09-27 18:23:10 -07:00
Romain Guy
816b776be1 Merge "Add a bit more doc to TextureView" 2011-09-27 17:45:46 -07:00
Romain Guy
462785fa25 Add a bit more doc to TextureView 
Change-Id: Ib76c80d8f70ede1bb63db319bca1e93c489def4d
 2011-09-27 17:42:10 -07:00
Fred Quintana
9bbdd0bf50 Fix a bug in the account chooser where relaunching an in-progress flow 
results in a blank screen.

The fix involves making the first activity just call the account
type chooser to get the account type to add, rather than having
the account type chooser also kick off the AccountManager.addAccount()
request itself. Instead the first activity will get the type
back and then call AccountManager.addAccount()

Bug: 5346810
Change-Id: I4a0cf2370971b98f8ee0910f5401d97e999e546b
 2011-09-27 17:24:32 -07:00
Romain Guy
fd9932d153 am 0e8fb15d: (-s ours) CherryPick 043a6b from master: do not merge. 
* commit '0e8fb15da2bd0912aa74ba6709dfe3d5b7c84fde':
  CherryPick 043a6b from master: do not merge.
 2011-09-27 16:44:28 -07:00
Jesse Wilson
70980383de Merge "Test to demonstrate NPE in DefaultRequestDirector" 2011-09-27 16:31:10 -07:00
Jesse Wilson
de5d7d2508 Test to demonstrate NPE in DefaultRequestDirector 
When the HTTP client encountered a server failure while
talking through a proxy, it fails with an NullPointerException
and not an IOException.

Change-Id: I4b287105bf78b832d034557e37e74ce576c7894d
Bug: http://b/5372438
 2011-09-27 19:28:32 -04:00
Elliott Hughes
868d74eb3f Add ICS-specific notes to the JNI tips documentation. 
Change-Id: I9be8f2452063363d9f2b6c28b5a2eacac09308a1
 2011-09-27 16:27:31 -07:00
Xia Wang
db6028508c Reorganize media framework functional tests. 
Group tests into sub-packages

Change-Id: I878e14487142de495fc646037d5d0b51e39341bd
 2011-09-27 16:00:20 -07:00
Romain Guy
0e8fb15da2 CherryPick 043a6b from master: do not merge. 
Don't use OpenGL ES 2.0 to render the wallpaper on the emulator.
Bug #5352896

The emulator doesn't support OpenGL ES 2.0.

Change-Id: I3d60f8e4b5c5431e9e21471c576f4a9382f4693f
 2011-09-27 15:59:53 -07:00
Xavier Ducrohet
05aa1fef93 Merge "Don't use OpenGL ES 2.0 to render the wallpaper on the emulator. Bug #5352896" 2011-09-27 15:47:55 -07:00
Romain Guy
043a6b1e57 Don't use OpenGL ES 2.0 to render the wallpaper on the emulator. 
Bug #5352896

The emulator doesn't support OpenGL ES 2.0.

Change-Id: I7f647d78d4d8ad87d12a5f009d5d37f6aeaecf72
 2011-09-27 15:37:54 -07:00
Andreas Huber
d4fb497cf4 Merge "Cut down on AwesomePlayer and OMXCodec's verbosity." 2011-09-27 15:26:43 -07:00
Peter Ng
f7def66480 Merge "Lockscreen handle is now a locked icon and not an unlocked" 2011-09-27 15:07:39 -07:00
Andreas Huber
262d7e8e21 Cut down on AwesomePlayer and OMXCodec's verbosity. 
Change-Id: Ifd95717e8ea0fb0327099b16d72a6ed58c7c9924
related-to-bug: 5382014
 2011-09-27 15:07:36 -07:00
Peter Ng
6cf2c642b6 Lockscreen handle is now a locked icon and not an unlocked 
Bug: 5231211
Change-Id: I4ee84d142d972c42ec5f28ed921a2edadf11adf7
 2011-09-27 14:55:51 -07:00
Eric Fischer
9ee0865ac3 am ce9756d0: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom 
* commit 'ce9756d06dd8aebb7b92879ab3b02bbe8f290992':
  Import revised translations.  DO NOT MERGE
 2011-09-27 14:55:44 -07:00
Eric Fischer
ce9756d06d Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom 2011-09-27 14:54:12 -07:00
Scott Main
4c08848538 Merge "docs: mix of BT and NFC javadoc updates Add Health profile to various discussions about profiles Add descriptions to NFC interfaces, tweak some desciptions, and fix some broken links" 2011-09-27 14:49:12 -07:00
Brian Colonna
982813c3df Added landscape views for Face Unlock 
- Uses grid view to cover PIN/pattern area in the same way it does
  for potrait layouts

Change-Id: I64672f3052c136901850baf73c8242930df7a64f
 2011-09-27 17:38:22 -04:00
Eric Fischer
006e6ef2e6 Import revised translations. DO NOT MERGE 
Change-Id: Ifb1966956dcc9fe4e082708bb3fb30d5224308e7
 2011-09-27 14:29:36 -07:00
Jamie Gennis
feb158b3cb Merge changes Ib302d79e,Ib4ee085f 
* changes:
  SurfaceFlinger: set layer names on SurfaceTextures
  SurfaceTexture: add name support
 2011-09-27 14:24:09 -07:00
Eric Laurent
ab7ed38d5f Merge "Fix issue 5373658: memory leak in AudioFlinger." 2011-09-27 14:07:45 -07:00
Scott Main
2d68a6ba3c docs: mix of BT and NFC javadoc updates 
Add Health profile to various discussions about profiles
Add descriptions to NFC interfaces, tweak some desciptions, and fix some broken links

Change-Id: Ib89434c78a4ad60b4358dca9a6c335451d1c4125
 2011-09-27 14:04:48 -07:00
Andreas Huber
d33b3881f7 Merge "Signal an appropriate error even if there are no active streams yet." 2011-09-27 13:36:22 -07:00
Alon Albert
553e547420 Merge "Add Detailed Sync Stats Section Also improve history formatting Here's a smaple of what it looks like:" 2011-09-27 13:29:11 -07:00