Commit Graph

58955 Commits

Author SHA1 Message Date
Benjamin Franz
44c60415c2 Merge "Revert "Revert "Throw security exception for non-parent aware APIs""" into nyc-dev am: a900359
am: 2f6a945

* commit '2f6a94511bc009b06c5de0ee5d6bfccffcc1a031':
  Revert "Revert "Throw security exception for non-parent aware APIs""

Change-Id: Ie5900faa37cff7c9d3db03f84ccbc5a81fe83d54
2016-04-15 15:45:33 +00:00
Benjamin Franz
2f6a94511b Merge "Revert "Revert "Throw security exception for non-parent aware APIs""" into nyc-dev
am: a900359

* commit 'a90035950019434012f32b8dbc5d278894484df3':
  Revert "Revert "Throw security exception for non-parent aware APIs""

Change-Id: I52db7e2e2fdb923c9fcd231a32bec0b2f11689c9
2016-04-15 15:41:57 +00:00
Benjamin Franz
a900359500 Merge "Revert "Revert "Throw security exception for non-parent aware APIs""" into nyc-dev 2016-04-15 15:34:52 +00:00
Benjamin Franz
bc33c8290f Revert "Revert "Throw security exception for non-parent aware APIs""
This reverts commit a26c626564.

Bug: 27532279
Change-Id: I0c0394a8abf12e7382e7083a0b9d7f8385c3a63d
2016-04-15 16:08:35 +01:00
Benjamin Franz
e4c5d39432 Merge "Maybe decrypt user when quiet mode is disabled" into nyc-dev am: 2f4c229
am: f1320d1

* commit 'f1320d1d7fb91b66e82533ea6b93ffd6903d834e':
  Maybe decrypt user when quiet mode is disabled

Change-Id: I5f021888ad89e554f8b47e9ff8283f2b12bdabee
2016-04-15 15:02:01 +00:00
Benjamin Franz
f1320d1d7f Merge "Maybe decrypt user when quiet mode is disabled" into nyc-dev
am: 2f4c229

* commit '2f4c2299c7ef4b9d604b9833c790a7afd2ed75af':
  Maybe decrypt user when quiet mode is disabled

Change-Id: I0d84934a978205c283b846b7412446a064aac01c
2016-04-15 14:58:54 +00:00
Benjamin Franz
2f4c2299c7 Merge "Maybe decrypt user when quiet mode is disabled" into nyc-dev 2016-04-15 14:53:17 +00:00
Benjamin Franz
f02420c5e1 Maybe decrypt user when quiet mode is disabled
When quiet mode is disabled for a user and that user is not currently
decrypted, we show a confirm credentials screen to trigger decryption
of that user. Only if that was successful, do we actually disable quiet
mode.

Bug: 27764124
Change-Id: Ib1f649194d89e225dad62c14f3ddba1fa3d79da2
2016-04-15 14:12:41 +01:00
TreeHugger Robot
cda498e72a Merge "Metrics logging for DNS queries." into nyc-dev am: 46dc79ce
am: fb83e07

* commit 'fb83e07ada2c0379c0a644e86af4e60fc547031c':
  Metrics logging for DNS queries.

Change-Id: I95bdef31a9dee74432dd069a101ccd552377330d
2016-04-15 11:25:46 +00:00
Lorenzo Colitti
fb83e07ada Merge "Metrics logging for DNS queries." into nyc-dev
am: 46dc79ce

* commit '46dc79cecf2daf1a0e1ec392c56fcb4f7c7a8eaf':
  Metrics logging for DNS queries.

Change-Id: Ie8882a735591a28af490478a479cc60d2e853fde
2016-04-15 11:22:49 +00:00
Lorenzo Colitti
e5d75abbb9 Disambiguate NetworkCallback JavaDoc. am: 88bc0bb
am: c8a0754

* commit 'c8a0754b3d98e90a869acb9dcc8ca8ae40bcbde1':
  Disambiguate NetworkCallback JavaDoc.

Change-Id: Ibf47574237ea8467d8e536395d580bac9f8fea36
2016-04-15 09:54:58 +00:00
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
43724734d7 Metrics logging for DNS queries.
Bug: 28204408
Change-Id: I05fc9b580aa20d99e8766057e17a38b5eb6267e8
2016-04-15 16:54:39 +09: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
36c8a58cf0 Merge "Remember task which is being locked" into nyc-dev am: 5981b8c
am: 021af18

* commit '021af1800c352933d25f927dc357534c62a9e39c':
  Remember task which is being locked

Change-Id: I06c64b220fe20775510b938c5235acf026c83c7d
2016-04-15 04:40:24 +00: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
6d304c2762 Disable resize when IME is adjusted am: 698e763
am: 77efec3

* commit '77efec3b61e8083468594f288e27811281e8d515':
  Disable resize when IME is adjusted

Change-Id: I04013df69b368c8aecb53790a7985e38be4641ce
2016-04-15 04:05:32 +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
ae105e82ca Merge "Fix bug where fingerprint events can be delivered to the wrong client" into nyc-dev am: 9520505
am: 29900ea

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

Change-Id: I49d7088704373a1c2a6b77c6b3dbe0123ccca058
2016-04-15 02:15:40 +00: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
a93e7e6dc4 Merge "Revert "Optimize ResTable::getLocales() to improve bindApplication performance"" into nyc-dev am: 117cff7
am: 62047f9

* commit '62047f93d4948b5b5be1939c0700d12b960379a3':
  Revert "Optimize ResTable::getLocales() to improve bindApplication performance"

