Commit Graph

63643 Commits

Author SHA1 Message Date
Lorenzo Colitti
c8a0754b3d Disambiguate NetworkCallback JavaDoc.
am: 88bc0bb

* commit '88bc0bbb13cee43e777fd88c2681d1f033faece5':
  Disambiguate NetworkCallback JavaDoc.

Change-Id: Ib930e2516d2a6d2027ea35ab8d978bca8faa7a20
2016-04-15 09:52:13 +00:00
Lorenzo Colitti
88bc0bbb13 Disambiguate NetworkCallback JavaDoc.
The JavaDoc for many of the requestNetwork and
[un]registerNetworkCallback APIs incorrectly mentions the
PendingIntent version of the APIs instead of the NetworkCallback
version.

Also fix a minor issue in the registerDefaultNetworkCallback
JavaDoc: the default network request is an implementation detail,
so don't mention it. Instead, talk about the "system default
network".

Change-Id: Id94d98261daa2bd768c10e033cb8092729b21c91
2016-04-15 16:24:13 +09:00
Andrii Kulian
021af1800c Merge "Remember task which is being locked" into nyc-dev
am: 5981b8c

* commit '5981b8c2e8f6363d1f3bf09e7f1b3b5fb9a3846a':
  Remember task which is being locked

Change-Id: Id672304edaa6a02777e79fe6b4fcdd64e3c5f7e8
2016-04-15 04:37:48 +00:00
Andrii Kulian
5981b8c2e8 Merge "Remember task which is being locked" into nyc-dev 2016-04-15 04:32:57 +00:00
Jorim Jaggi
77efec3b61 Disable resize when IME is adjusted
am: 698e763

* commit '698e7634aa2ced554f564f588c2e878fb35757a3':
  Disable resize when IME is adjusted

Change-Id: I27772f9325668c48d878533074d72b07ad78f909
2016-04-15 04:00:31 +00:00
Jorim Jaggi
698e7634aa Disable resize when IME is adjusted
Bug: 28175599
Change-Id: I338dd230443973d912f17946ed722789b0f545a2
2016-04-14 20:45:56 -07:00
Andrii Kulian
0f051f5abd Remember task which is being locked
We need to remember task which requested to be locked
because we can accidentally lock another task after
user interacts with pinning request dialog.

Bug: 27876860
Change-Id: Ie8e607df4380dd33ea9b3474afc247b02e31de07
2016-04-14 19:26:18 -07:00
Jim Miller
29900ea751 Merge "Fix bug where fingerprint events can be delivered to the wrong client" into nyc-dev
am: 9520505

* commit '952050539c991fcf58cd1f336193aa04890ad0a3':
  Fix bug where fingerprint events can be delivered to the wrong client

Change-Id: Ie924a9b1f05ed7988a5b897ef3c3f35b088080ff
2016-04-15 01:39:49 +00:00
Jim Miller
952050539c Merge "Fix bug where fingerprint events can be delivered to the wrong client" into nyc-dev 2016-04-15 01:33:15 +00:00
Jim Miller
cb2ce6f1f0 Fix bug where fingerprint events can be delivered to the wrong client
- Make FingerprintService more closely track the expected state of fingerprintd.
- Don't switch to a new operation until fingerprintd completes previous operation.
- Refactor clients into separate classes and add tracking logic.
- Add missing enumerate()/cancelEnumeration() methods to IFingerprintDaemon
- Make late-binding decision of "foregroundness" of activity so that it's
decided in the order the events are actually handled.
- Add more logging so we can determine FingerprintService state when errors occur.
- Cache a copy of authenticator_id from the last time it was set so we don't
interrupt the driver during actual authentication.
- Don't allow clients to access authenticator_id unless they're current.

Fixes: 27902478, 26273819
Change-Id: Ic1f9e30bd89bcdbb8fe7f69e0545e68339317721
2016-04-14 17:53:45 -07:00
Tim Murray
62047f93d4 Merge "Revert "Optimize ResTable::getLocales() to improve bindApplication performance"" into nyc-dev
am: 117cff7

