Commit Graph

62261 Commits

Author SHA1 Message Date
Andrei Stingaceanu
95331038c3 CalendarView Material - throw exception if date is out of range
Similar to CalendarViewLegacyDelegate#goTo

Bug: 28019187
Change-Id: Id21dcd208a594b98dc89caf59d36b32bdf9484be
2016-07-08 15:22:56 +01:00
Hugo Benichi
219d9ba4fa Merge \\"IpConn metrics: distinguish NUD_FAILED answers\\" into nyc-mr1-dev am: 42e608527a
am: 99b36c8b4f

Change-Id: Iade155a1941674edf642e99bd506d1676b67ab42
2016-07-07 13:17:27 +00:00
Hugo Benichi
99b36c8b4f Merge \"IpConn metrics: distinguish NUD_FAILED answers\" into nyc-mr1-dev
am: 42e608527a

Change-Id: I4303badea7760c6cd9a1b63db1df8a3766a638f2
2016-07-07 13:11:01 +00:00
Hugo Benichi
42e608527a Merge "IpConn metrics: distinguish NUD_FAILED answers" into nyc-mr1-dev 2016-07-07 13:02:31 +00:00
Hugo Benichi
a2332e55c5 Merge \\"ConnectivityManager: no double callback remove\\" into nyc-mr1-dev am: 78feae882a
am: a965203d5f

Change-Id: I8fb5bac2bb6b7665192c8c788d7818d637500935
2016-07-07 09:45:36 +00:00
Hugo Benichi
a965203d5f Merge \"ConnectivityManager: no double callback remove\" into nyc-mr1-dev
am: 78feae882a

Change-Id: Ib7b10c59c1f7c84ec78c7527fba8a6c9aa5b0c05
2016-07-07 09:38:29 +00:00
TreeHugger Robot
78feae882a Merge "ConnectivityManager: no double callback remove" into nyc-mr1-dev 2016-07-07 09:33:35 +00:00
Hugo Benichi
c31e68eadf Merge \\"IpConn metrics: add times to DHCP bound state\\" into nyc-mr1-dev am: bbf97cd121
am: af71487dd7

Change-Id: Icecc32a3c9d220f64dc807008354bb0678cf5564
2016-07-07 09:18:59 +00:00
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
Hugo Benichi
0d1c65b221 IpConn metrics: distinguish NUD_FAILED answers
This patch adds in IpReachabilityMonitor a timestamp variable set
everytime that probeAll() send NUD probe requests to RTNETLINK.
This allows to distinguish between:
  1) NUD_FAILED events resulting from such a forced NUD probe
  2) "organic" NUD_FAILED notifications from the kernel

This distinction is added to IpReachabilityEvent as a one-bit flag.

This patch also changes the formatting of ApfProgramEvent flags to use
'|' as a joining character, similarly to other flags formatting.

Bug: 21859053
Change-Id: I24c64a3f17fa283eace5bd0a05c21a90a2305359
2016-07-07 15:58:28 +09:00
Svet Ganov
f1d788adee Merge \"Merge \\"Merge \\\"Use proper lock when accessing the generation registry\\\" into nyc-dev am: dcf2e205bf\\" into nyc-mr1-dev am: d0302f579b\" into nyc-mr1-dev-plus-aosp
am: f910dab5f7

Change-Id: I86bda42056b6af37febccf48ebe09ee6363b50d0
2016-07-07 01:47:45 +00:00
Jeff Sharkey
2e2c64556c Merge \"Merge \\"Switch network cycle calculation to use Calendar.\\" into nyc-mr1-dev am: 3a4408640a\" into nyc-mr1-dev-plus-aosp
am: 54a704bfcd

Change-Id: I2924d4f96cf0ab52131570a270091d0d9480af0f
2016-07-07 01:47:39 +00: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
Hugo Benichi
39e10e88ff ConnectivityManager: no double callback remove
This patch partially undoes ag/869831 (Change-Id:
Ia42ed7aefaebd8caf3eada8e42b6cb7a940d7647) so that ConnectivityManager
does not remove callbacks from its internal request-to-callback map at
unregistration, but instead let the singleton CallbackHandler do it when
receiving a CALLBACK_RELEASED from ConnectivityService.

ag/869831 was thought to fix b/26749700 that reported a callback leak
from sNetworkCallback, but a finer analysis of the code shows that
callbacks were correctly removed by the CallbackHandler before
ag/869831. There was therefore no callback leak.

Bug: 26749700
Bug: 28537383
Change-Id: I421d889d0e225c0e3d1eebea664f44a1cc0f3191
2016-07-07 09:44:02 +09: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
246a9345f2 Merge \\"Allow preference theming to remove divider.\\" into nyc-mr1-dev am: 929c8f4a75
am: 0353f42f06

Change-Id: I66fbbef0c89bed49dd1e5681515e585ed0262afb
2016-07-06 23:00:00 +00:00
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
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
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
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
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