221725 Commits

Author SHA1 Message Date
Rob Carr
40725b6f86 Merge "Clarify geometry management for SurfaceView" 2015-11-10 21:54:45 +00:00
Pablo Ceballos
4873103e75 Merge "jni: Regenerated EGL/GLES JNI files to support null arguments" 2015-11-10 21:41:53 +00:00
John Reck
e2703bee8a Merge "Fix threading issues" 2015-11-10 21:41:49 +00:00
John Reck
cba287b971 Fix threading issues
Bug: 25584167
Change-Id: I413ef9e0c86f7cca1f7d085e0071745ca0192853
2015-11-10 13:41:32 -08:00
Jeff Tinker
807ea28eef Merge "Improve MediaCodec.CryptoException log messages" 2015-11-10 21:16:44 +00:00
Jason Monk
10bd1daf5e Merge "Fix tuner-related crashes" 2015-11-10 21:05:57 +00:00
Jason Monk
72def0de65 Fix tuner-related crashes
- Make the dialog a fragment
 - add a null check

Bug: 23341500
Bug: 25341011
Change-Id: I4d9991657c487ea3b5ced8cce2a5072c8adb2ee5
2015-11-10 16:03:41 -05:00
Wale Ogunwale
935e50292e Set right bounds/configuration for task when positioned in stack.
When AMS.positionTaskInStack API is called we need to make sure
the task has the right bounds and configuration if it is moving
to a different stack.

Bug: 25501082
Change-Id: I2a80aa08a4ee52d860502ab16b6cdb432c954084
2015-11-10 12:40:14 -08:00
Chad Brubaker
08d36202da Add support for debug-overrides configuration
Debug overrides are only used if the application is debuggable in
order to help local debugging and development by trusting additional
CAs. In a non-debuggable version of the application the debug-overrides
are ignored.

Trust anchors in the debug override configuration have two key
differences from those in base-config and domain-config:
1) trust anchors in the debug-overrides are trusted for all connections
in addition to any trust anchors included in the relevant base/domain
configs.
2) By default trust anchors in the debug config override pins, as their
purpose is for connecting to non-standard servers for debugging and
testing and those servers should not be pinned in the production
configuration.

Change-Id: I15ee98eae182be0ffaa49b06bc5e1c6c3d22baee
2015-11-10 12:40:00 -08:00
Robert Carr
64aadd0849 Clarify geometry management for SurfaceView
In the hardware accelerated case, RenderThread needs
to be the authority of information on the geometry of
the SurfaceView (this will occur via moving the
repositionWindow call to RenderThread). In order
to support this we have to enable calling relayoutWindow
without geometry (so that it will not fight with
repositionWindow). Add such a mode to relayoutWindow
and use it from SurfaceView. Add size to repositionChild
while we are here.

Bug: 22802885
Change-Id: Ie45132c22f34cc6ecfe2446912b30bd1df414406
2015-11-10 19:21:22 +00:00
Christopher Tate
0a61b36013 Introduce socket stats tag for restore traffic
As well as system API for emplacing it.

Change-Id: If33fbd23552261efe3b00d75c22ff823564f43e6
2015-11-10 11:13:12 -08:00
Winson Chung
974f55fa13 Merge "Saving additional context when taking task screenshots." 2015-11-10 18:24:48 +00:00
Wale Ogunwale
208ff92d30 Merge "Fixed issue with not been able to dock task from recents after reboot" 2015-11-10 18:07:56 +00:00
Wale Ogunwale
6c5eb1c6fe Fixed issue with not been able to dock task from recents after reboot
- Always set the docked stack mode when starting a task from recents
even if the task is already in the docked stack. The caller might want
to change the docked stack location.
- Return last persisted bounds for task that hasn't be restored into a
stack yet when AMS.getTaskBounds is called.
- Make sure there is a valid top activity when moving a task to a stack
before trying to preserve the window.