* commit '117cff790e34948e847d724be624ed2dd00bc82c':
  Revert "Optimize ResTable::getLocales() to improve bindApplication performance"

Change-Id: I86b5cc6eddf38cdd015fe80f1180ca246a97352a
2016-04-14 23:58:22 +00:00
Tim Murray
117cff790e Merge "Revert "Optimize ResTable::getLocales() to improve bindApplication performance"" into nyc-dev 2016-04-14 23:48:17 +00:00
Tim Murray
98e80076c6 Revert "Optimize ResTable::getLocales() to improve bindApplication performance"
This reverts commit 5520581b5f.

bug 28189634

Change-Id: I2d2b859f6d9bd44434fa901cce990583f514980c
2016-04-14 16:06:29 -07:00
Joe Onorato
ef9bc11ddb Merge "Add support for null tag names from apps." into nyc-dev
am: 9a916e5

* commit '9a916e5602908f579ac846680270677c5a89e5a4':
  Add support for null tag names from apps.

Change-Id: Iff0ce8b4faeb935e70ce9bef6fba322707e5aa7d
2016-04-14 21:17:03 +00:00
Joe Onorato
9a916e5602 Merge "Add support for null tag names from apps." into nyc-dev 2016-04-14 21:10:16 +00:00
Chad Brubaker
69d729b851 Merge "Fix isUserAddedCertificate" into nyc-dev
am: 439525a

* commit '439525a99372edcd92e02ca2ec52a0f24b775348':
  Fix isUserAddedCertificate

Change-Id: I9a3a3c518fa634be2911848b0c12ed3d62999a6e
2016-04-14 20:54:19 +00:00
Chad Brubaker
439525a993 Merge "Fix isUserAddedCertificate" into nyc-dev 2016-04-14 20:48:53 +00:00
Oren Blasberg
672d0e762d Merge "Don\'t show icons in overlay popup menus." into nyc-dev
am: 203222e

* commit '203222ea6077c1e0155971fee1cb6917b8055117':
  Don't show icons in overlay popup menus.

Change-Id: I7abab9b6fb52ca17a811a0917f4955db9c9393e7
2016-04-14 20:46:36 +00:00
Oren Blasberg
203222ea60 Merge "Don't show icons in overlay popup menus." into nyc-dev 2016-04-14 20:34:54 +00:00
Robert Carr
fc20f94702 Merge "PopupWindow. Don\'t use -1 width/height for calculations." into nyc-dev
am: 446b4e7

* commit '446b4e727d228caccc635cd69e14fc9faba8ec7f':
  PopupWindow. Don't use -1 width/height for calculations.

Change-Id: Ia6381a9c301bb24deaade51afe41bdbdff43e6e2
2016-04-14 19:36:01 +00:00
Rob Carr
446b4e727d Merge "PopupWindow. Don't use -1 width/height for calculations." into nyc-dev 2016-04-14 19:28:42 +00:00
Amith Yamasani
bb541ffe5e Merge "Multi-window assist callback" into nyc-dev
am: 0d723a2

* commit '0d723a2a4d83db5f01aa5a21f3cbd9d2b608bced':
  Multi-window assist callback

Change-Id: I4a0564800bb4c7a19a415ff109836827c4feb0e7
2016-04-14 19:12:57 +00:00
Amith Yamasani
0d723a2a4d Merge "Multi-window assist callback" into nyc-dev 2016-04-14 19:06:40 +00:00
Joe Onorato
388fc336b3 Add support for null tag names from apps.
For Wakelocks and syncs there is no requirement that an app actually
supply a tag/name.  Jobs will always have system-supplied tags.

Bug: 26276001
Change-Id: Ie3b8e48a395de1506a2f15d5b9c9eab726bc6d0a
2016-04-14 11:46:56 -07:00
Oren Blasberg
3610d06239 Don't show icons in overlay popup menus.
This was a "regression" in CascadingMenuPopup specifically.
We now check for the overflow case and don't show icons.
This preserves the behavior from Marshmallow.

