158851 Commits

Author SHA1 Message Date
Andrew Solovay
13e0a6505f am a97053fd: am f43c057c: am c7ad6e91: docs: Added info about managed profiles to "Android 5.0 Changes"
* commit 'a97053fd0ba37feb7382fd30498a6a5e93c52a9e':
  docs: Added info about managed profiles to "Android 5.0 Changes"
2014-12-11 20:55:23 +00:00
Ruben Brunk
f6ed526b3a Merge "camera2: Fix LEGACY YUV production and orientation." into lmp-mr1-dev 2014-12-11 19:48:37 +00:00
Ruben Brunk
433e715cc0 camera2: Fix LEGACY YUV production and orientation.
Bug: 18486140
Change-Id: I119e57315b67d1f485bea7f1682bfc261ae0f934
2014-12-11 11:35:46 -08:00
Jason Monk
7d8ccb41fa Merge "Fix crash in BluetoothControllerImpl" into lmp-mr1-dev 2014-12-11 19:22:20 +00:00
Amit Mahajan
c5da1d3ddf Merge "Adding new config variable that is used to determine if ERI should be used when voice RAT is LTE on CDMA network." into lmp-mr1-dev 2014-12-11 18:39:23 +00:00
John Spurlock
0537caa1e0 Merge "Zen: Leave zen=none on manual ringer mode stream volume changes." into lmp-mr1-dev 2014-12-11 18:27:11 +00:00
Jason Monk
1206321f38 Fix crash in BluetoothControllerImpl
Bug: 18717777
Change-Id: I396aa8b517054b1fd4c8fea7f0343f138cb261a7
2014-12-11 13:26:01 -05:00
John Spurlock
29b7872bf4 Zen: Leave zen=none on manual ringer mode stream volume changes.
If the stream volume is changed from the api, leave zen=none
so as not to leave the system in an unexpected state.

Bug: 18084981
Change-Id: I857b3ff87ad4e2aa9aab479529caf13b819f854c
2014-12-11 12:54:41 -05:00
Robert Greenwalt
bde00a2b5c Merge "Add toString in NetworkFactory." into lmp-mr1-dev 2014-12-11 16:59:13 +00:00
Selim Cinek
f8dc9d7b3d Merge "Fixed a bug where the pattern may become invisible" into lmp-mr1-dev 2014-12-11 14:09:44 +00:00
Selim Cinek
372eb38c17 Merge "Fixed a bug where the empty shade and dismiss views would animate" into lmp-mr1-dev 2014-12-11 14:09:00 +00:00
Selim Cinek
8f51c4c5e5 Merge "Fixed a bug where the background could become transparent" into lmp-mr1-dev 2014-12-11 14:08:10 +00:00
Narayan Kamath
15cd63027b Merge "Avoid tearing down process groups twice." into lmp-mr1-dev 2014-12-11 09:08:43 +00:00
Paul Jensen
2122e14cca Merge "Fix several HTTP proxy issues with multinetworking." into lmp-mr1-dev 2014-12-11 04:51:16 +00:00
Pavel Zhamaitsiak
fda0ff020d Merge "Add missing member to string conversion - helps in debugging." into lmp-mr1-dev 2014-12-11 04:47:20 +00:00
vandwalle
b897f013b5 Merge "adjust network switching thresholds Bug:18589301" into lmp-mr1-dev 2014-12-11 03:18:42 +00:00
Robert Greenwalt
6b746b5e14 Add toString in NetworkFactory.
Needed some additional logging to track down this bug
so add toString to capture the state.

bug:18569575
Change-Id: I4047b8f8797bac09bcff31e99d9cb117abb04df4
2014-12-10 19:04:50 -08:00
smain@google.com
9a6d1d9fba am c0f96532: am 8cd0bb2d: Merge "add helpouts widget to wave 3 pages" into lmp-docs
automerge: e04a9fc

* commit 'e04a9fcc2edc4b2527c8233e16f823cec6fb58cc':
  add helpouts widget to wave 3 pages
2014-12-11 02:56:17 +00:00
Luan Nguyen
25964a854a am 7e1b348a: am 4221d7e4: docs: Fix link for moved Android Studio index.
automerge: 75ec24e

* commit '75ec24e26900fa6e0def1f5e946be41614d8e520':
  docs: Fix link for moved Android Studio index.
