Commit Graph

62235 Commits

Author SHA1 Message Date
Jeff Sharkey
3d4ed8b46c Merge \\"Don\\'t cache external storage directories.\\" into nyc-mr1-dev am: d683945251
am: fd6071215e

Change-Id: Ie682229c7f30f2229b36d55773b8c5a4c6a190f6
2016-07-06 22:59:54 +00:00
Daniel Nishi
57e845b51b Merge "resolve merge conflicts of 7145cac to master" 2016-07-06 22:45:37 +00:00
Daniel Nishi
3fd8c801ba resolve merge conflicts of 7145cac to master
Change-Id: Idd0a8de30697687309953fd37b568207d2fc0be8
2016-07-06 14:04:36 -07:00
Jeff Sharkey
fd6071215e Merge \"Don\'t cache external storage directories.\" into nyc-mr1-dev
am: d683945251

Change-Id: I67dbd3da95b5134bf013ca3deb51fd00b47d94cd
2016-07-06 20:54:48 +00:00
Tor Norbye
eecaafb9cc Merge "Add @AnyThread, @Dimension and @Px" 2016-07-06 20:50:50 +00:00
TreeHugger Robot
d683945251 Merge "Don't cache external storage directories." into nyc-mr1-dev 2016-07-06 20:47:51 +00:00
Daniel Nishi
7145cace64 Merge \"Move the MIME type icon detection into the platform.\" into nyc-mr1-dev
am: 9459f93c97

Change-Id: I151a72b8ee1c16ef94da70e85378dd44b4ac077c
2016-07-06 20:02:45 +00:00
Andreas Gampe
df5c966cac Merge \\"Frameworks/base: Refactor UserHandle and Environment a bit\\" into nyc-mr1-dev am: e6fcebbf50
am: 9b4725d071

Change-Id: I2c6c65c9e1445e02c8e0e264090cbb4d62295d39
2016-07-06 20:02:44 +00:00
Andreas Gampe
9b4725d071 Merge \"Frameworks/base: Refactor UserHandle and Environment a bit\" into nyc-mr1-dev
am: e6fcebbf50

Change-Id: Ib6be1e72ad9b0350256ec208c6aee051b746f9d0
2016-07-06 19:57:08 +00:00
Daniel Nishi
9459f93c97 Merge "Move the MIME type icon detection into the platform." into nyc-mr1-dev 2016-07-06 19:54:27 +00:00
Andreas Gampe
6e16714c68 Frameworks/base: Refactor UserHandle and Environment a bit
Refactor slightly to forbid using myUserId in the zygote (uid == 0).
Also factor Environment to put user data (vs shared data) into its
own class, which should keep the page the shared data is on actually
shared between processes.

Bug: 29338430
Change-Id: I05d1306b57658a83299e38076171f56cb364ea80
2016-07-06 18:07:44 +00:00
Daniel Nishi
c29d2b0492 Move the MIME type icon detection into the platform.
This allows the MIME type icons to be used in other system apps.
In this instance, the StorageManager app needs to show file icons
for a given file. By moving the icon mapping into a static library,
we can avoid duplicating the mapping and resources.

Bug: 29826961
Change-Id: Ic2dc7970cc5a5ca430e33425eb9f1ecbd733fe9a
2016-07-06 10:57:06 -07:00
Erik Kline
c179797f8e Merge \\"[net mgmt svc] add method to retrieve INetd reference\\" into nyc-mr1-dev am: 58ef88927d
am: e62b36bb33

Change-Id: Icf35de6a5a0dcc356cce4cf5d183aed647f35cc6
2016-07-06 13:21:51 +00:00
Erik Kline
e62b36bb33 Merge \"[net mgmt svc] add method to retrieve INetd reference\" into nyc-mr1-dev
am: 58ef88927d

Change-Id: Ide0d1043f4047593c10dcb1a1e3ca5c644c6496c
2016-07-06 13:15:47 +00:00
Erik Kline
4e37b70440 [net mgmt svc] add method to retrieve INetd reference
Bug: 21859053
Bug: 28135208
Change-Id: Idfb5ca65788ae8c7aea91f12d9d461686ad836d6
2016-07-06 19:32:01 +09:00
Hugo Benichi
58caee56cf Merge \\"IpConn metrics: use @IntDef\\" into nyc-mr1-dev am: 018a205824
am: 48d9a3d42f

Change-Id: I526e118a53f6402c1728df33c623d281c3ae3e79
2016-07-05 15:02:04 +00:00
Hugo Benichi
48d9a3d42f Merge \"IpConn metrics: use @IntDef\" into nyc-mr1-dev
am: 018a205824