Bug: 28026351
Change-Id: Ifbc9a20b0dadd19ef7b727023b1b0cfa45ebf993
2016-04-14 11:14:09 -07:00
John Reck
fe16c4b105 Merge "Revert "Revert "Make stopped state a first-class thing""" into nyc-dev
am: d6a25c2

* commit 'd6a25c2b3e7fd5a98741e2f770cf54d539b29258':
  Revert "Revert "Make stopped state a first-class thing""

Change-Id: Iff85c259e93a54c3e3a9db3f3d2b2f826526de0a
2016-04-14 17:47:40 +00:00
John Reck
d6a25c2b3e Merge "Revert "Revert "Make stopped state a first-class thing""" into nyc-dev 2016-04-14 17:40:52 +00:00
John Reck
8afcc76920 Revert "Revert "Make stopped state a first-class thing""
This reverts commit eab3f2658a.

Fixes first-frame issue, mReportNextDraw needs to override
mStopped

Fixes: 28118961
Fixes: 27286867

Change-Id: I5c811759637d08ba9f3b342016d1b3006986d5a2
2016-04-14 10:39:03 -07:00
Chris Craik
8c743b0ee9 Merge "Destroy drawing cache when switching layer type" into nyc-dev
am: 2344c6a

* commit '2344c6a2ae0d6ccd650a13aaedb403fa7e3ea579':
  Destroy drawing cache when switching layer type

Change-Id: I6b455a94c9fa8219201cc32099493fecf82afafc
2016-04-14 17:12:02 +00:00
Chris Craik
2344c6a2ae Merge "Destroy drawing cache when switching layer type" into nyc-dev 2016-04-14 17:07:35 +00:00
Alan Viverette
d2bead39e4 Merge "Update day of week labels when setting month params in SimpleMonthView" into nyc-dev
am: d51afa4

* commit 'd51afa4525659658b9dbce381761e37a9b931d55':
  Update day of week labels when setting month params in SimpleMonthView

Change-Id: I5f0d84e29b69ecbb2b0a86d7859bb614baddc4c0
2016-04-14 16:50:25 +00:00
Robert Carr
6d94ed11db Merge "Add WindowManager side timeout for toasts." into nyc-dev
am: b33daec

* commit 'b33daec8c2e9e12cdb9c7e5db388656fd8aff98f':
  Add WindowManager side timeout for toasts.

Change-Id: I95c5eae99da60c47a1986bab07f6b2fe4f550327
2016-04-14 16:50:23 +00:00
Alan Viverette
d51afa4525 Merge "Update day of week labels when setting month params in SimpleMonthView" into nyc-dev 2016-04-14 16:27:34 +00:00
Rob Carr
b33daec8c2 Merge "Add WindowManager side timeout for toasts." into nyc-dev 2016-04-14 16:23:24 +00:00
Adrian Roos
554ffadfb9 Merge "API Review: Improve javadoc of EXTRA_REMOTE_INPUT" into nyc-dev
am: 82676d9

* commit '82676d9f8810f4ab3e943e89df135cc87857f537':
  API Review: Improve javadoc of EXTRA_REMOTE_INPUT

Change-Id: Ic9c091ae358bd55b2d8d4f7ffbb688028cb2cc30
2016-04-14 14:49:45 +00:00
TreeHugger Robot
82676d9f88 Merge "API Review: Improve javadoc of EXTRA_REMOTE_INPUT" into nyc-dev 2016-04-14 14:45:00 +00:00
Alan Viverette
08dbbcdc9b Update day of week labels when setting month params in SimpleMonthView
Bug: 27310206
Change-Id: I40c09fb5dddb202a17ac9c6ecee1d6f40644d9e6
2016-04-14 10:15:04 -04:00
Dan Sandler
73a694b486 Merge "Allow system apps to substitute a different app name in notifications." into nyc-dev
am: 3af45bd

