80357 Commits

Author SHA1 Message Date
Geremy Condra
b4151b296f Merge "DO NOT MERGE Add API for file origin policy." 2012-06-11 16:53:43 -07:00
Dianne Hackborn
0ed6f9a01f am 3430959c: am 569f5bdd: am 37d8ac1b: Merge "SystemServer: Looper\'s getMainLooper to return ServerThread"
* commit '3430959c4dce7ff5e4a8bac2f9e1c3f3a8307079':
  SystemServer: Looper's getMainLooper to return ServerThread
2012-06-11 16:41:24 -07:00
Dianne Hackborn
fdfe58126d am acfb11b7: am 2e479fef: am bb536096: Merge "Improved documentation (clarify on issue 8727)"
* commit 'acfb11b7c49cd0c3e653700f414c014fccc5aec3':
  Improved documentation (clarify on issue 8727)
2012-06-11 16:41:19 -07:00
Wink Saville
702182d340 am e0f8b91e: am 4853f944: am 3fe79dfd: Merge "Adds utility method to convert 0.25 secs to decimal degrees"
* commit 'e0f8b91e049b51770329c43e38aa88ccbb957104':
  Adds utility method to convert 0.25 secs to decimal degrees
2012-06-11 16:41:16 -07:00
Dianne Hackborn
23a947664f am 82b131f2: am f6e39b06: am a03696dc: Merge "ApplicationThread: Check interface before invoking scheduleLowMemory"
* commit '82b131f27418ecdd60d52638a72d01d4ad2b109f':
  ApplicationThread: Check interface before invoking scheduleLowMemory
2012-06-11 16:41:13 -07:00
Wink Saville
f8030e419c am f75e3e01: am c07055c4: am bc69f97c: Merge "Adds documentation to CdmaCellLocation get lat/long methods"
* commit 'f75e3e01f6e574a411fa936e070a7a9f2f606da7':
  Adds documentation to CdmaCellLocation get lat/long methods
2012-06-11 16:41:10 -07:00
Dianne Hackborn
3430959c4d am 569f5bdd: am 37d8ac1b: Merge "SystemServer: Looper\'s getMainLooper to return ServerThread"
* commit '569f5bddd2494bdeae07a6b278f6df6cc8579981':
  SystemServer: Looper's getMainLooper to return ServerThread
2012-06-11 16:36:52 -07:00
Dianne Hackborn
acfb11b7c4 am 2e479fef: am bb536096: Merge "Improved documentation (clarify on issue 8727)"
* commit '2e479fefbfcb388d2aa62978307420357f322441':
  Improved documentation (clarify on issue 8727)
2012-06-11 16:36:49 -07:00
Wink Saville
e0f8b91e04 am 4853f944: am 3fe79dfd: Merge "Adds utility method to convert 0.25 secs to decimal degrees"
* commit '4853f944ac4befba42219f6db8ed02b44a3e0d2b':
  Adds utility method to convert 0.25 secs to decimal degrees
2012-06-11 16:36:46 -07:00
Dianne Hackborn
82b131f274 am f6e39b06: am a03696dc: Merge "ApplicationThread: Check interface before invoking scheduleLowMemory"
* commit 'f6e39b068d1d5491dc3d73d73f598790688a1c4e':
  ApplicationThread: Check interface before invoking scheduleLowMemory
2012-06-11 16:36:42 -07:00
Wink Saville
f75e3e01f6 am c07055c4: am bc69f97c: Merge "Adds documentation to CdmaCellLocation get lat/long methods"
* commit 'c07055c4a6e92a6c82e193c5b87b35d97418a73b':
  Adds documentation to CdmaCellLocation get lat/long methods
2012-06-11 16:36:39 -07:00
Dianne Hackborn
569f5bddd2 am 37d8ac1b: Merge "SystemServer: Looper\'s getMainLooper to return ServerThread"
* commit '37d8ac1b5629e3159c662a0d77503cfe85660d86':
  SystemServer: Looper's getMainLooper to return ServerThread
2012-06-11 16:32:29 -07:00
Dianne Hackborn
2e479fefbf am bb536096: Merge "Improved documentation (clarify on issue 8727)"
* commit 'bb5360966668ca8e97c02363b0d87dc9c9ae2451':
  Improved documentation (clarify on issue 8727)
2012-06-11 16:32:26 -07:00
Wink Saville
4853f944ac am 3fe79dfd: Merge "Adds utility method to convert 0.25 secs to decimal degrees"
* commit '3fe79dfdf4ca63535ec9e586ebed553a862061ea':
  Adds utility method to convert 0.25 secs to decimal degrees
2012-06-11 16:32:23 -07:00
Dianne Hackborn
f6e39b068d am a03696dc: Merge "ApplicationThread: Check interface before invoking scheduleLowMemory"
* commit 'a03696dc6b8128bd44dc700b62ef9b5fd3ac4534':
  ApplicationThread: Check interface before invoking scheduleLowMemory