Change-Id: Ie2b1fc7934ea51bd65a9f360fa3949c2f03afe01
2016-07-05 14:51:02 +00:00
TreeHugger Robot
018a205824 Merge "IpConn metrics: use @IntDef" into nyc-mr1-dev 2016-07-05 14:39:47 +00:00
Hugo Benichi
cf6b12f50a IpConn metrics: use @IntDef
Change-Id: Iae23f04abd3d1a43e7217f4fd641cd5fa61a7a1b
2016-07-05 21:52:15 +09:00
Hugo Benichi
fc47039136 Merge \\"IpConn metrics: correctly read RA lifetimes\\" into nyc-mr1-dev am: 54756fdfd9
am: 5142df5613

Change-Id: I4d4edbdd30a4a2c321d0141faaa8a0d227c9823a
2016-07-05 12:47:19 +00:00
Hugo Benichi
5142df5613 Merge \"IpConn metrics: correctly read RA lifetimes\" into nyc-mr1-dev
am: 54756fdfd9

Change-Id: Iabf3cfa4b6aaf5a1fbda6f169a65a1c7c117fd32
2016-07-05 12:38:42 +00:00
Hugo Benichi
8acc08ed9d IpConn metrics: add dhcp transition times am: 176ed01a1f
am: a2595b3b22

Change-Id: Ie7394b77e2200fe80ec0dd62ce83cb476706d354
2016-07-05 12:38:14 +00:00
Hugo Benichi
a2595b3b22 IpConn metrics: add dhcp transition times
am: 176ed01a1f

Change-Id: I0375b97958614c4a1d1e9f904beef07d55c43462
2016-07-05 12:29:59 +00:00
Hugo Benichi
54756fdfd9 Merge "IpConn metrics: correctly read RA lifetimes" into nyc-mr1-dev 2016-07-05 12:25:55 +00:00
Hugo Benichi
176ed01a1f IpConn metrics: add dhcp transition times
This patch adds lifetime durations of DhcpClient states to
DhcpClientEvents.

To record the duration of a state, the event is now recorded when the
DhcpClient state machine exits that state.

In addition this patch removes event logging of StoppedState,
DhcpState and DhcpHaveLeaseState.

Change-Id: Ibd37b5e3070f35113b6b45942b1e1ff19c27a90b
2016-07-05 17:32:56 +09:00
Hugo Benichi
6ccd51a338 IpConn metrics: correctly read RA lifetimes
This patch
  - adds a Builder class for RaEvent.
  - uses this Builder class for correctly recording the minimum
    lifetime seen for every ICMP6 options tracked, instead of
    recording the last lifetime seen.
  - adds unit test coverage for RaEvent logging.

Change-Id: I6443932f5cf7a613a5c695c65a60eab01e60602a
2016-07-05 13:52:24 +09:00
Lorenzo Colitti
6e7deb491a Merge \\"Unbreak unregisterNetworkCallback.\\" into nyc-mr1-dev am: f9b050ed9e
am: 7252e8c673

Change-Id: I7861e8ff7b8528d8468f8217e13398f78be50de5
2016-07-05 02:28:07 +00:00
Lorenzo Colitti
7252e8c673 Merge \"Unbreak unregisterNetworkCallback.\" into nyc-mr1-dev
am: f9b050ed9e

Change-Id: I35ee16554e17c503b1f5628629c2c0a48d85d399
2016-07-05 02:19:18 +00:00
Lorenzo Colitti
1ec11eb5bc Unbreak unregisterNetworkCallback.
http://ag/1194313 broke unregisterNetworkCallback because the
system does not parcel the type of the request back to the app.
So when the app calls unregisterNetworkCallback, the
NetworkRequest that's passed in does not have a type and thus
doesn't match the request in mNetworkRequests.

Fix this by parceling over the type as well.

This was not caught by the unit test because the unit test all
runs in the same process with no parceling.

Bug: 23113288
Change-Id: I58b2ed651b9bf5cbdcca5b25c3ca24db53cffdf1
2016-07-05 01:59:49 +09:00
Andrii Kulian
51fcfe73da Merge \\"Clarify documentation of Display#getSize()\\" into nyc-mr1-dev am: 5552dc341f
am: 1c836639b5

Change-Id: Ic49152a81d35ca860e3e12a08f0bff8ecd9fc857
2016-07-01 23:58:51 +00:00
Andrii Kulian
1c836639b5 Merge \"Clarify documentation of Display#getSize()\" into nyc-mr1-dev
am: 5552dc341f

Change-Id: I6d43f9c0a572307c3e45462e571a319f78c63930
2016-07-01 23:55:32 +00:00
Andrii Kulian
5552dc341f Merge "Clarify documentation of Display#getSize()" into nyc-mr1-dev 2016-07-01 23:49:38 +00:00
Kirill Grouchnikov
aaf7bdcdf9 Merge "Revert "One more pass over Javadocs of RemoteViews public APIs"" 2016-07-01 22:41:02 +00:00
Kirill Grouchnikov
da099bdeda Revert "One more pass over Javadocs of RemoteViews public APIs"
This reverts commit 0747e4070b.

