Erik Kline
c179797f8e
Merge \\"[net mgmt svc] add method to retrieve INetd reference\\" into nyc-mr1-dev am: 58ef88927d
...
am: e62b36bb33
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
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
2016-07-05 15:02:04 +00:00
Hugo Benichi
48d9a3d42f
Merge \"IpConn metrics: use @IntDef\" into nyc-mr1-dev
...
am: 018a205824
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
2016-07-05 12:47:19 +00:00
Hugo Benichi
5142df5613
Merge \"IpConn metrics: correctly read RA lifetimes\" into nyc-mr1-dev
...
am: 54756fdfd9
2016-07-05 12:38:42 +00:00
Hugo Benichi
8acc08ed9d
IpConn metrics: add dhcp transition times am: 176ed01a1f
...
am: a2595b3b22
2016-07-05 12:38:14 +00:00
Hugo Benichi
a2595b3b22
IpConn metrics: add dhcp transition times
...
am: 176ed01a1f
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
2016-07-05 02:28:07 +00:00
Lorenzo Colitti
7252e8c673
Merge \"Unbreak unregisterNetworkCallback.\" into nyc-mr1-dev
...
am: f9b050ed9e
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
2016-07-01 23:58:51 +00:00
Andrii Kulian
1c836639b5
Merge \"Clarify documentation of Display#getSize()\" into nyc-mr1-dev
...
am: 5552dc341f
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
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
2016-07-01 19:41:33 +00:00
Robert Carr
0dbe6db014
Merge changes I38cff63b,Id3739bbc,If052cd8c into nyc-mr1-dev
...
am: 30efa24b11
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
2016-07-01 15:48:14 +00:00
Michael Wright
92b73c654b
Merge \"N MR1 is API 25\" into nyc-mr1-dev
...
am: c9099d1a84
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
2016-07-01 15:27:07 +00:00
Lorenzo Colitti
09daa02022
Merge changes from topic \'networkrequest_private\' into nyc-mr1-dev
...
am: 0317e03dc3
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
Michael Wright
863ae3e51a
N MR1 is API 25
...
Also, finalize resource IDs for N MR1
Bug: 29816674
Change-Id: Ie880adb2544f4e2e32b439fe975a68a3928e6fe5
2016-07-01 14:42:46 +01:00
Lorenzo Colitti
b35d40d4e2
Move the request type from NetworkRequestInfo to NetworkRequest.
...
This will allow us to simplify code that deals with
NetworkRequests outside ConnectivityService.
Bug: 23113288
Change-Id: I9b3a859d0c68cad73d7f6baa4b584d13ffd2ae36
2016-07-01 20:15:19 +09:00
Martijn van Steenbergen
cac99ef166
Fix typos in View.AccessibilityDelegate Javadoc.
...
Change-Id: I83586da77d9c6d3bdc41188e7e9c671673227e9d
2016-07-01 10:35:24 +01:00
Yohei Yukawa
664e6d18db
Merge \\"Automatically grant URI permission as needed.\\" into nyc-mr1-dev am: d2e046a720
...
am: 1a932852d4
2016-07-01 01:28:47 +00:00
Yohei Yukawa
1a932852d4
Merge \"Automatically grant URI permission as needed.\" into nyc-mr1-dev
...
am: d2e046a720
2016-07-01 01:23:27 +00:00
Yohei Yukawa
d2e046a720
Merge "Automatically grant URI permission as needed." into nyc-mr1-dev
2016-07-01 01:09:56 +00:00
TreeHugger Robot
ca132ca6a1
Merge "Refactor WordIterator to avoid copying to internal buffers"
2016-07-01 00:03:59 +00:00
Felipe Leme
30635df7cb
Merge \\\"Removed warning when objects are added on wrong order.\\\" into nyc-dev am: a98e4512df am: 620936768f
...
am: a22f5a3fb4
2016-06-30 23:51:12 +00:00
Svetoslav Ganov
a22f5a3fb4
Merge \\"Removed warning when objects are added on wrong order.\\" into nyc-dev am: a98e4512df
...
am: 620936768f
2016-06-30 23:44:34 +00:00
Felipe Leme
7524b13642
Merge \"Removed warning when objects are added on wrong order.\" into nyc-dev
...
am: a98e4512df
2016-06-30 23:37:24 +00:00
Felipe Leme
620936768f
Merge \"Removed warning when objects are added on wrong order.\" into nyc-dev
...
am: a98e4512df
2016-06-30 23:37:13 +00:00
Svetoslav Ganov
a98e4512df
Merge "Removed warning when objects are added on wrong order." into nyc-dev
2016-06-30 23:28:59 +00:00
