155985 Commits

Author SHA1 Message Date
Nicolas Prevot
ebee8a4d92 Merge "Replace minimum with maximum in method description." into lmp-mr1-dev 2014-10-28 16:33:33 +00:00
Nicolas Prevot
555f1986f1 Replace minimum with maximum in method description.
BUG:18152344

Change-Id: If5d09051e8f74addf53018cfd3be214d96efb9e6
2014-10-28 16:18:47 +00:00
Benjamin Franz
f5c00c1c11 Merge "Send ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED Broadcast when a user restriction has been changed." into lmp-mr1-dev 2014-10-28 16:13:05 +00:00
Jorim Jaggi
4eedc1d97e Fix jank when launching something from lockscreen
Apparently, hideRecents blocks around 300ms so we avoid this as a
low-risk fix. In the longer term, we should investigate why it takes
so long.

Bug: 18133433
Change-Id: I3eae659d4720d3c95280e7f7a144e00f0c760388
2014-10-28 16:12:08 +00:00
Adrian Roos
288f65e381 Merge changes Iecd1303f,I2076c500 into lmp-mr1-dev
* changes:
  Fix NPE in FlashlightController
  Fix stale unlock icon
2014-10-28 15:23:14 +00:00
Adrian Roos
bd6f4a818e Merge "Ensure trust agents are disabled in safe-mode" into lmp-mr1-dev 2014-10-28 14:37:39 +00:00
Craig Mautner
74fe6ce72d Merge "Do not go through a layout if visibility is GONE" into lmp-mr1-dev 2014-10-28 13:56:09 +00:00
Christoph Studer
685720309a Merge "NoMan: Add update bit to notification_enqueue log" into lmp-mr1-dev 2014-10-28 12:41:33 +00:00
Ari Sachter-Zeltzer
20edd05327 Merge "fixed jank on activity close exit with better alpha interpolation" into lmp-mr1-dev 2014-10-28 08:58:23 +00:00
Erik Kline
dd91fb4474 Merge "(re)define the definition of "provisioned"" into lmp-mr1-dev 2014-10-28 07:53:37 +00:00
Lorenzo Colitti
111cc9f511 Merge "Change removeStackedLink to take an interface name." into lmp-mr1-dev 2014-10-28 07:00:31 +00:00
Lorenzo Colitti
f3cab63ef2 Change removeStackedLink to take an interface name.
This simplifies callers.

Also remove all "implementations" of addStackedLink and
removeStackedLink except the one in LinkProperties, because they
are unused.

Bug: 12111730
Change-Id: Ie294b855facba4b1436299dcb3211b72d9ba448e
2014-10-28 15:13:57 +09:00
Erik Kline
d3b9fd33c6 (re)define the definition of "provisioned"
Specifically:

    [1] provide a hasIPv4(), and
    [2] a hasIPv6()

each of which requires an IP address, a default route, and
address-family-specific DNS servers to evaluate to true.

Additionally:

    [3] redefine isProvisioned() to return the logical OR
        of [1] and [2] above.

Any external caller can still use any of the has*() methods to
construct its own, different definition of "provisioned".

Bug: 17769720
Change-Id: Ia692fb8508484ff403d3920c94d0e1db4563f807
2014-10-28 14:47:42 +09:00
Lajos Molnar
aab38b7ea0 Merge "MediaCodec/Image: handle null cropRect correctly" into lmp-mr1-dev 2014-10-28 03:28:18 +00:00
Griff Hazen
d1cbf9a870 DO NOT MERGE Fix lmp-sprout-dev build for generics addition
automerge: 732e4ec  -s ours

* commit '732e4ecbee3168c19e49469934f0e1cd3268e001':
  DO NOT MERGE Fix lmp-sprout-dev build for generics addition
2014-10-28 02:23:34 +00:00
Jason Monk
e58574026b Add missing passive discovery flag automerge: 4444c5b
automerge: 07faf0e

* commit '07faf0e1a1d32408dfdc863a0996baa8522c5fdb':
  Add missing passive discovery flag