2014-12-11 02:54:57 +00:00
Dianne Hackborn
84adc43a70 Merge "Fix issue #18706195: Improve label names of memory types" into lmp-mr1-dev 2014-12-11 01:58:51 +00:00
John Reck
eb2dcc791e Merge "Don't preload textures for AssetAtlas" into lmp-mr1-dev 2014-12-11 01:12:31 +00:00
John Reck
ebd52610cf Don't preload textures for AssetAtlas
Bug: 18317479

RenderNode::prepareSubTree calls prefetchAndMarkInUse
on every bitmapResoruce in the DisplayList. However,
this resulted in textures being uploaded for bitmaps
that would be drawn from the AssetAtlas instead.

To fix this we teach TextureCache about the AssetAtlas
so that calls to TextureCache return the Texture from
AssetAtlas if it exists. Thus usage of AssetAtlas
is now purely to allow for further optimizations via
draw merging instead of a requirement to get
any benefit at all.

Change-Id: I65282fa05bac46f4e93822b3467ffa0261ccf200
2014-12-10 17:07:41 -08:00
Dianne Hackborn
1353df5655 Fix issue #18706195: Improve label names of memory types
Change-Id: Ia11153300e04aecd56baca9d4316ac362688d594
2014-12-10 16:54:13 -08:00
Andrew Solovay
a97053fd0b am f43c057c: am c7ad6e91: docs: Added info about managed profiles to "Android 5.0 Changes"
* commit 'f43c057ca611e9d86e365fd90eceec22cdaffac8':
  docs: Added info about managed profiles to "Android 5.0 Changes"
2014-12-11 00:37:06 +00:00
Alan Viverette
daec594370 Fix build
Change-Id: I2efdf2790aa768eaaa6e7e0b80a9ad7b2ddf3cb9
2014-12-10 16:29:59 -08:00
Andrew Solovay
f43c057ca6 am c7ad6e91: docs: Added info about managed profiles to "Android 5.0 Changes"
* commit 'c7ad6e9175e232416c22386b80f2c5c9b5031d81':
  docs: Added info about managed profiles to "Android 5.0 Changes"
2014-12-11 00:29:14 +00:00
Alan Viverette
4e1374378d Merge "Update tint filter after setting gradient drawable state" into lmp-mr1-dev 2014-12-11 00:23:33 +00:00
Andrew Solovay
c7ad6e9175 docs: Added info about managed profiles to "Android 5.0 Changes"
Also a couple of unrelated changes while the file was open.

See first comment for link to staged doc.

Change-Id: I56dd57104729dec353b0dd630715a43a73d043d3
2014-12-10 16:08:23 -08:00
Alan Viverette
3ad771b384 Update tint filter after setting gradient drawable state
BUG: 18706381
Change-Id: I7d664303c9b796243da6c55d1ea9482736aabf07
2014-12-10 16:00:43 -08:00
Winson Chung
e405e59e5b Merge "Fixing major regressions in Recents with multi-user. (Bug 18574950)" into lmp-mr1-dev 2014-12-10 23:54:40 +00:00
smain@google.com
e04a9fcc2e am c0f96532: am 8cd0bb2d: Merge "add helpouts widget to wave 3 pages" into lmp-docs
* commit 'c0f96532caa62f477af33a271b546a7d0c932c36':
  add helpouts widget to wave 3 pages
2014-12-10 23:49:17 +00:00
smain@google.com
c0f96532ca am 8cd0bb2d: Merge "add helpouts widget to wave 3 pages" into lmp-docs
* commit '8cd0bb2df377b2452d5b12ac5057143da4ecb899':
  add helpouts widget to wave 3 pages
2014-12-10 23:37:52 +00:00
Shishir Agrawal
951dcdd940 Merge "Adding a new hidden carrier API to mark GSM/CDMA networks as roaming/non-roaming." into lmp-mr1-dev 2014-12-10 23:19:16 +00:00
Winson Chung
2002cf5b46 Fixing major regressions in Recents with multi-user. (Bug 18574950)
In the process of front-loading a lot of the loading work, we moved logic
into AlternateRecentsComponent, which is not multi-user friendly.  This CL 
proxies all the necessary events for non-primary users to their own SystemUI 
process to ensure that they handle them correctly, and proxies visibility
changes back to the primary user (since that is the only process with the
right callbacks).

