Adrian Roos
0c92c858b0
am 51a400eb: Merge "Clear FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS for dreams" into lmp-dev
...
* commit '51a400eb440c89fb06a47371bb7b026f00edb09c':
Clear FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS for dreams
2014-09-29 20:48:00 +00:00
Paul Jensen
a621a97f4a
am 89e0f093: Move mobile provisioning APN support into telephony.
...
* commit '89e0f0937a70d73b5ed188c9337b4d33860e5573':
Move mobile provisioning APN support into telephony.
2014-09-29 20:47:32 +00:00
Adrian Roos
9d38f35a8f
Clear FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS for dreams
...
By default, dreams should not get the in-window bars
because those conflict with the lights-out bar mode.
Bug: 17367264
Change-Id: I8c041c706f7a7c4791ed4760c34a5618fb7423d7
2014-09-29 15:48:46 +02:00
Paul Jensen
89e0f0937a
Move mobile provisioning APN support into telephony.
...
Most of this logic is simply removed from ConnectivityService.
The captive portal detection is now done by the NetworkMonitor.
The notification logic is still left in ConnectivityService as
it's used by both the NetworkMonitor and telephony's mobile
provisioning logic.
bug:17324098
Change-Id: Ibd1c42b1a75795f90a6483d3d0a5a14f88b193d8
2014-09-29 11:37:43 +00:00
jgu21
df44f76444
am 20867871: Frameworks/base: Early init native bridge
...
* commit '208678718f9f8db3bc279c7d5bd1445af2831ae3':
Frameworks/base: Early init native bridge
2014-09-29 03:37:34 +00:00
George Mount
3bcfbdd902
am 8120652b: Order GhostViews so that they display in their ghosted view\'s order.
...
* commit '8120652bb1155d762d945c1a3bf1636b6825dbd2':
Order GhostViews so that they display in their ghosted view's order.
2014-09-29 02:55:37 +00:00
Svetoslav
b009016f03
am ed2fdc6e: Accessibility node provider getting invalid virtual view id.
...
* commit 'ed2fdc6ef560c76ba310a2c4e5bb63f01d08af40':
Accessibility node provider getting invalid virtual view id.
2014-09-29 02:55:07 +00:00
jgu21
208678718f
Frameworks/base: Early init native bridge
...
Add the app directory to the arguments for starting a process.
Add a check for NeedsNativeBridge and a call to PreInitializeBridge
in the native fork code.
(cherry picked from commit 2eacd06bfb )
Bug: 17671501
Change-Id: I970db5b284b0c12e2d8a45df3950c1fff2927a4e
2014-09-28 15:35:59 -07:00
George Mount
8120652bb1
Order GhostViews so that they display in their ghosted view's order.
...
Bug 17671834
GhostViews can be added in arbitrary order since they are added
depending on how they are insterted into the TransitionValues
maps. This CL does two things: it ensures that GhostViews are always
pulled to the top of the Overlay and inserts GhostViews into
the Overlay in the order that their ghosted views are drawn.
Change-Id: I9f68105126834cc8f30a6cfe5d58fc3c51465afd
2014-09-28 21:13:38 +00:00
Svetoslav
ed2fdc6ef5
Accessibility node provider getting invalid virtual view id.
...
If the virtual child id is not specified we should ask the node
provider to create a node info for the hosting view bu passing
the special host node id.
bug:17664111
Change-Id: Iaf1387acdfe33b50b50729d293adcdf82340a648
2014-09-28 20:05:23 +00:00
Andres Morales
aa1bcd95cf
am 858d04cb: Merge "Mark PDB identifier as SystemApi" into lmp-dev
...
* commit '858d04cbf0962acba1ffc0e5df4113c01ed3abec':
Mark PDB identifier as SystemApi
2014-09-27 05:27:03 +00:00
Ruben Brunk
1c2bb0c72e
am 6f34ad71: Merge "camera2: Fix native ImageReader test segfaults." into lmp-dev
...
* commit '6f34ad71cb00c7f4260dbf071422b334152a2cd1':
camera2: Fix native ImageReader test segfaults.
2014-09-27 05:26:58 +00:00
Andres Morales
66b63cb825
Merge "Mark PDB identifier as SystemApi" into lmp-dev
2014-09-27 02:26:00 +00:00
Ruben Brunk
7b28c66a6c
Merge "camera2: Fix native ImageReader test segfaults." into lmp-dev
2014-09-27 02:16:30 +00:00
Ruben Brunk
31798f3318
camera2: Fix native ImageReader test segfaults.
...
Bug: 17675571
- Check for JPEG footer in correct location from ImageReader
when using the RGBA override.
- Add additional error checks in produceFrame method.
- Avoid allocating extra space for jpeg buffers due to
incorrect width calculations.
Change-Id: I926f37e8b3e5c4bad24c16dcee48d52adb1706dd
2014-09-26 18:00:21 -07:00
Andres Morales
33df937f6f
Mark PDB identifier as SystemApi
...
Had already marked the API itself as system api, just not
the Context.BLAH id. Also update the javadoc as it doesn't
return an FD anymore.
Change-Id: Ic8a5b8c75b0ba0bdf4ad26cf33d5f87eea568376
2014-09-26 17:08:59 -07:00
Eino-Ville Talvala
8883ada99b
am 678e4328: Merge "Camera2: Fix parallel session and device close() exception" into lmp-dev
...
* commit '678e432809fcde0d189f1130887bb201967eb342':
Camera2: Fix parallel session and device close() exception
2014-09-26 23:45:15 +00:00
Eino-Ville Talvala
ccc483696b
Merge "Camera2: Fix parallel session and device close() exception" into lmp-dev
2014-09-26 23:42:30 +00:00
Alan Viverette
72f1d94fed
am 63756956: Merge "Add callback to track and thumb drawables, propagate state in ASLD" into lmp-dev
...
* commit '637569566d2234b06e08d94acf4db1b0d3be6501':
Add callback to track and thumb drawables, propagate state in ASLD
2014-09-26 23:19:12 +00:00
Dianne Hackborn
e4f529c7ba
am cbb94a27: Merge "More debugging for issue #17656716 : Unhandled exception in Window Manager" into lmp-dev
...
* commit 'cbb94a27c1f0fa8c2b459ffe3206eb96006f92dc':
More debugging for issue #17656716 : Unhandled exception in Window Manager
2014-09-26 23:15:04 +00:00
Alan Viverette
ab9f1bab6b
Merge "Add callback to track and thumb drawables, propagate state in ASLD" into lmp-dev
2014-09-26 23:13:55 +00:00
Alan Viverette
b067405bf4
Add callback to track and thumb drawables, propagate state in ASLD
...
BUG: 17665424
Change-Id: I22da4530f3e2869d856102e804f020461a46fe49
2014-09-26 16:12:16 -07:00
Dianne Hackborn
820eab3e75
Merge "More debugging for issue #17656716 : Unhandled exception in Window Manager" into lmp-dev
2014-09-26 23:11:40 +00:00
Svetoslav
9743acd8b5
am 7c20fcc8: Merge "Accessibility node provider getting invalid virtual view id." into lmp-dev
...
* commit '7c20fcc83a5216a993bb1b31ab9ed09e90457fc5':
Accessibility node provider getting invalid virtual view id.
2014-09-26 23:02:47 +00:00
Elliott Hughes
2d895e5b21
am 70c1f083: Merge "Set the system locale correctly even on an encrypted device." into lmp-dev
...
* commit '70c1f083332729a586d670af7565732a2eb06ab4':
Set the system locale correctly even on an encrypted device.
2014-09-26 22:58:28 +00:00
Svetoslav
44389c5a3c
Merge "Accessibility node provider getting invalid virtual view id." into lmp-dev
2014-09-26 22:56:28 +00:00
Elliott Hughes
39aa0d946b
Merge "Set the system locale correctly even on an encrypted device." into lmp-dev
2014-09-26 22:52:31 +00:00
Dianne Hackborn
fad079dc5d
More debugging for issue #17656716 : Unhandled exception in Window Manager
...
Change-Id: I81d3678e21d293d5896c467ae5c6739c82cfaa95
2014-09-26 15:46:24 -07:00
Eino-Ville Talvala
56fbbeab79
Camera2: Fix parallel session and device close() exception
...
It's possible for the device to have close() called on it
during the session close sequence such that the session still
tries to do a stream reconfiguration on the closed device.
Handle the exception thrown by this attempt.
Bug: 17661765
Change-Id: Iee63c5c559405abe5c044ae251ad56edd1fb3e79
2014-09-26 15:37:26 -07:00
Igor Murashkin
e014f23e92
am ba164dfb: Merge "camera2: Fix race conditions and deadlocks around configuration" into lmp-dev
...
* commit 'ba164dfbcab8d1358075e18199b3ef55f85c8b88':
camera2: Fix race conditions and deadlocks around configuration
2014-09-26 22:26:00 +00:00
Svetoslav
b3ba1d4e71
Accessibility node provider getting invalid virtual view id.
...
If the virtual child id is not specified we should ask the node
provider to create a node info for the hosting view bu passing
the special host node id.
bug:17664111
Change-Id: I9c2d3195ad813eed7ea4108fe0d7ccb9cc32a1a0
2014-09-26 15:23:36 -07:00
Igor Murashkin
381d22f706
Merge "camera2: Fix race conditions and deadlocks around configuration" into lmp-dev
2014-09-26 22:20:12 +00:00
Elliott Hughes
f839b4fcb6
Set the system locale correctly even on an encrypted device.
...
Bug: 17659622
Change-Id: Ibbbd5b959bfab5345f20b556c4720d0910b50084
2014-09-26 15:18:20 -07:00
Fabrice Di Meglio
c410968871
am 8420a924: Merge "Fix bug #17521147 Settings activity looks terrible on Volantis" into lmp-dev
...
* commit '8420a924e038948e5df6ab41b4fbc73ae16c67b4':
Fix bug #17521147 Settings activity looks terrible on Volantis
2014-09-26 20:56:54 +00:00
Fabrice Di Meglio
6b0a880e13
Merge "Fix bug #17521147 Settings activity looks terrible on Volantis" into lmp-dev
2014-09-26 20:52:02 +00:00
Fabrice Di Meglio
b22be6fcf2
Fix bug #17521147 Settings activity looks terrible on Volantis
...
- update layouts for PreferenceActivity and its headers
in two panes mode (per UX request)
- add theming where it was missing
Change-Id: I0c478c1a66b6de7e122b7ee73da24f3dd5a7bc28
2014-09-26 13:38:12 -07:00
Martijn Coenen
a751e2aa37
am d846490a: Merge "Add hidden API to disable NFC (optional persist)." into lmp-dev
...
* commit 'd846490a560122f9dd67d863da9ebddf81e15ba2':
Add hidden API to disable NFC (optional persist).
2014-09-26 19:43:03 +00:00
Jorim Jaggi
875db8db40
am 9b20e012: Merge "Don\'t preload task description icons when opening recents" into lmp-dev
...
* commit '9b20e0125f1ef129a719834874262574a2a0db9a':
Don't preload task description icons when opening recents
2014-09-26 19:42:55 +00:00
Raph Levien
e430e9bba6
am a3e8bd63: Merge "Defer spelling correction with apostrophe" into lmp-dev
...
* commit 'a3e8bd63d0d6640b9073b5617c76e1d890a29fcb':
Defer spelling correction with apostrophe
2014-09-26 19:42:46 +00:00
Martijn Coenen
0a094c61bc
Merge "Add hidden API to disable NFC (optional persist)." into lmp-dev
2014-09-26 18:08:31 +00:00
Jorim Jaggi
e51b21a81e
Merge "Don't preload task description icons when opening recents" into lmp-dev
2014-09-26 17:57:05 +00:00
Raph Levien
c8ffeeca67
Merge "Defer spelling correction with apostrophe" into lmp-dev
2014-09-26 17:12:49 +00:00
Jorim Jaggi
bdd4b201e4
Don't preload task description icons when opening recents
...
Bug: 17624331
Change-Id: I55a1184efd5982122f87fab99a5402336b380d7c
2014-09-26 19:00:05 +02:00
Raph Levien
b1fef1114e
Defer spelling correction with apostrophe
...
When typing a contraction (such as "doesn't") we don't want a spell
right after the apostrophe, as this will create a false temporary red
underline, and the span split also breaks a kern pair causing text to
shift. This patch detects the case where the cursor is immediately after
such a word and suppresses correction in that case.
Bug: 17641350
Change-Id: I4d09576a31df551c96f820242fd2cbc675506dae
2014-09-26 08:59:28 -07:00
Philip Nowell
32ab32c85e
am 571730b4: Merge "Corrects a typo that identified XXXHIGH as 560 dpi instead of 640." into lmp-dev
...
* commit '571730b4d1a438fadfdb2c6951483f00f6276518':
Corrects a typo that identified XXXHIGH as 560 dpi instead of 640.
2014-09-26 15:10:46 +00:00
Philip Nowell
31a141af13
Merge "Corrects a typo that identified XXXHIGH as 560 dpi instead of 640." into lmp-dev
2014-09-26 15:00:22 +00:00
Przemyslaw Szczepaniak
d95788bf85
am f0a7c767: Merge "Fix ambiguous TTS#playSilence method." into lmp-dev
...
* commit 'f0a7c7672f158bc85ce400c1f59ec7fd973855d2':
Fix ambiguous TTS#playSilence method.
2014-09-26 09:17:53 +00:00
Przemyslaw Szczepaniak
759962ab6d
Merge "Fix ambiguous TTS#playSilence method." into lmp-dev
2014-09-26 08:11:23 +00:00
Svetoslav
75d7874edc
am 9ec435dc: Merge "Using wrong virtual view id When prefetching accessibility nodes." into lmp-dev
...
* commit '9ec435dca7296db68b19e03300ff814e34f84c16':
Using wrong virtual view id When prefetching accessibility nodes.
2014-09-26 01:58:29 +00:00
Svetoslav
a8181a9a0b
Merge "Using wrong virtual view id When prefetching accessibility nodes." into lmp-dev
2014-09-26 01:51:54 +00:00