2014-10-28 02:21:20 +00:00
Ying Wang
bc66de0df9 Update current.txt with generics to field types. automerge: 79775d4
automerge: 475d739  -s ours

* commit '475d7393bf0cbb80dd1911df30a6ba0292da09c3':
  Update current.txt with generics to field types.
2014-10-28 02:20:25 +00:00
Griff Hazen
732e4ecbee DO NOT MERGE Fix lmp-sprout-dev build for generics addition
Change-Id: I66f10264476df5504086a7fbc24d729798187d05
2014-10-27 19:19:22 -07:00
Yuncheol Heo
571cc6b195 Merge "CEC: Send <ReportMenuStatus:active> together sending <ActiveSource>." into lmp-mr1-dev 2014-10-28 01:04:07 +00:00
Alan Viverette
e5d27a22a6 Merge "Play CLICK sound effect when compound buttons are clicked" into lmp-mr1-dev 2014-10-28 00:57:11 +00:00
Jason Monk
07faf0e1a1 Add missing passive discovery flag
automerge: 4444c5b

* commit '4444c5b27874866f18cd8f4abb8914cc17857ea7':
  Add missing passive discovery flag
2014-10-28 00:52:56 +00:00
Alan Viverette
d4e7790fee Play CLICK sound effect when compound buttons are clicked
Also plays the sound effect when the switch changes state as a result
of dragging, since that's effectively the same as the click action.

BUG: 16308311
Change-Id: Ic187ece2a8190082617f5ac7aaf05c3511fa80b5
2014-10-27 17:50:51 -07:00
Ying Wang
80c9fbe36f Update current.txt with generics to field types.
Bug: 17014855
Change-Id: I14672092f79374f6c5b2362bd3c2aaac84e0c2ae
2014-10-27 17:42:04 -07:00
Winson Chung
b55f7d79d1 Merge "Fixing potential crash when the task loader is stopped. (Bug 18135583)" into lmp-mr1-dev 2014-10-27 23:39:11 +00:00
Jeff Sharkey
e79553355b Merge "Check upgrade certs before permissions." into lmp-mr1-dev 2014-10-27 23:35:58 +00:00
John Reck
b0aeaad442 Merge "Cleanup debug options" into lmp-mr1-dev 2014-10-27 23:27:30 +00:00
Jason Monk
4444c5b278 Add missing passive discovery flag
MediaProjectionManagerService had an active media callback which
was causing a service to be bound 100% of the time.  Adding a
passive flag makes it only observe events, and allow the service
to only be bound when needed by apps requesting active discovery.

Bug: 18042409
Bug: 17969854
Change-Id: I1bfa6609e2aa507ee2ce227de50f0e5ae951e000
2014-10-27 19:25:50 -04:00
Alan Viverette
384755230c Merge "Fix min/max date range in DatePicker calendar mode" into lmp-mr1-dev 2014-10-27 23:16:26 +00:00
Wale Ogunwale
674f55e515 Merge "Added documentation for various window frame types." into lmp-mr1-dev 2014-10-27 23:05:39 +00:00
Alan Viverette
253626b822 Merge "Clean up some javadocs in Window.setFeature...()" into lmp-mr1-dev 2014-10-27 22:39:12 +00:00
Jeff Sharkey
c28bd3532b Check upgrade certs before permissions.
We're now checking for permission redefinition early during the
install process, which can result in a confusing error message when
the real problem is a mis-signed app.  So do a quick signature
sanity check before checking permissions.

Bug: 18095637
Change-Id: I9a9b48da9c5dc7fb9bde6f3f338ea08e53b6b705
2014-10-27 15:38:27 -07:00
Ying Wang
475d7393bf Update current.txt with generics to field types.
automerge: 79775d4

* commit '79775d4bc4fa71994942dbd1d441aa62827c34be':
  Update current.txt with generics to field types.
2014-10-27 22:35:59 +00:00
Jeff Sharkey
d634d39c60 Merge "Follow API removal." into lmp-mr1-dev 2014-10-27 22:01:58 +00:00
Lajos Molnar
5ea17442c5 MediaCodec/Image: handle null cropRect correctly
- allow Media.Image.setCropRect(null) to unset cropRect
- use full image if cropRect is null in MediaCodec$Image

