Commit Graph

66439 Commits

Author SHA1 Message Date
Hugo Benichi
af71487dd7 Merge \"IpConn metrics: add times to DHCP bound state\" into nyc-mr1-dev
am: bbf97cd121

Change-Id: I0002c00d03165ac4bfa4a9790984d9e5615d7ff4
2016-07-07 09:13:22 +00:00
TreeHugger Robot
bbf97cd121 Merge "IpConn metrics: add times to DHCP bound state" into nyc-mr1-dev 2016-07-07 09:06:46 +00:00
Hugo Benichi
7643423521 IpConn metrics: add times to DHCP bound state
This patch adds DhcpClientEvent logging for:
 - time from init state to bound state
 - time from bound state to bound state when renewing

Example:
ConnectivityMetricsEvent(12:04:33.353, 0, 0): DhcpClientEvent(wlan0, WaitBeforeStartState, 94ms)
ConnectivityMetricsEvent(12:04:35.772, 0, 0): DhcpClientEvent(wlan0, DhcpInitState, 2417ms)
ConnectivityMetricsEvent(12:04:35.787, 0, 0): DhcpClientEvent(wlan0, DhcpRequestingState, 15ms)
ConnectivityMetricsEvent(12:04:35.793, 0, 0): DhcpClientEvent(wlan0, ConfiguringInterfaceState, 6ms)
ConnectivityMetricsEvent(12:04:35.811, 0, 0): DhcpClientEvent(wlan0, InitialBoundState, 2457ms)
ConnectivityMetricsEvent(12:05:35.791, 0, 0): DhcpClientEvent(wlan0, DhcpBoundState, 59998ms)
ConnectivityMetricsEvent(12:05:35.988, 0, 0): DhcpClientEvent(wlan0, WaitBeforeRenewalState, 196ms)
ConnectivityMetricsEvent(12:05:36.003, 0, 0): DhcpClientEvent(wlan0, DhcpRenewingState, 15ms)
ConnectivityMetricsEvent(12:05:36.010, 0, 0): DhcpClientEvent(wlan0, RenewingBoundState, 219ms)

Change-Id: I2540dd102a6509dff55936e38015265659b20760
2016-07-07 16:10:20 +09:00
Svet Ganov
eabaf266f8 Merge \"Merge \\"Use proper lock when accessing the generation registry\\" into nyc-dev am: dcf2e205bf\" into nyc-mr1-dev
am: d0302f579b

Change-Id: I8cd55faa5e8c788752ae411f29f29d9261f327c0
2016-07-07 01:31:55 +00:00
Jeff Sharkey
6d8cffc4e9 Merge \"Switch network cycle calculation to use Calendar.\" into nyc-mr1-dev
am: 3a4408640a

Change-Id: Icd8026e94b3d67523858486844f2195fc18f107b
2016-07-07 01:31:46 +00:00
Android Build Merger (Role)
d0302f579b Merge "Merge \"Use proper lock when accessing the generation registry\" into nyc-dev am: dcf2e205bf" into nyc-mr1-dev 2016-07-07 01:26:13 +00:00
Svet Ganov
84954568db Merge \"Use proper lock when accessing the generation registry\" into nyc-dev
am: dcf2e205bf

Change-Id: I00b1a6aba01fd9155e4b0db17e9bd65d31425489
2016-07-07 01:25:04 +00:00
TreeHugger Robot
3a4408640a Merge "Switch network cycle calculation to use Calendar." into nyc-mr1-dev 2016-07-07 01:23:59 +00:00
Annie Chin
d99252358b Merge \"Add callbacks to VoiceInteractionManagerService\" into nyc-mr1-dev
am: d58f07f58a

Change-Id: I6a9c537b71084696915e744102a6a12f532942d5
2016-07-06 23:29:50 +00:00
Annie Chin
d58f07f58a Merge "Add callbacks to VoiceInteractionManagerService" into nyc-mr1-dev 2016-07-06 23:22:10 +00:00
Jeff Sharkey
f2bead5117 Switch network cycle calculation to use Calendar.
The older Time class is deprecated and doesn't handle edge cases
very well.  So migrate the cycle calculation logic to use the
long-standing and well-supported Calendar API.

Bug: 28689087
Change-Id: Ic1802b3f8556402f99bfea4cd625c35dfed81ac0
2016-07-06 17:15:33 -06:00
Michael Kwan
0353f42f06 Merge \"Allow preference theming to remove divider.\" into nyc-mr1-dev
am: 929c8f4a75

Change-Id: If6e8a902ef01378213990a171053788dcae568cc
2016-07-06 22:40:31 +00:00
Michael Kwan
929c8f4a75 Merge "Allow preference theming to remove divider." into nyc-mr1-dev 2016-07-06 22:34:29 +00: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
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
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
Svet Ganov
51b839544b Use proper lock when accessing the generation registry
We use 'this' for synchronization in NameValueCache but some code
that accesses the generation registry uses 'this' in a different
context ending up syncing on the wrong instance. This is why
sync on this is just a bad idea.

bug:29956424

Change-Id: Ide2d4f07a5f40cb3f0e8f50e4c8de216d15a31ee
2016-07-06 19:52:36 +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
Robin Lee
dfc9007e9a Merge \"Update isValidLockdownProfile to block PPTP\" into nyc-mr1-dev
am: da68f0614c

Change-Id: Ie2d433c537fc27cbe04f80cd74c464e4a216238e
2016-07-06 16:21:00 +00:00
Robin Lee
da68f0614c Merge "Update isValidLockdownProfile to block PPTP" into nyc-mr1-dev 2016-07-06 15:57:23 +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
Robin Lee
bae6d820d2 Update isValidLockdownProfile to block PPTP
Since this isn't supported and it will take a framework update to make
it work.

Bug: 28807474
Change-Id: I12371134a1c51a53af26fe8c4db1f04b0f687abe
2016-07-06 09:41:05 +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
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
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
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
Michael Kwan
908523014e Allow preference theming to remove divider.
Bug: 27962897
Change-Id: I6632f2a3c3d1290c472594f127ad33c9b85023f1
2016-07-02 19:31:32 -07: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
Annie Chin
ecb9f3e9b8 Add callbacks to VoiceInteractionManagerService
Bug: 29582254

Change-Id: I548d01bd1c7e261b2d2e0afd606d964e5553124e
2016-07-01 13:00:09 -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
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
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
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
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
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