Commit Graph

64696 Commits

Author SHA1 Message Date
Chien-Yu Chen
79291b09a5 Merge "Camera2: Stop repeating request for abandoned output" into nyc-dev am: dfe920d
am: 767d366

* commit '767d3668422ad00d239853ab6ca68dfc790ffe42':
  Camera2: Stop repeating request for abandoned output

Change-Id: I61b623a9eaf9772fc2a562b822a145513f8c4149
2016-04-15 23:47:22 +00:00
Chien-Yu Chen
767d366842 Merge "Camera2: Stop repeating request for abandoned output" into nyc-dev
am: dfe920d

* commit 'dfe920d3bb3a1b896d3b16d1b58bd7d56fc2e70d':
  Camera2: Stop repeating request for abandoned output

Change-Id: I9c5e31e5476e860d7b1ac974d62ae6fb5646069a
2016-04-15 23:44:33 +00:00
Chien-Yu Chen
dfe920d3bb Merge "Camera2: Stop repeating request for abandoned output" into nyc-dev 2016-04-15 23:38:14 +00:00
Aurimas Liutikas
e38f2e2cfd Merge "Increase SearchView touch targets to meet GAR3." into nyc-dev am: d0612e7
am: fd72016

* commit 'fd72016a1c8e05fbd7b1e8b8130daefb5db43cb1':
  Increase SearchView touch targets to meet GAR3.

Change-Id: Ife4789e2da784d60fb81fcbfc963573b79922da4
2016-04-15 23:20:28 +00:00
Aurimas Liutikas
fd72016a1c Merge "Increase SearchView touch targets to meet GAR3." into nyc-dev
am: d0612e7

* commit 'd0612e74f27844904af55ddb133522cec4298058':
  Increase SearchView touch targets to meet GAR3.

Change-Id: I355146f0ada66b3cc6e029193cc1d3e015162a0b
2016-04-15 23:16:31 +00:00
Chien-Yu Chen
2da496f1ce Camera2: Stop repeating request for abandoned output
Stop repeating request if any of its output stream is abandoned
and notify that repeating request has been stopped.

Update binder tests for binder interface changes.

Update CameraDeviceImpl to expect an exception when canceling
a repeating request that is already stopped.

Bug: 21270879
Change-Id: I9fa72ae7218948aac88cb1a8e57839bd022c4a5e
2016-04-15 16:04:18 -07:00
Aurimas Liutikas
d0612e74f2 Merge "Increase SearchView touch targets to meet GAR3." into nyc-dev 2016-04-15 22:47:11 +00:00
John Reck
fb25fd47fa Merge "Fix sw legacy compat path in SurfaceView" into nyc-dev am: 736a525
am: 8fdfaf3

* commit '8fdfaf381257c330d4c919ce5edd0564c89d9313':
  Fix sw legacy compat path in SurfaceView

Change-Id: I5c4c9d2194da8987c7a9612448433d8bf83cf3d0
2016-04-15 22:39:34 +00:00
John Reck
8fdfaf3812 Merge "Fix sw legacy compat path in SurfaceView" into nyc-dev
am: 736a525

* commit '736a52538a9072a96dab02c14c89bb2e0a92c645':
  Fix sw legacy compat path in SurfaceView

Change-Id: I6d5961535ce22cf699478e28dd1b6c3e0d6e1379
2016-04-15 22:34:17 +00:00
John Reck
736a52538a Merge "Fix sw legacy compat path in SurfaceView" into nyc-dev 2016-04-15 22:22:41 +00:00
Adam Powell
f4cfbeda87 Merge "Retain loaders through stopped config changes" into nyc-dev am: e33901c
am: c108628

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

Change-Id: Ib63609d91efae1549c61b4f5fb8f2a1b24fe7ece
2016-04-15 21:52:14 +00:00
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
Svetoslav Ganov
d2dbb241c4 Merge "Properly notify magnification listener" into nyc-dev am: 286c5b7
am: 7deea71

* commit '7deea716713b6563dc60ed8a60ad300b09b20aff':
  Properly notify magnification listener

Change-Id: I3035fef78780f843a700545b50dbf801d776853e
2016-04-15 21:45:32 +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
Aurimas Liutikas
c8fd00a046 Increase SearchView touch targets to meet GAR3.
- Allow SearchView to expand to 48dp height if possible.
- Make the search clear button have 48dp height if possible.
- Expand the search TextView touch target height to 48dp is possible.

Framework version of patch ag/912646

Bug: 19479861
Change-Id: Ibaaef2afa20b8c05eaac8f028df4f616f2f96eb1
2016-04-15 13:59:39 -07:00
TreeHugger Robot
dda437bfc6 Merge "Fix wrong transition when dock minimized and docked app launched" into nyc-dev am: b3e26a9
am: c6eca1d

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

Change-Id: I0ac8d03b489bae6eb3ca0aec4cf4a3e110d9ede8
2016-04-15 20:58:10 +00: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
John Reck
f057fb56f6 Fix sw legacy compat path in SurfaceView
Fixes: 28074239

Need to convert from scaled window to screen before
updating position of the SurfaceView

Change-Id: I75dec23408c32ec01e88193ea38b1fb253b3fd6f
2016-04-15 13:46:29 -07:00
Tyler Gunn
be414324ae Merge "Hide multi-endpoint APIs." into nyc-dev am: d54c077
am: 5ee2dd9

* commit '5ee2dd9251d961167d5150bb2582e4d143aa4bc7':
  Hide multi-endpoint APIs.

Change-Id: Ia516afdedc79284116f99b9bcd153b3fca841566
2016-04-15 20:41:47 +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
9a7fa83bc5 Merge "Add a callback for when a gl functor is released" into nyc-dev am: 85cfc8c
am: 9e06acf

* commit '9e06acf392e82cb539b9e40ec9909a9c8dbc221b':
  Add a callback for when a gl functor is released

Change-Id: I4f3d272a598f45a6124a6fc64f9178f1c4d659a0
2016-04-15 19:36:15 +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
ccfa19f139 Merge "Make ConnectivityMetricsLogger and related classes @SystemApi" into nyc-dev am: 74870c4
am: 229e517

* commit '229e5179ba1915b5beb86b0d7989fb356bef9966':
  Make ConnectivityMetricsLogger and related classes @SystemApi

Change-Id: Ia33ecf02187f0c945c0e70d6d939c310cca3c6e1
2016-04-15 18:57:18 +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
Siyamed Sinir
3f3dc2c7e9 Merge "Update autoLink URL regex to match empty path, $ and _" 2016-04-15 18:18:59 +00: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
d7ed181f64 Fix parse flags am: d022ac2
am: 9ed9ea9

* commit '9ed9ea93da20c1fac32c387a7831570eebfaf4a8':
  Fix parse flags

Change-Id: Ib452d9bc69ffd16fc1f86ce3fa60ca8d76d5f355
2016-04-15 17:43:56 +00: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
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