Bug: 18124320
Change-Id: I7abb6175402a1fe913e16c0a682fabee79c55741
2014-10-27 14:58:26 -07:00
Jeff Sharkey
cff1d67339 Follow API removal.
Bug: 18118003
Change-Id: Iad73ce748e05ba0660246e8dbb041415c187f792
2014-10-27 14:53:40 -07:00
Craig Mautner
fa3515bd0d Do not go through a layout if visibility is GONE
An unnecessary layout based on dimensions changing catches up
with us later when the next layout doesn't occur.

In this case
we layed out the Settings panel because visibility changed from
visible to GONE and the requested width/height didn't match the
current window width height. When the visibility changed back
to visible the dimensions matched and another layout was not
performed.

This fix delays the layout until the window becomes visible again.

Fixes bug 17681754.

Change-Id: I0a3ff9479dca93e78c5d3a3df40faceffc10ecbd
2014-10-27 14:46:27 -07:00
Mike Lockwood
ac7d8c5cc8 Merge "Improve toString() methods for audio classes to help with debugging" into lmp-mr1-dev 2014-10-27 21:10:22 +00:00
Mike Lockwood
07cd124b09 Improve toString() methods for audio classes to help with debugging
bug: 18139399

Change-Id: I6076f9f5daa3b485bc80a4ff1b16a583e6c93f67
2014-10-27 14:07:35 -07:00
Jeff Sharkey
9c81373bc9 Merge "Follow ArraySet refactoring." into lmp-mr1-dev 2014-10-27 21:02:08 +00:00
Jeff Sharkey
036ebd782c Follow ArraySet refactoring.
Bug: 18115729
Change-Id: I2c32965b621b5bb57ff3bde02b00b31b59a5cd6d
2014-10-27 13:51:23 -07:00
Jeff Sharkey
49c1527cd5 Merge "Drop DEV network stats to save RAM." into lmp-mr1-dev 2014-10-27 20:38:06 +00:00
Dake Gu
4c2e3491ec Merge "ActivityTransition: Encode scaleType and matrix in snapshot view" into lmp-mr1-dev 2014-10-27 20:23:28 +00:00
Jeff Sharkey
e67b8d2829 Merge "Reduce PackageManager RAM usage: ArrayMap/Set." into lmp-mr1-dev 2014-10-27 19:57:00 +00:00
John Reck
23d307c8d8 Cleanup debug options
Bug: 18138852
Bug: 18065434
Change-Id: Ibb07b73b147c2a8b287fe8aee3f6624582f21b00
2014-10-27 12:43:25 -07:00
Eric Laurent
670a82cbb1 Merge "audioservice: fix default stream volume" into lmp-mr1-dev 2014-10-27 19:40:30 +00:00
winsonchung
f14fdda212 Fixing potential crash when the task loader is stopped. (Bug 18135583)
Change-Id: I44f766e52f05c38a1b6c4a2e7942e3d6ecaae501
2014-10-27 12:08:54 -07:00
Ying Wang
79775d4bc4 Update current.txt with generics to field types.
Bug: 17014855
Change-Id: I14672092f79374f6c5b2362bd3c2aaac84e0c2ae
2014-10-27 11:25:19 -07:00
Jeff Hao
e8d9810cde Merge "Get UsageStats if no PackageUsage is available for boot dexopt filtering." into lmp-mr1-dev 2014-10-27 17:46:23 +00:00
Wink Saville
4dec130c39 Merge "Change subId to int from long" into lmp-mr1-dev 2014-10-27 17:34:47 +00:00
Eric Laurent
91377de6f2 audioservice: fix default stream volume
When the max stream volume is configurable by
a system property, the default stream volume should
be set accordingly.

Bug: 17507571.

Change-Id: I9d9378292fc7b9c9e32acc55a275cc0ae5b203d4
2014-10-27 10:13:00 -07:00