55407 Commits

Author SHA1 Message Date
Jamie Gennis
e333d3c824 SurfaceMediaSource: remove getAllocator method
This change removes the getAllocator method from SurfaceMediaSource
because that method is no longer a part of the ISurfaceTexture
interface.

Change-Id: I0e2f0bc3bc1c8cd3c1b4b14246f07b9b4e3066c3
2011-07-22 14:02:09 -07:00
Adam Powell
894bf54c0f Fix bug 5027071 - Action menu parent consistency
Make sure that action menus can tolerate moving around in the bar.

Change-Id: I2dfb4ea7e647a6c4e84ec78865af6fd858e3f59f
2011-07-22 13:39:47 -07:00
Jamie Gennis
95b4042285 Merge changes I799532f7,I5cffa6eb
* changes:
  SurfaceTexture: fix a comment
  SurfaceTexture: remove getAllocator
2011-07-22 13:34:57 -07:00
Robert Greenwalt
6dcf2d7776 am 19933916: am ad55d351: Add better routes for secondary DNS
* commit '199339169476d0d6d0ecaa8ed3bff3a9e9a0f430':
  Add better routes for secondary DNS
2011-07-22 13:17:54 -07:00
Robert Greenwalt
1993391694 am ad55d351: Add better routes for secondary DNS
* commit 'ad55d35114237071133eb28ded93a014185d4e35':
  Add better routes for secondary DNS
2011-07-22 13:15:56 -07:00
Robert Greenwalt
ad55d35114 Add better routes for secondary DNS
We'd been doing no-gateway hostroutes for dns servers on secondary nets, but on
some devices (multi-homed stingray) this is a problem.  Add gateway-ed hostroutes
instead so the BP can do it's nonstandard "magical" demultiplexing.

bug:5011392
Change-Id: Ia48f69c8ddf2a37cfb8f014f078f96bf601d2ddb
2011-07-22 12:52:21 -07:00
Adam Cohen
06d6c1d228 Merge "Fixing new minResizeWidth/Height API" 2011-07-22 12:27:37 -07:00
Adam Cohen
324afba161 Fixing new minResizeWidth/Height API
Change-Id: I6b57cca32ed7678597e7c0d81dc483ee294537a9
2011-07-22 12:08:55 -07:00
Pannag Sanketi
38eea1b800 Merge "Renaming SurfaceEncoder to SurfaceMediaSource" 2011-07-22 11:49:36 -07:00
Pannag Sanketi
67d7704bd2 Merge "Adding SurfaceEncoder for encoding FilterFrames" 2011-07-22 11:49:21 -07:00
James Dong
3ff98beeaf Deprecate two methods in MediaRecorder.java class
Change-Id: I98fbe628fe77867b97c04f44458948ede2f49d22
2011-07-22 11:45:50 -07:00
Irfan Sheriff
dce720f194 Merge "Fixing WifiWatchdog log flag" 2011-07-22 11:20:14 -07:00
Dianne Hackborn
460418eb35 Merge "Fix issue #5054723: java.lang.NullPointerException at..." 2011-07-22 11:07:22 -07:00
Dianne Hackborn
c693823fd4 Fix issue #5054723: java.lang.NullPointerException at...
...android.app.FragmentManagerImpl.execPendingActions(FragmentManager.java:1284)

Make sure to commit all pending actions before completing the destroy.

Change-Id: I85643e5f7b1221048523bd186b48fb88fc70ca23
2011-07-22 11:05:20 -07:00
Eric Laurent
35f0837325 Merge "Fix issue 4988574: 8 bit PCM audio playback broken." 2011-07-22 11:04:07 -07:00
Dianne Hackborn
8cbe6e9cef Merge "Fix issue #5050039: Launcher is sometimes rendering..." 2011-07-22 10:52:34 -07:00
Dianne Hackborn
91c9ac05ef Fix issue #5050039: Launcher is sometimes rendering...
...underneath the system/status bar