2012-06-11 16:32:20 -07:00
Wink Saville
c07055c4a6 am bc69f97c: Merge "Adds documentation to CdmaCellLocation get lat/long methods"
* commit 'bc69f97c663ec37aabf8ac4192752ecba0e00200':
  Adds documentation to CdmaCellLocation get lat/long methods
2012-06-11 16:32:17 -07:00
Dianne Hackborn
f9d80b6b94 Merge "Rework media router to be per-context with global process state." into jb-dev 2012-06-11 16:31:55 -07:00
Craig Mautner
0fa77c1e0f Remove over aggressive optimization.
It turns out that sometimes the wallpaper target is migrated to the
bottom of the window stack and then mWallpaperTarget is set to null.
In particular this happens when the launcher all-apps screen is
brought up. When this happens the layer of the wallpaper is
correctly set below the previous wallpaper target.

An optimization in WindowAnimator was keeping the layer update from
propagating to the Surface object. This fix removes that optimization.

Fixes bug 6631717.

Change-Id: I800dd043ce8df83b4e5edbf710503135396bc01e
2012-06-11 16:30:48 -07:00
Craig Mautner
c38869abe5 Revert "Merge errors."
This reverts commit b0419a52008e57475ee254def1da20451da22d4c.
2012-06-11 16:30:48 -07:00
Craig Mautner
a5bbb8987b Merge errors.
Change-Id: I33d0b1aa5dc5018cc879d2e9878e4825adaa4074
2012-06-11 16:30:48 -07:00
Michael Jurka
64dbcd64be Merge "Tweak recents out animation a bit more" into jb-dev 2012-06-11 16:17:35 -07:00
Romain Guy
16c8808525 Textured text calls could be invisible
Bug #6597730

Text would sometimes not appear when rendered with textured content
(BitmapShader, LinearGradientShader, etc.) This was due to a misuse
of OpenGL texture unit in FontRenderer. Textured text normally uses
two texture units:
- texture unit 0 for the font cache
- texture unit 1 for the textured content (gradient, etc.)

Recent changes to the font renderer allow it to bind new textures
while processing the text's geometry (this happens when caches get
full or when switching font size for instance.) The bindings were
done without ensuring the texture unit was the correct one
(unit 0), thus replacing the content of another texture unit
(unit 1).

This lead to text being drawn using the font cache itself as the
content texture, making the text invisible.

Change-Id: I392b4c884f09223305f6cbc6253e2ef9a98944c9
2012-06-11 16:11:56 -07:00
Dianne Hackborn
37d8ac1b56 Merge "SystemServer: Looper's getMainLooper to return ServerThread" 2012-06-11 16:02:34 -07:00
Dianne Hackborn
bb53609666 Merge "Improved documentation (clarify on issue 8727)" 2012-06-11 16:01:38 -07:00
Jeff Brown
519e91ef84 Merge "Detect bad behavior earlier in Choreographer." into jb-dev 2012-06-11 15:59:48 -07:00
Wink Saville
3fe79dfdf4 Merge "Adds utility method to convert 0.25 secs to decimal degrees" 2012-06-11 15:58:26 -07:00
Dianne Hackborn
a03696dc6b Merge "ApplicationThread: Check interface before invoking scheduleLowMemory" 2012-06-11 15:58:22 -07:00
Wink Saville
bc69f97c66 Merge "Adds documentation to CdmaCellLocation get lat/long methods" 2012-06-11 15:57:03 -07:00
Irfan Sheriff
b81bb9b408 Clear interface addresses upon disconnect
Change-Id: I8ce289cfc72babe894ce9f4d0119a2f2ac5f0859
Signed-off-by: Irfan Sheriff <isheriff@google.com>
Signed-off-by: Yoshihiko Ikenaga <yoshihiko.ikenaga@jp.sony.com>
2012-06-11 15:48:50 -07:00
Dianne Hackborn
b58b8f832d Rework media router to be per-context with global process state.
Change-Id: Ic1cb6f13e691d22783bcdafae85b7c75aec0a66f
2012-06-11 15:41:08 -07:00
Jeff Brown
4fdf9c6e2a Detect bad behavior earlier in Choreographer.
Detect wonky vsync timestamps (should they occur) and
warn loudly about them.

Warn when too many frames are skipped.  The threshold is pretty
conservative right now (only warn if at least 30 frames are skipped)
but it can be adjusted using system property.  Even skipping just a
couple of frames is enough to generate noticeable jank.
The threshold is currently intended to help track down bigger problems
such when an app does too much work on the UI thread.

Bug: 6574842
Change-Id: I4aac7e5e17d1fb51adb0510e318a72a28b3775ed
2012-06-11 15:25:48 -07:00
Michael Jurka
c016aaaa42 Tweak recents out animation a bit more
Bug: 6490204

-Fading to black in the recents layer
-Tweaking duration and interpolators
-Removing some unnecessary debug exceptions (Bug: 6642072)

