Commit Graph

58069 Commits

Author SHA1 Message Date
Adam Powell
c108628d33 Merge "Retain loaders through stopped config changes" into nyc-dev
am: e33901c

* commit 'e33901c2328d4583d5e6913f83e939960dda4263':
  Retain loaders through stopped config changes

Change-Id: Iefbafb4774933dde3acaee36f50f364fe0b3af76
2016-04-15 21:49:01 +00:00
Adam Powell
e33901c232 Merge "Retain loaders through stopped config changes" into nyc-dev 2016-04-15 21:40:53 +00:00
Svetoslav Ganov
7deea71671 Merge "Properly notify magnification listener" into nyc-dev
am: 286c5b7

* commit '286c5b7741dc7632e28f352a4be9bc79dde2d177':
  Properly notify magnification listener

Change-Id: I072355926cec46b71f62ece522d199672ce12d37
2016-04-15 21:39:34 +00:00
Svetoslav Ganov
286c5b7741 Merge "Properly notify magnification listener" into nyc-dev 2016-04-15 21:32:05 +00:00
Svetoslav Ganov
7d477d4845 Properly notify magnification listener
bug:28088856

Change-Id: Iffd848082f035319aab3af177921bb3085844ab0
2016-04-15 14:30:47 -07:00
Jorim Jaggi
c6eca1da44 Merge "Fix wrong transition when dock minimized and docked app launched" into nyc-dev
am: b3e26a9

* commit 'b3e26a9b414da986963bade0e18a80a20851c74a':
  Fix wrong transition when dock minimized and docked app launched

Change-Id: Ie1982a5e495794e8624c93e970896445579fa98f
2016-04-15 20:54:37 +00:00
TreeHugger Robot
b3e26a9b41 Merge "Fix wrong transition when dock minimized and docked app launched" into nyc-dev 2016-04-15 20:46:40 +00:00
Tyler Gunn
5ee2dd9251 Merge "Hide multi-endpoint APIs." into nyc-dev
am: d54c077

* commit 'd54c077d0890ae82f35d6fa658e58ff2a1f1f354':
  Hide multi-endpoint APIs.

Change-Id: Ic77a7bd75346deb745cc9ec252b73259b4409101
2016-04-15 20:35:08 +00:00
Tyler Gunn
d54c077d08 Merge "Hide multi-endpoint APIs." into nyc-dev 2016-04-15 20:28:57 +00:00
John Reck
9e06acf392 Merge "Add a callback for when a gl functor is released" into nyc-dev
am: 85cfc8c

* commit '85cfc8c368523359be8c12b8551e122b94972ab7':
  Add a callback for when a gl functor is released

Change-Id: Ie9f602710d46faf045d04ff425bee8428d6fe9c7
2016-04-15 19:32:51 +00:00
John Reck
85cfc8c368 Merge "Add a callback for when a gl functor is released" into nyc-dev 2016-04-15 19:26:16 +00:00
Jorim Jaggi
681fc7b267 Fix wrong transition when dock minimized and docked app launched
When having an app docked and then going home, and then launching
the app from the homescreen, we had a wrong transition because
getTopMost task was already set to the launched app, because
getRunningTasks doesn't exclude the docked stack. Instead of adding
flags for getRunningTasks, which sounds risky, we just pass a "force"
value when we launch recents in this state.

Bug: 27154882
Change-Id: Iee4512fed13115dbbe8b74413ff1fa9b87afa0ef
2016-04-15 19:23:05 +00:00
Pavel Zhamaitsiak
229e5179ba Merge "Make ConnectivityMetricsLogger and related classes @SystemApi" into nyc-dev
am: 74870c4

* commit '74870c441fde0aa141edca84f066d1ace4cf5db5':
  Make ConnectivityMetricsLogger and related classes @SystemApi

Change-Id: Id302c045286578163c40eb02108d675c6031afc5
2016-04-15 18:53:52 +00:00
Pavel Zhamaitsiak
74870c441f Merge "Make ConnectivityMetricsLogger and related classes @SystemApi" into nyc-dev 2016-04-15 18:45:06 +00:00
Tyler Gunn
1bf206b766 Hide multi-endpoint APIs.
Per feature council decision, the multi-endpoint APIs will be @hide for
the N release.

Bug: 28196918
Change-Id: Ia80b089bc754ce87ca208382eb79442b5265844d
2016-04-15 11:28:44 -07:00
Adam Powell
cbade7f4d3 Retain loaders through stopped config changes
Framework edition

Previously we would throw away any stopped LoaderManagers when we went
to retain instances to pass along as nonConfigurationInstances during
config changes or similar activity restarts. This causes loaders to do
more work than they need to when a calling activity starts a new
activity on top, a config change happens (e.g. screen rotation) and
then the top activity is finished, restarting the caller in a new
configuration. The loaders would go through onReset unnecessarily,
potentially throwing away data to be reloaded again after the config
change completes.

Instead of throwing away stopped LoaderManagers in this case, restart
them and retain them across the config change so they can resume where
they left off.

Bug 27176186

Change-Id: Ia52c6448d2ad41dcb25d493770d9ffae20a19d2a
2016-04-15 11:14:37 -07:00
John Reck
cd1c3eba69 Add a callback for when a gl functor is released
Bug: 27709981

Change-Id: Id5be3e8f88d6d84a9c59c7ed23e7e8862feefbe8
2016-04-15 10:56:53 -07:00
Todd Kennedy
9ed9ea93da Fix parse flags
am: d022ac2

* commit 'd022ac21ebcb441314b80b6d8f0656939f2480e5':
  Fix parse flags

Change-Id: I6dac4b1fea72cbc099251d183fcad81084f0d791
2016-04-15 17:40:47 +00:00
Todd Kennedy
d022ac21eb Fix parse flags
Setting PARSE_IS_SYSTEM to the parse flags happens long after the
APK is actually parsed. So, we fail to pick up the boot aware and
protected storage attributes. Instead, always pull them from the
manifest, but, remove the flags if the package is not actually a
system package.

Also, we were incorrectly skipping certificate verification if
the flag PARSE_IS_SYSTEM was set. However, this flag is used for
_any_ system package -- whether it's physically on /system or if
it's an unbundled update. Instead, we should only skip this step
if the flag PARSE_IS_SYSTEM_DIR. We can implicitly trust any
APK actually stored in /system.

On a different note ... At some point, we will break apart the
parse flags into actual parse flags [i.e. those that change
physically parsing an APK] and policy flags [i.e. those that
change the interpretation of the APK contents].

Bug: 28116074
Bug: 28088617
Change-Id: I85246b0cb18fb5647df3618107910e288137fbc7
2016-04-15 17:04:14 +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
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
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
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
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
Pavel Zhamaitsiak
f6f24c03f3 Make ConnectivityMetricsLogger and related classes @SystemApi
Bug: 25691077
Change-Id: Ia98d0a52a9541d9ae773be2b0e962d609f9dd7ee
2016-04-14 19:15:23 -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
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
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
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