Bug: 25590206
Change-Id: Id115fc62c28913f999c62cdbbaccd887daa0fab5
2015-11-10 10:00:38 -08:00
Tony Mantler
6038349b4e Merge "Move RecentLocationApps to SettingsLib" 2015-11-10 17:48:47 +00:00
Tony Mantler
65eb4ada18 Move RecentLocationApps to SettingsLib
Change-Id: I73c7c7a2436a6af9f5353a20ea7afc4f6e57b485
2015-11-10 17:47:56 +00:00
Florin Malita
dd763feeb2 Merge "Fix persistent Canvas clip handling" 2015-11-10 16:59:48 +00:00
Winson
142af42fd6 Fixing issue with regression with launching focused task.
- Only update the focused task as you scroll if we are in touch
  exploration mode.
- Use stack's notion of focused task as the currently focused task may
  not have a TaskView and can be scrolled offscreen.

Bug: 25590404

Change-Id: I5ef1b66ec74aa1a3131993ed84905210f1e45f18
2015-11-10 08:53:44 -08:00
Jorim Jaggi
7cc7b08a40 Make sure callback is only called once
Because we set it already in the future, it was called already
when we fetched the contents of the future, because it looked
like we overrided the callback. Instead, don't do callbacks
when calling the future, and save the callback in a separate
field.

Bug: 25568693
Change-Id: I8b7fd4248a2336470f8b7e12b64b0577dee96f6f
2015-11-10 16:13:47 +00:00
Mahaver Chopra
68ce6dc10a Merge "Add ACTION_PROVISION_MANAGED_USER" 2015-11-10 14:08:02 +00:00
Jorim Jaggi
29deb334cd Reset mAppTransitionAnimationSpecs so they are only used once
Because we didn't reset it after sending it to window manager,
they were used again in the next transition, leading to a
wrong animation.

Also fix a bug where we waited forever because
getAppTransitionAnimationSpecs returned null.

Bug: 25583739
Change-Id: Ifcccf2d3cee649f66b4ded1d92c059acfa02ba5b
2015-11-10 12:26:07 +00:00
Jorim Jaggi
7af8ea8a7c When recent changes its layout, update contents
When the window gets resized, we need to synchronize the
views with the model.

Bug: 25584567
Bug: 25584399
Change-Id: I27d6738cb4984ce91ce79671298bcdc0d317c6e1
2015-11-10 12:25:28 +00:00
Mahaver Chopra
5e73256a48 Add ACTION_PROVISION_MANAGED_USER
Adding ACTION_PROVISION_MANAGED_USER to DevicePolicyManager.

Bug: 25462684
Change-Id: Ic90c3471f3a9c431d728197a19ab25b9946f090a
2015-11-10 10:58:51 +00:00
Keisuke Kuroyanagi
a08a48cb98 Merge "Support KEYCODE_{CUT, COPY, PASTE} in TextView." 2015-11-10 07:46:51 +00:00
Ben Kwa
bab08460ee Merge "Clean up/fix some minor focus-related code." 2015-11-10 06:09:29 +00:00
Ben Kwa
02f22f370d Merge "Clean up some unnecessary imports." 2015-11-10 05:16:39 +00:00
Steve McKay
ad668b2d2c Merge "Make folders unselectable in as needed." 2015-11-10 04:46:51 +00:00
Steve McKay
f69502ca42 Make folders unselectable in as needed.
In some intent handling modes folders shouldn't be selectable.

Note: There are probably *other* conditions where this should be true too.

Bug: 23936872
Change-Id: I5a1f6853df265d65415cc09e95005720bf5f91d7
2015-11-10 13:45:10 +09:00
Filip Gruszczynski
f278c97449 Merge "Don't treat dummy animation as exit animation." 2015-11-10 04:23:56 +00:00
Wale Ogunwale
7422a37434 Merge "Clear task bounds data when removing non-bounds persistable task." 2015-11-10 03:52:28 +00:00
Svetoslav Ganov
59cf3086a9 Merge "Avoid NPE in printspooler when changing language" am: 8d8515e708 am: 5522efb130
am: 16009a6dea

* commit '16009a6deaff272c94046facbeb567bafdaacc69':
  Avoid NPE in printspooler when changing language
2015-11-10 02:36:02 +00:00
Filip Gruszczynski
291fdb0efc Don't treat dummy animation as exit animation.
This fixes a problem where recents would never be removed, because they
would run a dummy animation.