Change-Id: I9fed92214ac4d4e2309ad6ffc35d09b5726c2880
2014-12-10 15:16:55 -08:00
smain@google.com
8cd0bb2df3 Merge "add helpouts widget to wave 3 pages" into lmp-docs 2014-12-10 23:07:38 +00:00
Amith Yamasani
ee24d848a5 Merge "Stop guest user on exiting, to conserve resources" into lmp-mr1-dev 2014-12-10 22:54:29 +00:00
Dmitriy Ivanov
cd13ae76a5 Merge "Switch to libsigchain.a" into lmp-mr1-dev 2014-12-10 22:24:46 +00:00
Amith Yamasani
6f96a44df3 Stop guest user on exiting, to conserve resources
Bug: 18672730
Change-Id: I17bc26ce2e10ceebeb18b75565daf21aa7df7774
2014-12-10 14:21:48 -08:00
Luan Nguyen
75ec24e269 am 7e1b348a: am 4221d7e4: docs: Fix link for moved Android Studio index.
* commit '7e1b348ac55d4368172809031808a39576d00eea':
  docs: Fix link for moved Android Studio index.
2014-12-10 22:12:20 +00:00
Alan Viverette
6c42ee4703 Merge "Always call onDateChanged() when the date picker selection changes" into lmp-mr1-dev 2014-12-10 22:06:19 +00:00
Luan Nguyen
7e1b348ac5 am 4221d7e4: docs: Fix link for moved Android Studio index.
* commit '4221d7e4cbcea9ea6be56322c7839f31b2afb828':
  docs: Fix link for moved Android Studio index.
2014-12-10 22:04:20 +00:00
Dianne Hackborn
e207ffe01d Merge "Fix issue #18683980: questions on LMK memory changes" into lmp-mr1-dev 2014-12-10 21:56:08 +00:00
Alan Viverette
62b780e85f Avoid creating futures for drawables with no constant state
We don't need to create futures for drawables without constant state,
since we only copy on mutate and we don't need to do any work on mutate()
for drawables without shared constant state. Also we would crash in that
case, so avoiding the NPE is nice too.

Rider: Also fixes elevations again.

BUG: 18696100
Change-Id: I4d7737f39ce3efc5830704e5ce412c540603e6ac
2014-12-10 13:52:28 -08:00
Luan Nguyen
4221d7e4cb docs: Fix link for moved Android Studio index.
Change-Id: Ia0c4cdcf05fddd12e0e50c2b6343809f80ab5f65
2014-12-10 13:42:05 -08:00
Adam Lesinski
c780187745 Merge "Fix issue where non-resource attributes would cause obtainStyleAttributes to fail" into lmp-mr1-dev 2014-12-10 21:12:04 +00:00
Jason Monk
4ef9edeb67 Merge "Handle policy change while keyguard disabled" into lmp-mr1-dev 2014-12-10 21:04:27 +00:00
Chris Craik
f441557d89 Merge "Fix frame-allocated path lifecycles" into lmp-mr1-dev 2014-12-10 20:53:46 +00:00
Benjamin Franz
a96ba381cf Merge "Only add successfully bound profile services to mProfileServices." into lmp-mr1-dev 2014-12-10 20:29:25 +00:00
Chris Craik
4ac36f80be Fix frame-allocated path lifecycles
bug:18667472

Previously, we were allocating per-frame temporary paths within the
PlaybackStateStruct, but these are not safe as layers allocate these
transiently. Instead, move these to the OpenGLRenderer, which has
better define lifecycle.

Additionally, don't store SkPath objects directly in vector, since
they are then subject to relocation.

Change-Id: I8187ef542fcd5b030502bb75eb123ee26c0daa96
2014-12-10 12:27:08 -08:00
Paul Jensen
e0bef71662 Fix several HTTP proxy issues with multinetworking.
1. Send PROXY_CHANGE_ACTION broadcast when any network's proxy changes,
   not just the default network.
2. When a process is bound to a particular Network, update the proxy
   system properties to those for the bound Network, and keep them
   updated when PROXY_CHANGE_ACTION broadcasts are received.
3. Make Network.openConnection() use the proxy for the Network.

bug:17905627
bug:17420465
bug:18144582

(cherry-pick of https://android-review.googlesource.com/#/c/115170)

Change-Id: Ia2819985e6108a8c121e74c683a5646becfd0a97
2014-12-10 15:22:12 -05:00