Change-Id: I5cb55778958e4e56450999165e251bd7890f2c25
2016-07-01 22:39:56 +00:00
TreeHugger Robot
64ef32619a Merge "Don't leave FragmentManager in bad state after exception." 2016-07-01 22:22:53 +00:00
Kirill Grouchnikov
65aa5fa22d Merge "One more pass over Javadocs of RemoteViews public APIs" 2016-07-01 22:09:52 +00:00
Kirill Grouchnikov
0747e4070b One more pass over Javadocs of RemoteViews public APIs
Change-Id: I56e398bd013dd967d1fb1c5fdeaa1077ea6b3a6b
2016-07-01 17:24:32 -04:00
George Mount
c8c2bdf43d Don't leave FragmentManager in bad state after exception.
When an improper operation was executed and an
IllegalStateException was thrown, the FragmentManager
would be left in a bad state and even exiting the Activity
would throw an exception.

Change-Id: I4c0ff1182c41c708b12c2baa1e02a60b16422da3
2016-07-01 13:50:31 -07:00
Andrii Kulian
5f57a3d6d8 Clarify documentation of Display#getSize()
Bug: 25945436
Change-Id: I8574faf56427f4a6fb7155c08e31ef1e0bdb2cfa
2016-07-01 12:41:39 -07:00
Robert Carr
8942204d93 Merge changes I38cff63b,Id3739bbc,If052cd8c into nyc-mr1-dev am: 30efa24b11
am: 0dbe6db014

Change-Id: I3f0fd113bf9dc063f3bc60301f9a7ddf7d16581d
2016-07-01 19:41:33 +00:00
Robert Carr
0dbe6db014 Merge changes I38cff63b,Id3739bbc,If052cd8c into nyc-mr1-dev
am: 30efa24b11

Change-Id: I9ed6ae1f45221ff702162a1608bb8db7059058f5
2016-07-01 19:38:49 +00:00
TreeHugger Robot
30efa24b11 Merge changes I38cff63b,Id3739bbc,If052cd8c into nyc-mr1-dev
* changes:
  Fix synchronization error for Seamless rotation.
  Disable seamless rotation while animating.
  Force CROSSFADE rotation when launching from double tap gesture.
2016-07-01 19:27:36 +00:00
Jeremy Klein
6caa452865 Fix a typo in HandlerThread docs.
Change-Id: Icc489a3f3fdab799de3f641c0a0e4f2635b42935
2016-07-01 12:09:33 -07:00
Robert Carr
fd10cd1989 Force CROSSFADE rotation when launching from double tap gesture.
When activity transition triggers a rotation change, the starting
window will normally be the top window at the time we try
to select the window animation. However, these layout params won't
have the apps rotation animation set (as the client code will set that
on the real window, not the starting window). Eventually we would
like to add API to specify rotation animation via manifest to solve
this problem cleanly. In the mean time, we can force a specific rotation
animation from the double tap gesture, and clean up some camera
ugliness. We accomplish this by attaching an animation hint to
ActivityOptions.

Bug: 28838855
Change-Id: If052cd8cbae76651da43f3b4c590cd9dcc1afc0f
2016-07-01 11:05:40 -07:00
Michael Wright
d61e63a174 Merge \\"N MR1 is API 25\\" into nyc-mr1-dev am: c9099d1a84
am: 92b73c654b

Change-Id: I843e1f4b894f06736fe5288f0e12c79a10455519
2016-07-01 15:48:14 +00:00
Michael Wright
92b73c654b Merge \"N MR1 is API 25\" into nyc-mr1-dev
am: c9099d1a84

Change-Id: I959b38c391e0ab5fa00c2389c85c2a1aa07dcf61
2016-07-01 15:40:50 +00:00
TreeHugger Robot
c9099d1a84 Merge "N MR1 is API 25" into nyc-mr1-dev 2016-07-01 15:34:14 +00:00
Lorenzo Colitti
38d40a5c06 Merge changes from topic \\'networkrequest_private\\' into nyc-mr1-dev am: 0317e03dc3
am: 09daa02022

Change-Id: I09231f4f4f3bd13f6b51fe8117eff7d002cf10dd
2016-07-01 15:27:07 +00:00
Lorenzo Colitti
09daa02022 Merge changes from topic \'networkrequest_private\' into nyc-mr1-dev
am: 0317e03dc3

Change-Id: Ia063c378bd32fdb056c0ecdc0f721d32e9fa49af
2016-07-01 15:20:21 +00:00
Lorenzo Colitti
0317e03dc3 Merge changes from topic 'networkrequest_private' into nyc-mr1-dev
* changes:
  Make the NetworkRequest list private to NetworkAgentInfo.
  Move the request type from NetworkRequestInfo to NetworkRequest.
2016-07-01 15:12:53 +00:00