Change-Id: If65aba64df9362d4721051846a6da6d096a3dc9b
2011-07-22 10:41:38 -07:00
Daniel Sandler
423f0ed494 Merge "Disable the number bubble overlay on notification icons." 2011-07-22 10:34:13 -07:00
Isaac Levy
e046975503 Fixing WifiWatchdog log flag
Accidentally merged verbose logging - setting to false.

Change-Id: I6cd9321c7602d86aac4a8340ef0233310a665bd9
2011-07-22 10:26:45 -07:00
Andreas Huber
2395092029 Merge "Retry datasource fetches a few times before giving up (NuCachedSource2)." 2011-07-22 10:25:24 -07:00
Jesse Wilson
da857bd9df Merge "Fix benign off-by-one in JsonReader." 2011-07-22 10:21:30 -07:00
James Dong
8a42a55720 Merge "Log setVideoSurface() and setVideoSurfaceTexture() failures." 2011-07-22 10:09:22 -07:00
Daniel Sandler
af084803c6 Disable the number bubble overlay on notification icons.
Bug: 5042009
Change-Id: I3c69367de95624d723830bc58c9cbaeb025bf916
2011-07-22 13:02:07 -04:00
Alex Sakhartchouk
2c38bfe388 Merge "Fixing bitmap invalidation bug." 2011-07-22 09:52:27 -07:00
Gilles Debunne
d3bb7893fb Merge "Minor dash typos in documentation" 2011-07-22 09:24:31 -07:00
Jesse Wilson
d1ad3c2c3a Fix benign off-by-one in JsonReader.
The bug would have caused us to call fillBuffer() earlier than
necessary.

Change-Id: Ib0e4e54019394d7085913faf90c495d130e8bb75
2011-07-22 09:01:48 -07:00
Andreas Huber
178e8eb5dd Retry datasource fetches a few times before giving up (NuCachedSource2).
Change-Id: I147fc18ef55bc89d2e2fee69b7869c45abbfdd6b
related-to-bug: 3405354
2011-07-22 08:17:41 -07:00
Daisuke Miyakawa
40c4321df4 Merge "Introduce hidden API Contacts.CONTENT_FREQUENT_URI" 2011-07-22 08:05:55 -07:00
Kristian Monsen
3192e397af Fix for bug 5049763 HLS: Cookies set in main playlist request aren't being passed to subsequent HTTP requests
Cookies should be store between requests in memory with this.

Tell me if you want to store the cookies on disk as well.

Change-Id: I9afe5796a3d395afcf54d669c86cf7da432f8d9a
2011-07-22 14:11:31 +01:00
satok
3263f02b3e Merge "Delay load the settings for the ongoing ime swither" 2011-07-22 04:11:49 -07:00
satok
b858c732f6 Delay load the settings for the ongoing ime swither
Bug: 5029803
Change-Id: I488ff7804a986b71bf01b3dfad0e65fd4707965d
2011-07-22 19:54:34 +09:00
satok
3de3d6ad58 Fix the vendor build.
Change-Id: I856057c9418fd5194d78e34c4496bd43c520546f
2011-07-22 15:50:22 +09:00
satok
7793719ca9 Merge "Create TextServiceManager and SpellCheckerService" 2011-07-21 22:59:48 -07:00
satok
988323c57b Create TextServiceManager and SpellCheckerService
Bug: 4176026

This CL inherits https://android-git.corp.google.com/g/112600

Spec of TextServiceManager
- Chooses the most applicable TextService(e.g. SpellCheckerService, WordBreakIteratorService..)
    for each locale

Spec of SpellCheckerService
- Returns whether the given string is a correct word or not
- Returns Suggestions for the given string

