Commit Graph

41237 Commits

Author SHA1 Message Date
Chris Wren
0596497df7 am c3328cac: Merge "Add a returns clause to the matchesInterruptionFilter javadoc." into lmp-dev
* commit 'c3328cacdad67623f94b13fceb734d958461a475':
  Add a returns clause to the matchesInterruptionFilter javadoc.
2014-09-30 18:55:04 +00:00
Chris Wren
1b4c25fc50 am af098c56: Merge "Update the documentation on EXTRA_PEOPLE." into lmp-dev
* commit 'af098c5657942d645ec7362cc439718457abec64':
  Update the documentation on EXTRA_PEOPLE.
2014-09-30 18:55:00 +00:00
Chris Wren
c3328cacda Merge "Add a returns clause to the matchesInterruptionFilter javadoc." into lmp-dev 2014-09-30 18:51:28 +00:00
Chris Wren
af098c5657 Merge "Update the documentation on EXTRA_PEOPLE." into lmp-dev 2014-09-30 18:50:05 +00:00
Chris Wren
0fef44de68 Add a returns clause to the matchesInterruptionFilter javadoc.
Bug: 17641219
Change-Id: I4f1949902bf872823389f3db8e694e370e113295
2014-09-30 13:05:14 -04:00
Chris Wren
e6c4893ed4 Update the documentation on EXTRA_PEOPLE.
Include the supported formats with links to ContactsContract documentation.

Bug: 15283556
Change-Id: Ic48b0a9ad1be61f0fa119b1d0e9d6aac5e5bea27
2014-09-30 11:57:03 -04:00
George Mount
a5e8b16767 am 8afceda1: Merge "Clear preordered list after use." into lmp-dev
* commit '8afceda14176b911cf755b8ebbcfbfa9eff60aae':
  Clear preordered list after use.
2014-09-30 15:55:03 +00:00
George Mount
8afceda141 Merge "Clear preordered list after use." into lmp-dev 2014-09-30 14:58:21 +00:00
Dianne Hackborn
ccd08f23b0 am 38646c19: Merge "Work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev
* commit '38646c19d8badea143113c0dc48ccdacb18badc4':
  Work on issue #17656716: Unhandled exception in Window Manager
2014-09-30 14:55:26 +00:00
Adrian Roos
e26dcaa20c 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-30 14:55:11 +00:00
Paul Jensen
107837aa28 am 89e0f093: Move mobile provisioning APN support into telephony.
* commit '89e0f0937a70d73b5ed188c9337b4d33860e5573':
  Move mobile provisioning APN support into telephony.
2014-09-30 14:55:07 +00:00
George Mount
bc6d38938e 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-30 14:55:05 +00:00
Svetoslav
8976ab39d9 am ed2fdc6e: Accessibility node provider getting invalid virtual view id.
* commit 'ed2fdc6ef560c76ba310a2c4e5bb63f01d08af40':
  Accessibility node provider getting invalid virtual view id.
2014-09-30 14:55:01 +00:00
George Mount
50ac6cb982 Clear preordered list after use.
Bug 17671834
Bug 17697944

Change-Id: I0ba46f32661869db0c925b00342211ea543e2f88
2014-09-29 17:10:24 -07:00
Dianne Hackborn
73d6a821ae Work on issue #17656716: Unhandled exception in Window Manager
Remove the checks for large parcel sizes.  Those were triggering,
and identifyng the area of the problem, but also cause a lot of
trouble by making the unsafe deadlocky code there much more likely
to deadlock.

Add logging for strict mode IPCs, since those seem to be the
problem.  Only log when things look bad.

Also add a log when battery stats are reset, to diagnose why they
are getting reset when they shouldn't be.

Change-Id: I588c858fb8d8c45f3c9c164ae2de9ae01547b304
2014-09-29 16:04:02 -07: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
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
8adfaf6c59 am 858d04cb: Merge "Mark PDB identifier as SystemApi" into lmp-dev
* commit '858d04cbf0962acba1ffc0e5df4113c01ed3abec':
  Mark PDB identifier as SystemApi
2014-09-27 02:46:46 +00:00
Ruben Brunk
469a55eddc am 6f34ad71: Merge "camera2: Fix native ImageReader test segfaults." into lmp-dev
* commit '6f34ad71cb00c7f4260dbf071422b334152a2cd1':
  camera2: Fix native ImageReader test segfaults.
2014-09-27 02:46:41 +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
84a738821f 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:44:12 +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
cde6e29ac6 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:32 +00:00
Dianne Hackborn
803d3fc394 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:17 +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
584599cce2 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:03:38 +00:00
Elliott Hughes
0844233e99 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:51 +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
e14facba6d 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:29:20 +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
558e64b39f 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 21:58:08 +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
d1398c5eda 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:58 +00:00
Jorim Jaggi
2ef12e4a5c 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:43:50 +00:00
Raph Levien
5d8fa6c173 am a3e8bd63: Merge "Defer spelling correction with apostrophe" into lmp-dev
* commit 'a3e8bd63d0d6640b9073b5617c76e1d890a29fcb':
  Defer spelling correction with apostrophe
2014-09-26 19:43:41 +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