Merge "SystemServer: Looper's getMainLooper to return ServerThread"
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
Merge "Tweak recents out animation a bit more" into jb-dev
Merge errors.

Change-Id: I33d0b1aa5dc5018cc879d2e9878e4825adaa4074
Revert "Merge errors."

This reverts commit b0419a52008e57475ee254def1da20451da22d4c.
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
Merge "Rework media router to be per-context with global process state." into jb-dev
am bc69f97c: Merge "Adds documentation to CdmaCellLocation get lat/long methods"

* commit 'bc69f97c663ec37aabf8ac4192752ecba0e00200':
  Adds documentation to CdmaCellLocation get lat/long methods
am a03696dc: Merge "ApplicationThread: Check interface before invoking scheduleLowMemory"

* commit 'a03696dc6b8128bd44dc700b62ef9b5fd3ac4534':
  ApplicationThread: Check interface before invoking scheduleLowMemory
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
am bb536096: Merge "Improved documentation (clarify on issue 8727)"

* commit 'bb5360966668ca8e97c02363b0d87dc9c9ae2451':
  Improved documentation (clarify on issue 8727)
am 37d8ac1b: Merge "SystemServer: Looper\'s getMainLooper to return ServerThread"

* commit '37d8ac1b5629e3159c662a0d77503cfe85660d86':
  SystemServer: Looper's getMainLooper to return ServerThread
am c07055c4: am bc69f97c: Merge "Adds documentation to CdmaCellLocation get lat/long methods"

* commit 'c07055c4a6e92a6c82e193c5b87b35d97418a73b':
  Adds documentation to CdmaCellLocation get lat/long methods
am f6e39b06: am a03696dc: Merge "ApplicationThread: Check interface before invoking scheduleLowMemory"

* commit 'f6e39b068d1d5491dc3d73d73f598790688a1c4e':
  ApplicationThread: Check interface before invoking scheduleLowMemory
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
am 2e479fef: am bb536096: Merge "Improved documentation (clarify on issue 8727)"

* commit '2e479fefbfcb388d2aa62978307420357f322441':
  Improved documentation (clarify on issue 8727)
am 569f5bdd: am 37d8ac1b: Merge "SystemServer: Looper\'s getMainLooper to return ServerThread"

* commit '569f5bddd2494bdeae07a6b278f6df6cc8579981':
  SystemServer: Looper's getMainLooper to return ServerThread
Merge "DO NOT MERGE Add API for file origin policy."
Made IAudioService.setBluetoothA2dpOn() not oneway

IAudioService.setBluetoothA2dpOn() should not be one way as
IAudioService.isBluetoothA2dpOn() will return inconsistent results
if called just after.

Bug 6572651.

Change-Id: Ib03ae49e6c0041b1b37dcac9e198cd93a4794030
Merge "Merge errors." into jb-dev