Change-Id: I01e6021b1f756351358f83ee94ef70527adcaf5f
2016-04-15 00:01:56 +00: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
Chad Brubaker
3280b8fb1e Merge "Fix isUserAddedCertificate" into nyc-dev am: 439525a
am: 69d729b

* commit '69d729b851ff07ecb4dc488a3ca10ef6cff896ea':
  Fix isUserAddedCertificate

Change-Id: I009207c3e72530db2ea54f4b40cf11f4f2537d14
2016-04-14 21:01:53 +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
Rob Carr
6ffadfdadc Merge "PopupWindow. Don\'t use -1 width/height for calculations." into nyc-dev am: 446b4e7
am: fc20f94

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

Change-Id: Id7c1a014a9a13969a358c02b70e6047f1ce78ab5
2016-04-14 20:12:11 +00:00
Amith Yamasani
757d9846b5 Merge "Multi-window assist callback" into nyc-dev am: 0d723a2
am: bb541ff

* commit 'bb541ffe5e9eda03d51cdb720259e0aeced11e37':
  Multi-window assist callback

Change-Id: I63f2c5294664ee9de34b73f2815c9214d9d3f270
2016-04-14 20:12:06 +00:00
John Reck
a749cfa88f Merge "Revert "Revert "Make stopped state a first-class thing""" into nyc-dev am: d6a25c2
am: fe16c4b

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

Change-Id: I5bd0dd197e2b33d852b48545a24cbf43670a3e4c
2016-04-14 19:37:04 +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
Chris Craik
3f379c9d66 Merge "Destroy drawing cache when switching layer type" into nyc-dev am: 2344c6a
am: 8c743b0

* commit '8c743b0ee979b9c56e595f78f2ddfba8970888be':
  Destroy drawing cache when switching layer type

Change-Id: I766d3827aec82871730f9663fdd7ae3b00527be4
2016-04-14 19:35:10 +00:00
Alan Viverette
0d877b81d2 Merge "Update day of week labels when setting month params in SimpleMonthView" into nyc-dev am: d51afa4
am: d2bead3

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

Change-Id: Ie167fc1b59aa2cf7726bf1541b3d003318dd3ba6
2016-04-14 19:34:37 +00:00
Rob Carr
d4561e3974 Merge "Add WindowManager side timeout for toasts." into nyc-dev am: b33daec
am: 6d94ed1

* commit '6d94ed11db50c7988d63badb0451753a32512a77':
  Add WindowManager side timeout for toasts.

Change-Id: I37d0958941c768c088d21170449c2e218c6c2b0e
2016-04-14 19:34:10 +00:00
TreeHugger Robot
cec5ba16e6 Merge "API Review: Improve javadoc of EXTRA_REMOTE_INPUT" into nyc-dev am: 82676d9
am: 554ffad

* commit '554ffadfb9bc01673928e86f336ec504836ba263':
  API Review: Improve javadoc of EXTRA_REMOTE_INPUT

Change-Id: Ic71944496906b6c9739297459a1ec127f9b47101
2016-04-14 19:31:22 +00:00
Daniel Sandler
aefdfa5721 Merge "Allow system apps to substitute a different app name in notifications." into nyc-dev am: 3af45bd
am: 73a694b

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

Change-Id: Id47615712e65e8a11edd68dcd729824c9c37c85a
2016-04-14 19:29:49 +00:00
Gustav Sennton
35562f764b Verify WebView package info before loading WebView am: cd8f273
am: 9e5a257

* commit '9e5a25702d1d00864b94915944af68d9b92712ef':
  Verify WebView package info before loading WebView

Change-Id: I18d87f83b46366169d6c6dbd9a1b7225e3d1a173
2016-04-14 19:29:22 +00:00
Niels Egberts
4f5fa52151 Merge "Fix issue when QUEUE_DESTROY arrive at the same time." into nyc-dev am: e767e1b
am: 3feb21c

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

Change-Id: I445c2697a87f87182e57fc77537932a536b80ed3
2016-04-14 19:28:53 +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
TreeHugger Robot
ceac5dd9de Merge "Also log IPv4 and IPv6 connectivity of any previous default network" into nyc-dev am: 0628d32
am: 886d17c

* commit '886d17c035805cef3bce3d2d96e53ba48bf5b62b':
  Also log IPv4 and IPv6 connectivity of any previous default network

Change-Id: I8c82f1058531d1f5a0cdb73314b8fd742dae7860
2016-04-14 19:26:50 +00:00
Clara Bayarri
7b02468b34 Merge "Provide startIntentSenderForResult for fragments" into nyc-dev am: 6e58549
am: bdcd8dc

* commit 'bdcd8dce23ad83a696fc350374abde50ee91c6d0':
  Provide startIntentSenderForResult for fragments

Change-Id: I5746132388eabcf5e29a948cb36d30745ae73887
2016-04-14 19:26:09 +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
Bernard Chau
60b73587bb Merge "Includes both direct boot aware and unaware apps in Apps default view" into nyc-dev am: 25c43b7
am: d17b301

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

Change-Id: I85630c13799c9bbaa558a0f1582691f7a00e0b86
2016-04-14 18:52:53 +00:00
Hugo Benichi
018a9d3127 Merge "Add DHCP error event class and record DHCP errors." into nyc-dev am: fc18b6f
am: 39de1e2

* commit '39de1e2de51f4c0789904abb1623c8b7d648411e':
  Add DHCP error event class and record DHCP errors.

Change-Id: I8262883d6178be380265cf35497782f35dab043c
2016-04-14 18:52:01 +00:00