* commit '3af45bd2d06303bfaf8ba28324ca976e6f96ece3':
  Allow system apps to substitute a different app name in notifications.

Change-Id: I5fc24757a4db46a499f5638c04922e131c79d1f9
2016-04-14 13:59:20 +00:00
Gustav Sennton
9e5a25702d Verify WebView package info before loading WebView
am: cd8f273

* commit 'cd8f2737cc550ef1461c74a5c748777fa0c97379':
  Verify WebView package info before loading WebView

Change-Id: I75b306ddc59ace1a5d6613a0fbdb0c8c801333c2
2016-04-14 13:59:17 +00:00
Daniel Sandler
3af45bd2d0 Merge "Allow system apps to substitute a different app name in notifications." into nyc-dev 2016-04-14 13:53:19 +00:00
Dan Sandler
732bd6cb27 Allow system apps to substitute a different app name in notifications.
This is a privileged permission and is only to be used by
the core OS and related packages whose names are confusing
or misleading when shown in notifications.

The user will always be able to see the true package name by
accessing the notification inspector (longpress or swipe
gesture on the notification row in SystemUI).

Fixes: 26517701
Change-Id: I2b021c9da0757b99df76399666af263668d88070
2016-04-14 13:48:03 +00:00
Gustav Sennton
cd8f2737cc Verify WebView package info before loading WebView
To ensure that the package we are using to load WebView is a valid
provider we need to verify this before loading WebView - not only when
choosing what package to use.

Bug: 27900925
Change-Id: If57ca32a7a3fa08735a3b8ea9ed268c1bb1b8ede
2016-04-14 14:19:07 +01:00
Niels Egberts
3feb21c44f Merge "Fix issue when QUEUE_DESTROY arrive at the same time." into nyc-dev
am: e767e1b

* commit 'e767e1bc17eeb4302ef503bcc83ed8697db91433':
  Fix issue when QUEUE_DESTROY arrive at the same time.

Change-Id: Ic1d42d8b74ec27be4a3d57c3df8c221d5907c739
2016-04-14 12:39:21 +00:00
Niels Egberts
e767e1bc17 Merge "Fix issue when QUEUE_DESTROY arrive at the same time." into nyc-dev 2016-04-14 12:33:05 +00:00
Erik Kline
886d17c035 Merge "Also log IPv4 and IPv6 connectivity of any previous default network" into nyc-dev
am: 0628d32

* commit '0628d324d0f1c2116c051faadd8e4bf26206b1a6':
  Also log IPv4 and IPv6 connectivity of any previous default network

Change-Id: Ibcbd79a6674cf062138ccbd031d14721b0367e22
2016-04-14 10:20:17 +00:00
TreeHugger Robot
0628d324d0 Merge "Also log IPv4 and IPv6 connectivity of any previous default network" into nyc-dev 2016-04-14 10:14:20 +00:00
Clara Bayarri
bdcd8dce23 Merge "Provide startIntentSenderForResult for fragments" into nyc-dev
am: 6e58549

* commit '6e5854974098e4e2f734510e7dd8221a324f34ad':
  Provide startIntentSenderForResult for fragments

Change-Id: I363540141afa80476fe0db79103c0df08794a5ae
2016-04-14 10:11:15 +00:00
Clara Bayarri
6e58549740 Merge "Provide startIntentSenderForResult for fragments" into nyc-dev 2016-04-14 10:05:35 +00:00
Bernard Chau
d17b3013ce Merge "Includes both direct boot aware and unaware apps in Apps default view" into nyc-dev
am: 25c43b7

* commit '25c43b78d11f74e98ba9d5f541647aa5ed44ebce':
  Includes both direct boot aware and unaware apps in Apps default view

Change-Id: I23eeef915a4607aa387e826056056cb7632a4542
2016-04-14 09:45:55 +00:00
Bernard Chau
25c43b78d1 Merge "Includes both direct boot aware and unaware apps in Apps default view" into nyc-dev 2016-04-14 09:40:00 +00:00