Bug: 25472312
Change-Id: I5767dc700966a49513e6338f4728c2ff275628ad
2015-11-09 18:20:24 -08:00
Filip Gruszczynski
331d5e078c Merge "Fix jumping dock divider when dismissing/maximizng." 2015-11-10 02:16:55 +00:00
Winson
c809cbb926 Saving additional context when taking task screenshots.
- Save the original task size and screen orientation.  This ensures that
  we will be able to display the screenshots in the right orientation if
  we start taking non-square thumbnails.

Change-Id: I17ffe1fc05a447f67753149695a4eaf0baa36e8e
2015-11-09 17:36:35 -08:00
Daichi Hirono
609b5b8c8e Merge "Add root information to MtpDatabase." 2015-11-10 01:34:21 +00:00
Daichi Hirono
0378da48c4 Add root information to MtpDatabase.
The CLs adds new table to MtpDatabase that contains additional
information to provide DocumentContract.Roots.COLUMN_*. Client code can
obtain these information by using the newly added queryRoots method.

BUG=25162822
Change-Id: Ib6596d38cbb4a42b689c75fffbd73585c0fb524c
2015-11-10 10:32:42 +09:00
Jeff Tinker
3ccb34d707 Improve MediaCodec.CryptoException log messages
The message being logged is "Unknown error" even for
known error types.  This change provides more descriptive
error strings, for the case when the message isn't
explicitly provided by the DRM plugin.

Change-Id: Ic86478d7685cd33e21ecd2f875ef7dbed351e52e
related-to-bug: 25477595
2015-11-09 17:31:05 -08:00
Roozbeh Pournader
5960b940d4 Merge "Fix case where some locales may have empty langauges." 2015-11-10 01:13:50 +00:00
Todd Kennedy
cab5208adf Merge "Move 'un/install' to cmd" 2015-11-10 01:12:32 +00:00
Roozbeh Pournader
417bbe0179 Fix case where some locales may have empty langauges.
This is to make the behvior the same as before
47f71a697a50e76565fef520a0f51e5d6826ceee for cases when some of the
locales' languages are empty.

Change-Id: Ifee92e199f20130e060670f244eb3b4b7be13872
2015-11-09 17:10:46 -08:00
Svetoslav Ganov
16009a6dea Merge "Avoid NPE in printspooler when changing language" am: 8d8515e708
am: 5522efb130

* commit '5522efb1300cfa87a8434bd396093a2ae076fa69':
  Avoid NPE in printspooler when changing language
2015-11-10 01:07:27 +00:00
Svetoslav Ganov
5522efb130 Merge "Avoid NPE in printspooler when changing language"
am: 8d8515e708

* commit '8d8515e708f0cebf69587750bbb3abcb315cc61e':
  Avoid NPE in printspooler when changing language
2015-11-10 01:03:05 +00:00
Svetoslav Ganov
8d8515e708 Merge "Avoid NPE in printspooler when changing language" 2015-11-10 00:58:28 +00:00
Chong Zhang
29ffd06d46 Merge "Don't hide wallpaper if surface is destroyed due to drag resizing" 2015-11-10 00:55:25 +00:00
Jeff Sharkey
90d3c037b0 Merge "Temporarily disable to fix deadlock." 2015-11-10 00:53:46 +00:00
Jeff Sharkey
3eef5a5273 Temporarily disable to fix deadlock.
Bug: 25584022
Change-Id: Icee579cfebfb75c573e9a54622f219e0f81fbd35
2015-11-09 16:50:41 -08:00
Roozbeh Pournader
87e1db355b Merge "Use the full locale list in resourceQualifierString()." 2015-11-10 00:45:49 +00:00
Jack Yu
6023a99ab4 Merge "Added getServiceState API to TelephonyManager." 2015-11-10 00:34:04 +00:00
Yoshiki Iguchi
118af28d60 Merge "Fix crash on calling removeSelection with showing selection handlers" 2015-11-10 00:27:27 +00:00
Jeff Tinker
b801f7b891 Merge "Extend MediaCodec.CryptoInfo to support Sample AES" 2015-11-09 23:11:21 +00:00