Change-Id: Iba18fade7f874078111fc1d79a81830ee07617d4
2012-06-11 15:23:20 -07:00
Victoria Lease
72b8fc7e6d Merge "Revert "Fix fake bold for fallback fonts in frameworks."" into jb-dev 2012-06-11 15:21:39 -07:00
Adam Powell
fbce66cb25 Merge "Further work on MediaRouter" into jb-dev 2012-06-11 15:00:57 -07:00
Mathias Agopian
60691ce160 make the boot animation 32-bits to avoid banding
Bug: 6611693

Change-Id: Id31b711ea755c89240eaea26f6403a031cd939e4
2012-06-11 14:52:32 -07:00
Victoria Lease
aa0980afab Revert "Fix fake bold for fallback fonts in frameworks."
This reverts commit b26fa0ce68d3311b2fdffb930b27d897e481dd5a
2012-06-11 14:46:04 -07:00
Mathias Agopian
0d8eba64b2 Merge "Enable HW accelerated window shade for all devices" into jb-dev 2012-06-11 14:43:57 -07:00
Jean-Baptiste Queru
5a6b62400c am 21e13d9c: am 237fa190: (-s ours) am 68ecb32e: Merge "stagefright aacenc: Move system headers before local headers"
* commit '21e13d9c7de1c2853eed5d35a74955e1865abfa4':
  stagefright aacenc: Move system headers before local headers
2012-06-11 14:33:53 -07:00
Jean-Baptiste Queru
21e13d9c7d am 237fa190: (-s ours) am 68ecb32e: Merge "stagefright aacenc: Move system headers before local headers"
* commit '237fa1901fee9617e5e8073470bd4fb7a224541f':
  stagefright aacenc: Move system headers before local headers
2012-06-11 14:29:22 -07:00
Jean-Baptiste Queru
237fa1901f am 68ecb32e: Merge "stagefright aacenc: Move system headers before local headers"
* commit '68ecb32eed09e1c6e834269e8f0c248ccb4097cf':
  stagefright aacenc: Move system headers before local headers
2012-06-11 14:18:58 -07:00
Romain Guy
6b5caee490 Merge "Prevent crash in WebView when disabling the hw renderer Bug #6596807" into jb-dev 2012-06-11 14:15:40 -07:00
Svetoslav Ganov
f372e331e4 Merge "NPE when iterating by character and word in Launcher widgets." into jb-dev 2012-06-11 14:06:29 -07:00
Jean-Baptiste Queru
68ecb32eed Merge "stagefright aacenc: Move system headers before local headers" 2012-06-11 14:02:08 -07:00
Martin Storsjo
8606e6b4da stagefright aacenc: Move system headers before local headers
This avoids issues with the encoder's own definition of __inline,
which conflicts with headers brought in by string.h in glibc.

Change-Id: I9e3fbf8d892529940ea67a46e67a9abe71d9c5fa
2012-06-11 23:32:42 +03:00
Romain Guy
527ee91b60 Prevent crash in WebView when disabling the hw renderer
Bug #6596807

A crash would occur in the following situation:
- WebView registers a functor with the hardware renderer
- The hardware renderer gets disabled
- WebView attemps to unregister its functor

Unregistering the functor fails because the hardware renderer is now disabled.
When the renderer becomes enabled again, the functor is invoked, which leads
to a native crash.

This change simply allows functors to always be unregistered, even when the
renderer is disabled. A disabled renderer only means that it will not be used
for rendering; as such, unregistering a functor is a valid operation and
should be allowed.

Change-Id: I0ff897a0cca7e048c609033215cd0f7f5c940bcc
2012-06-11 13:24:30 -07:00
Dianne Hackborn
409d563b51 Merge "DO NOT MERGE: Cherry-pick 2ed524966d3c4bd04ea5f54026ed59558d73cd44 to JB." into jb-dev 2012-06-11 13:20:35 -07:00
Adam Powell
d0d2cda9d4 Further work on MediaRouter
Remove volume control and tracking. This will be handled by extensions
to existing audio and media APIs for now.

Tweak/refine other aspects of the API. Pass the router to callbacks for
easier future-proofing. Add group/ungroup callback methods.

Change-Id: Ib69e76e5f46280a9002b545bcf4cbc7b839844ee
2012-06-11 13:17:44 -07:00
Daniel Sandler
18ac7826ae Put PLMN and SPN on one line in the notification panel.
We now match the keyguard's presentation: either plmn, or
spn, or "plmn|spn" (concatenated with a pipe).

Bug: 6639047
Change-Id: Ia6ae9085fbf2fe9fa4465a6f7825cb997db5e6c5
2012-06-11 16:15:14 -04:00
Craig Mautner
47adf865bd Merge "Fix exposing wallpaper on rotations and other." into jb-dev 2012-06-11 13:10:01 -07:00
Dianne Hackborn
0f6471ace7 Merge "Fix issue #6641368: can't launch gallery" into jb-dev 2012-06-11 13:09:22 -07:00