Narayan Kamath
fa8d52fef4
am e02fe5af: am c46d2a2d: Merge "camera2: Clarify the documentation on the ImageReader usecase"
...
automerge: 6ed2140
2015-01-07 18:44:33 +00:00
Narayan Kamath
6ed21403e7
am e02fe5af: am c46d2a2d: Merge "camera2: Clarify the documentation on the ImageReader usecase"
...
* commit 'e02fe5afac0bc792559a4c424ffc8391c501abfe':
camera2: Clarify the documentation on the ImageReader usecase
2015-01-07 18:42:57 +00:00
Martin Storsjo
5c533e4fa0
camera2: Clarify the documentation on the ImageReader usecase
...
Uncompressed JPEG data is an oxymoron. Also mention the other
usecases for ImageReader.
Change-Id: I75261baf162a58c415705db99afa474c3826f900
2015-01-07 20:10:25 +02:00
Ben Murdoch
bc20686f92
am 6a3e7015: am d4bc9577: am 1eee52b1: Merge "Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation." into lmp-mr1-dev
...
* commit '6a3e70159cbbd3c4b7df89165c280ea4f7d56fa5':
Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation.
2015-01-07 16:06:33 +00:00
Ben Murdoch
6a3e70159c
am d4bc9577: am 1eee52b1: Merge "Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation." into lmp-mr1-dev
...
* commit 'd4bc95770ddfcb8be63fa768ac9eaf27512f8107':
Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation.
2015-01-07 16:01:27 +00:00
Ben Murdoch
d4bc95770d
am 1eee52b1: Merge "Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation." into lmp-mr1-dev
...
* commit '1eee52b1aa0ba0cc05ac513d0fa91de9ee643faf':
Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation.
2015-01-07 15:55:12 +00:00
Ben Murdoch
574fa34dd5
Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation.
...
Bug:18072267
Change-Id: I21eec752ca9a0a6c0dab92f3748e687dd13961fa
2015-01-07 15:13:48 +00:00
Paul Miller
4adf212743
am c2a17fff: am a517e81e: Merge "Fix crash on pasting text in a WebView" into lmp-mr1-dev
...
automerge: b5f149e
2015-01-07 01:49:31 +00:00
Paul Miller
b5f149e06e
am c2a17fff: am a517e81e: Merge "Fix crash on pasting text in a WebView" into lmp-mr1-dev
...
* commit 'c2a17fff8579959349e01783aa347b2e2492e0f2':
Fix crash on pasting text in a WebView
2015-01-07 01:43:27 +00:00
Paul Miller
c2a17fff85
am a517e81e: Merge "Fix crash on pasting text in a WebView" into lmp-mr1-dev
...
* commit 'a517e81e2b1594da3e12c0547aabac5f357ce97b':
Fix crash on pasting text in a WebView
2015-01-07 01:17:32 +00:00
Paul Miller
a517e81e2b
Merge "Fix crash on pasting text in a WebView" into lmp-mr1-dev
2015-01-07 01:08:35 +00:00
Amith Yamasani
5c72de4cee
am 442dcb17: am 21735e22: am dcf323ad: Merge "NPE in SearchManager.triggerSearch"
...
* commit '442dcb1761f5f200c12c3f86409f780fbcf20e51':
NPE in SearchManager.triggerSearch
2015-01-07 00:58:04 +00:00
Yin-Chia Yeh
cabe15ac76
am 641178f9: am c2112a75: am 8d46f934: Merge "Camera: doc update for color aberration modes" into lmp-mr1-dev
...
* commit '641178f94fa5561cb5fe2f893f689b7cd568eaa1':
Camera: doc update for color aberration modes
2015-01-07 00:57:59 +00:00
Deepanshu Gupta
b95475404e
resolved conflicts for merge of 20db8770 to master
...
Change-Id: Ifffcf8e2741ec242d940c3ba81244d4df57642fc
2015-01-06 16:41:58 -08:00
Amith Yamasani
442dcb1761
am 21735e22: am dcf323ad: Merge "NPE in SearchManager.triggerSearch"
...
* commit '21735e222e0009b1ddcb080faa5b51117d0da879':
NPE in SearchManager.triggerSearch
2015-01-07 00:17:09 +00:00
Yin-Chia Yeh
641178f94f
am c2112a75: am 8d46f934: Merge "Camera: doc update for color aberration modes" into lmp-mr1-dev
...
* commit 'c2112a75983cce62ed493ec0feafbb2c27ad76b4':
Camera: doc update for color aberration modes
2015-01-07 00:10:51 +00:00
Amith Yamasani
dcf323adaf
Merge "NPE in SearchManager.triggerSearch"
2015-01-07 00:05:11 +00:00
Yin-Chia Yeh
c2112a7598
am 8d46f934: Merge "Camera: doc update for color aberration modes" into lmp-mr1-dev
...
* commit '8d46f934ca56e057182882034d796cc03e960c4d':
Camera: doc update for color aberration modes
2015-01-07 00:04:13 +00:00
Yin-Chia Yeh
8d46f934ca
Merge "Camera: doc update for color aberration modes" into lmp-mr1-dev
2015-01-06 23:59:03 +00:00
Deepanshu Gupta
20db87702b
am e15f580b: am 2bd01ebf: am 7ed14549: am 7081a114: Merge "Add preferences rendering." into lmp-dev
...
* commit 'e15f580b9d7a555bff96efd3cec195b39637e679':
Add preferences rendering.
2015-01-06 22:36:21 +00:00
Deepanshu Gupta
e15f580b9d
am 2bd01ebf: am 7ed14549: am 7081a114: Merge "Add preferences rendering." into lmp-dev
...
* commit '2bd01ebfa99815d4fb6b4e77754146a22cf66d03':
Add preferences rendering.
2015-01-06 22:29:17 +00:00
Deepanshu Gupta
2bd01ebfa9
am 7ed14549: am 7081a114: Merge "Add preferences rendering." into lmp-dev
...
* commit '7ed145493d3f5bea32c567980f77cc42f613197e':
Add preferences rendering.
2015-01-06 22:22:36 +00:00
Paul Jensen
3e50161a6e
am 932bfab9: am 6c93739f: am 9ffb53cb: Clear process DNS NetID binding when expiring or releaseing legacy requests.
...
* commit '932bfab9aaa58f116935eb0a1f22de49301724c4':
Clear process DNS NetID binding when expiring or releaseing legacy requests.
2015-01-06 20:09:18 +00:00
Paul Miller
f6bf1d7b30
Fix crash on pasting text in a WebView
...
WindowDecorActionBar and Chrome's ContentViewCore each have their own ActionMode
reference. ActionModeImpl.finish() nulls WindowDecorActionBar's reference and
calls mCallback.onDestroyActionMode() to null ContentViewCore's reference. But
if the callback is deferred, there is a period when the ActionMode is finished
(and mCallback is null), but ContentViewCore doesn't know. ContentViewCore may
try to invalidate() the ActionMode, which will crash on the null mCallback.
Make ActionModeImpl more permissive so that calling invalidate() during this
period does nothing.
BUG:18758329
Change-Id: I407fa0e0cd3cffa217e165caed83130d44760316
2015-01-06 11:32:02 -08:00
Alan Viverette
304ea5aac7
Merge "Allow use of theme attributes in color state lists"
2015-01-06 18:47:29 +00:00
Yin-Chia Yeh
941aac0c07
Camera: doc update for color aberration modes
...
Code-gened document update for camera2 spec.
Bug: 18915494
Change-Id: I4b6236415f93739da4562eac81f53d2fd4c10f69
2015-01-06 18:46:15 +00:00
Paul Jensen
932bfab9aa
am 6c93739f: am 9ffb53cb: Clear process DNS NetID binding when expiring or releaseing legacy requests.
...
* commit '6c93739f2f25c8afb77997165fa86be537df67a9':
Clear process DNS NetID binding when expiring or releaseing legacy requests.
2015-01-06 14:57:44 +00:00
Paul Jensen
6c93739f2f
am 9ffb53cb: Clear process DNS NetID binding when expiring or releaseing legacy requests.
...
* commit '9ffb53cb1131eeac5c246e7378455bb4b64293f5':
Clear process DNS NetID binding when expiring or releaseing legacy requests.
2015-01-06 14:49:09 +00:00
Paul Jensen
9ffb53cb11
Clear process DNS NetID binding when expiring or releaseing legacy requests.
...
When requests made by ConnectivityManager.startUsingNetworkFeature() are
expired or are canceled via ConnectivityManager.stopUsingNetworkFeature(),
we must remember to clear the binding of DNS requests from the calling
process to the Network satisfying the request.
bug:18778725
Change-Id: I800c808ac6486000241b5d263aa79a1192a9fe9e
2015-01-06 09:43:04 -05:00
Deepanshu Gupta
02cab444fb
am 9c8f8ed8: am 4a5baeae: Merge "resolved conflicts for a0bc2e7e to lmp-mr1-dev" into lmp-mr1-dev
...
automerge: f4d3973a0bc2e7e
2015-01-05 23:39:03 +00:00
Deepanshu Gupta
f4d3973c31
am 9c8f8ed8: am 4a5baeae: Merge "resolved conflicts for a0bc2e7e to lmp-mr1-dev" into lmp-mr1-dev
...
* commit '9c8f8ed8a8bee42ee48a27b055b11ace6255d09a':
resolved conflicts for a0bc2e7e
2015-01-05 23:36:57 +00:00
Deepanshu Gupta
7ed145493d
am 7081a114: Merge "Add preferences rendering." into lmp-dev
...
* commit '7081a114d4ee190c746f337057b0f84928c162dd':
Add preferences rendering.
2015-01-05 23:32:53 +00:00
Chris Craik
a609028451
Merge "Make DisplayListRenderer inherit from Canvas, merge JNI"
2015-01-05 23:31:30 +00:00
Deepanshu Gupta
9c8f8ed8a8
am 4a5baeae: Merge "resolved conflicts for a0bc2e7e to lmp-mr1-dev" into lmp-mr1-dev
...
* commit '4a5baeaec9294dbb43fe3b36a44b3176101756b6':
resolved conflicts for a0bc2e7e
2015-01-05 23:30:18 +00:00
Deepanshu Gupta
4a5baeaec9
Merge "resolved conflicts for a0bc2e7e to lmp-mr1-dev" into lmp-mr1-dev
2015-01-05 23:26:04 +00:00
Tom Hudson
8dfaa49042
Make DisplayListRenderer inherit from Canvas, merge JNI
...
Incrementally unify the upper layers for Skia and HWUI.
Remove redundant code from GLES20Canvas.java; instead
use inherited mNativeCanvasWrapper and superclass method
definitions.
Moves some unrelated SkPaint utility functions from Renderer
to new utils/PaintUtils.
bug: 15672762
Change-Id: I4ddd4214b8e9eeb95289d054ef423f2542bb5fa5
2015-01-05 15:25:41 -08:00
Dianne Hackborn
5f86b66c9b
am 24bc8d76: am 29807195: Merge "Fix issue #18901214 : APR: Frequent crash in android" into lmp-mr1-dev
...
automerge: d17218e#18901214 : APR: Frequent crash in android
2015-01-05 23:16:42 +00:00
Dianne Hackborn
d17218e7df
am 24bc8d76: am 29807195: Merge "Fix issue #18901214 : APR: Frequent crash in android" into lmp-mr1-dev
...
* commit '24bc8d761ae525f82dcaeee576ae238ab3a2de03':
Fix issue #18901214 : APR: Frequent crash in android
2015-01-05 23:15:10 +00:00
Dianne Hackborn
24bc8d761a
am 29807195: Merge "Fix issue #18901214 : APR: Frequent crash in android" into lmp-mr1-dev
...
* commit '298071951210ae23c8023c4dc8f82da5d1760211':
Fix issue #18901214 : APR: Frequent crash in android
2015-01-05 23:09:07 +00:00
Dianne Hackborn
2980719512
Merge "Fix issue #18901214 : APR: Frequent crash in android" into lmp-mr1-dev
2015-01-05 23:03:48 +00:00
Alan Viverette
45c4bbbbce
Allow use of theme attributes in color state lists
...
BUG: 17384842
Change-Id: Ibdc413acbd00e37b908432abd55f6521c22b8fc9
2015-01-05 14:59:19 -08:00
Filip Gruszczynski
2b37034c57
am 8117eda6: am 8c6b59f4: Merge "Add system api for disabling touch events in wallpaper behind the window." into lmp-mr1-dev
...
automerge: 62ab1ca
2015-01-05 22:59:09 +00:00
Filip Gruszczynski
62ab1caa38
am 8117eda6: am 8c6b59f4: Merge "Add system api for disabling touch events in wallpaper behind the window." into lmp-mr1-dev
...
* commit '8117eda6f18a4d388a12ab0af318c95b86280084':
Add system api for disabling touch events in wallpaper behind the window.
2015-01-05 22:56:09 +00:00
Filip Gruszczynski
8117eda6f1
am 8c6b59f4: Merge "Add system api for disabling touch events in wallpaper behind the window." into lmp-mr1-dev
...
* commit '8c6b59f46da3e65ce157fe40a08f1c1fbba3e1c2':
Add system api for disabling touch events in wallpaper behind the window.
2015-01-05 22:50:29 +00:00
Filip Gruszczynski
8c6b59f46d
Merge "Add system api for disabling touch events in wallpaper behind the window." into lmp-mr1-dev
2015-01-05 22:46:14 +00:00
Dianne Hackborn
b182955a1e
Fix issue #18901214 : APR: Frequent crash in android
...
The ShutdownActivity was implemented in the system server
code, which is no longer part of the boot class path. This would
work fine when requesting a shutdown from the primary user, since
in that case the activity would be loaded in to the main system
process which also has the system service code loaded.
However, when executed from a secondary user, we need to spin up
a new system process for it; that system process is just a regular
app process, without the system service code, so *boom*.
To fix this, move ShutdownActivity to the framework jar.
Change-Id: Icb831cd6ed619da5feede5605c45ef177a892fbc
2015-01-05 14:40:24 -08:00
Alan Viverette
8a3323adc8
am bde76419: am 1f3f47b3: Merge "Avoid double-translating View background" into lmp-mr1-dev
...
automerge: 4d41e49
2015-01-05 22:40:24 +00:00
Alan Viverette
4d41e49f39
am bde76419: am 1f3f47b3: Merge "Avoid double-translating View background" into lmp-mr1-dev
...
* commit 'bde76419c1c30aa574f8bc7b3f09f2029e080b83':
Avoid double-translating View background
2015-01-05 22:38:57 +00:00
Alan Viverette
bde76419c1
am 1f3f47b3: Merge "Avoid double-translating View background" into lmp-mr1-dev
...
* commit '1f3f47b3680547dbb764db173e02d833e12d65a2':
Avoid double-translating View background
2015-01-05 22:32:10 +00:00
Alan Viverette
1f3f47b368
Merge "Avoid double-translating View background" into lmp-mr1-dev
2015-01-05 22:26:54 +00:00