Change-Id: Iaa425c7915fe70767ad0b17bf6c6fbcd2a1200b2
2011-07-22 14:52:21 +09:00
Dianne Hackborn
20bf46af14 am b0878223: am 6800a801: Merge "frameworks/base: Cap the number of toasts that a package can post."
* commit 'b0878223db87700cdc988a6d9197ca4e3c4772db':
  frameworks/base: Cap the number of toasts that a package can post.
2011-07-21 22:37:13 -07:00
Dianne Hackborn
b0878223db am 6800a801: Merge "frameworks/base: Cap the number of toasts that a package can post."
* commit '6800a80199477c90fc64af7211a177de06478a02':
  frameworks/base: Cap the number of toasts that a package can post.
2011-07-21 22:35:32 -07:00
Dianne Hackborn
9ce1ecdfde am 1a2fcea1: am 2f4698fd: Merge "frameworks/base: unlink death notifications of Vibrate requests"
* commit '1a2fcea1a28074f15126471daa5a8650cb5e2ecc':
  frameworks/base: unlink death notifications of Vibrate requests
2011-07-21 22:26:20 -07:00
Dianne Hackborn
1a2fcea1a2 am 2f4698fd: Merge "frameworks/base: unlink death notifications of Vibrate requests"
* commit '2f4698fda46a3d2a6e78019588d77bae1cfa7193':
  frameworks/base: unlink death notifications of Vibrate requests
2011-07-21 22:23:46 -07:00
Dianne Hackborn
6800a80199 Merge "frameworks/base: Cap the number of toasts that a package can post." 2011-07-21 22:21:19 -07:00
Dianne Hackborn
2f4698fda4 Merge "frameworks/base: unlink death notifications of Vibrate requests" 2011-07-21 22:18:47 -07:00
Dianne Hackborn
4ac052688a Merge "Fix issue #5061083: Handler.removeCallbacksAndMessages..." 2011-07-21 21:53:19 -07:00
Eric Laurent
095086111f Fix issue 4988574: 8 bit PCM audio playback broken.
Fixed regression in audio track control block frame size
calculation introduced by commit c310dcb.

Change-Id: Ia731b946ae4e43316b98d80229e3b08a696e47d6
2011-07-21 21:00:46 -07:00
Mathias Agopian
672a05f0cf Merge "Fix a few issues with NATIVE_WINDOW_TRANSFORM_HINT" 2011-07-21 20:34:47 -07:00
Michael Jurka
e224d4f0b7 Merge "Prevent notification swipes from getting canceled too soon." 2011-07-21 19:57:54 -07:00
Daniel Sandler
521efd8886 Prevent notification swipes from getting canceled too soon.
The scroll view was grabbing the gesture as soon as its dy
crossed the scroller's own slop threshold. Once we detect a
horizontal swipe-to-clear we request that the scroller no
longer activate until the gesture is over.

Bug: 4998677
Change-Id: If916fc00d155516e0e4bfe8c2df19827a2f16fe6
2011-07-21 22:37:09 -04:00
Adam Powell
6c8519cf40 Merge "Fix bug 5037537 - Revert "ListView focus bugfix."" 2011-07-21 19:33:26 -07:00
Daniel Sandler
44b578aa4a Merge "Subtract the navbar's bounds from fullscreen windows." 2011-07-21 19:05:35 -07:00
Svetoslav Ganov
610d1f1fae DO NOT MERGE AccessibilityInjectorTest did not restore the default key binsings.
CHERRY PICK FROM MASTER

1. AccessibilityInjectorTest changes the key bindings and when done
   restores the defatult ones. The restoreation was not working.

bug:4905620

Change-Id: I812bad0b748637ded0ce69ace12517511f62f726
2011-07-21 18:53:47 -07:00
Dianne Hackborn
78ede2c898 Merge "Move status bar above keyguard." 2011-07-21 18:51:45 -07:00
JP Abgrall
b6055fe747 Merge "NetworkManagementService: receive bandwidth controller events" 2011-07-21 18:44:52 -07:00