OSDN Git Service
Ashutosh Joshi [Thu, 7 Jul 2016 17:23:25 +0000 (17:23 +0000)]
Merge "Make ContextHubService compliant with new context hub interface." into nyc-mr1-dev
Daniel Nishi [Thu, 7 Jul 2016 16:34:17 +0000 (16:34 +0000)]
Merge "Add margins to the system icons when the user avatar is gone." into nyc-mr1-dev
Hemal Patel [Thu, 7 Jul 2016 16:23:32 +0000 (16:23 +0000)]
Merge \\\"Docs: Fixed wrong return type of a method\\\" into mnc-io-docs am:
13ce5dca58 am:
e02e644b92
am:
518f5a4e09
Change-Id: I79b68d35f39f74d908ec3872aa88201f22b6e094
Hemal Patel [Thu, 7 Jul 2016 16:15:48 +0000 (16:15 +0000)]
Merge \\"Docs: Fixed wrong return type of a method\\" into mnc-io-docs am:
13ce5dca58
am:
e02e644b92
Change-Id: I9f872d3456381b437271ab949804ffbae0e6a5a2
John Reck [Thu, 7 Jul 2016 16:10:40 +0000 (16:10 +0000)]
Merge "Consider queue & dequeue times for should draw" into nyc-mr1-dev
Hemal Patel [Thu, 7 Jul 2016 16:07:59 +0000 (16:07 +0000)]
Merge \"Docs: Fixed wrong return type of a method\" into mnc-io-docs
am:
13ce5dca58
Change-Id: Iece5dfd7fcf3bd0113e3e5fb84a0eac7ad361ae0
Hemal Patel [Thu, 7 Jul 2016 15:57:01 +0000 (15:57 +0000)]
Merge "Docs: Fixed wrong return type of a method" into mnc-io-docs
Dave Langemak [Thu, 7 Jul 2016 15:38:11 +0000 (15:38 +0000)]
Merge "Hide APIs that shouldn't have been public" into nyc-mr1-dev
Hugo Benichi [Thu, 7 Jul 2016 13:02:29 +0000 (13:02 +0000)]
Merge "IpConn metrics: distinguish NUD_FAILED answers" into nyc-mr1-dev
Rubin Xu [Thu, 7 Jul 2016 11:41:29 +0000 (11:41 +0000)]
Merge "Bump ACTION_CHOOSE_PRIVATE_KEY_ALIAS broadcast to foreground" into nyc-mr1-dev
Ricky Wai [Thu, 7 Jul 2016 11:05:54 +0000 (11:05 +0000)]
Merge "Do not show user locked notification after reboot when there is no lock" into nyc-mr1-dev
Lorenzo Colitti [Thu, 7 Jul 2016 10:55:38 +0000 (10:55 +0000)]
Merge "Rewrite lingering." into nyc-mr1-dev
Esteban Talavera [Thu, 7 Jul 2016 10:33:21 +0000 (10:33 +0000)]
Merge "Disallow OobConfig being suspended" into nyc-mr1-dev
TreeHugger Robot [Thu, 7 Jul 2016 09:33:34 +0000 (09:33 +0000)]
Merge "ConnectivityManager: no double callback remove" into nyc-mr1-dev
Bryan Mawhinney [Thu, 7 Jul 2016 09:22:43 +0000 (09:22 +0000)]
Merge "Make MediaScanner extract "date taken" from videos, if present" into nyc-mr1-dev
TreeHugger Robot [Thu, 7 Jul 2016 09:06:44 +0000 (09:06 +0000)]
Merge "IpConn metrics: add times to DHCP bound state" into nyc-mr1-dev
TreeHugger Robot [Thu, 7 Jul 2016 07:33:06 +0000 (07:33 +0000)]
Merge "Prepare to delete useless loop in handleReleaseNetworkRequest." into nyc-mr1-dev
Lorenzo Colitti [Thu, 30 Jun 2016 16:53:25 +0000 (01:53 +0900)]
Rewrite lingering.
The two major changes here are:
- Move lingering out of NetworkMonitor. The fact that lingering
is currently its own state in NetworkMonitor complicates the
logic there: while a network is lingering it cannot be in any
other state, we have to take care not to leave LingeringState
for the wrong reason, etc.
- Instead of keeping a single per-network boolean to indicate
whether a network is lingered or not, keep a linger timer for
every request. This allows us to fix various corner-case bugs
in lingering.
The changes in behaviour compared to the current code can be seen
in the unit test changes. Specifically:
1. Bug fix: when a network is lingered, and a request is added
and removed to it, the existing code tears the network down
immediately. The new code just sends another CALLBACK_LOSING
and resumes lingering with the original timeout.
2. Bug fix: if cell is unvalidated and wifi comes up and
validates before cell does (as might happen on boot), the
existing code immediately tears down cell. The new code
lingers cell, which is correct because unvalidated cell was
the default network, so an app might have been using it.
3. Correctness improvement: always send CALLBACK_AVAILABLE for
the new network before sending CALLBACK_LOSING. This was not
really an issue in practice, because the usual flow is:
- Network A is the default.
- Network B connects, CALLBACK_AVAILABLE.
- Network B validates, CALLBACK_LOSING.
Bug:
23113288
Change-Id: I2f1e779ff6eb869e62921a95aa9d356f380cf30a
Hugo Benichi [Thu, 7 Jul 2016 02:28:54 +0000 (11:28 +0900)]
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
Hugo Benichi [Wed, 22 Jun 2016 08:01:43 +0000 (17:01 +0900)]
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
Lorenzo Colitti [Wed, 6 Jul 2016 10:04:26 +0000 (19:04 +0900)]
Prepare to delete useless loop in handleReleaseNetworkRequest.
As explained in the TODO, the loop serves no purpose since only
one network can be satisfying a given request at a time.
Instead of looping, look up the nai in the mNetworkForRequestId
array that exists for this purpose.
Keep the loop around with an Slog.wtf statement on it so we can
see if we ever hit it, and add a TODO to delete it if we don't.
Bug:
23113288
Change-Id: I173de4bd45c5a4169b7a062a981f2ecccaa44143
TreeHugger Robot [Thu, 7 Jul 2016 03:19:22 +0000 (03:19 +0000)]
Merge "Enable the demo launcher package as well." into nyc-mr1-dev
TreeHugger Robot [Thu, 7 Jul 2016 02:28:05 +0000 (02:28 +0000)]
Merge "Revert "Fix navigation bar order in seascape"" into nyc-mr1-dev
fionaxu [Thu, 7 Jul 2016 02:03:11 +0000 (02:03 +0000)]
DO NOT MERGE revert system api loadSafeLabel am:
863ac471cf am:
92b8cbd472 am:
b4849f8d74 -s ours am:
d061c3abfa am:
f6923d2993 am:
50904bedb5 am:
aad33e6905 -s ours
am:
c8a7fd0502
Change-Id: Idbfa5313542afff71e8756e6ef65550bfc48c2bd
fionaxu [Thu, 7 Jul 2016 01:55:16 +0000 (01:55 +0000)]
DO NOT MERGE revert system api loadSafeLabel am:
863ac471cf am:
92b8cbd472 am:
b4849f8d74 -s ours am:
d061c3abfa am:
f6923d2993 am:
50904bedb5
am:
aad33e6905 -s ours
Change-Id: I8de53f5fa9e45bb5b39eb9d2cd3901f49850e93f
fionaxu [Thu, 7 Jul 2016 01:47:45 +0000 (01:47 +0000)]
DO NOT MERGE revert system api loadSafeLabel am:
863ac471cf am:
92b8cbd472 am:
b4849f8d74 -s ours am:
d061c3abfa am:
f6923d2993
am:
50904bedb5
Change-Id: I733cc2b3421780398a2a764748c9d9155c39327b
Sudheer Shanka [Thu, 7 Jul 2016 00:49:37 +0000 (17:49 -0700)]
Enable the demo launcher package as well.
Bug:
29922954
Change-Id: I81ad01d9ca5e3505df716bde2506e0f1e7f7a6b7
fionaxu [Thu, 7 Jul 2016 01:39:09 +0000 (01:39 +0000)]
DO NOT MERGE revert system api loadSafeLabel am:
863ac471cf am:
92b8cbd472 am:
b4849f8d74 -s ours am:
d061c3abfa
am:
f6923d2993
Change-Id: If22f635f2e4cf0a3ce79ef6916abe3cb60c6b419
fionaxu [Thu, 7 Jul 2016 01:32:07 +0000 (01:32 +0000)]
DO NOT MERGE revert system api loadSafeLabel am:
863ac471cf am:
92b8cbd472 am:
b4849f8d74 -s ours
am:
d061c3abfa
Change-Id: Ia6af0a650e4fe0afdcf56ecee7473be2cdef7b32
Android Build Merger (Role) [Thu, 7 Jul 2016 01:26:32 +0000 (01:26 +0000)]
Merge "Merge \\\\\"DO NOT MERGE revert system api loadSafeLabel\\\\\" into mnc-dev am:
d2e2288fe3 am:
59fc768893 am:
69a071e55c am:
e5643a13c4 -s ours am:
ea5f6a74c0" into nyc-mr1-dev
Android Build Merger (Role) [Thu, 7 Jul 2016 01:26:21 +0000 (01:26 +0000)]
Merge "Merge \"remove \"referenceonly\" flag from the offline-docs build. Add new offline-docs-referenceonly make rule. And update online-sdk and offline-sdk to use the new site templates.\" into nyc-dev am:
83f71845af" into nyc-mr1-dev
Android Build Merger (Role) [Thu, 7 Jul 2016 01:26:12 +0000 (01:26 +0000)]
Merge "Merge \"Use proper lock when accessing the generation registry\" into nyc-dev am:
dcf2e205bf" into nyc-mr1-dev
Android Build Merger (Role) [Thu, 7 Jul 2016 01:26:03 +0000 (01:26 +0000)]
Merge "Merge \"Make registerDefaultNetwork work on metered networks.\" into nyc-dev am:
33cdc4d136 -s ours" into nyc-mr1-dev
fionaxu [Thu, 7 Jul 2016 01:25:21 +0000 (01:25 +0000)]
Merge \\\\\"DO NOT MERGE revert system api loadSafeLabel\\\\\" into mnc-dev am:
d2e2288fe3 am:
59fc768893 am:
69a071e55c am:
e5643a13c4 -s ours
am:
ea5f6a74c0
Change-Id: I2b35540b9d12712aa80149d54a9c35203e35a84e
smain@google.com [Thu, 7 Jul 2016 01:25:11 +0000 (01:25 +0000)]
Merge \"remove \"referenceonly\" flag from the offline-docs build. Add new offline-docs-referenceonly make rule. And update online-sdk and offline-sdk to use the new site templates.\" into nyc-dev
am:
83f71845af
Change-Id: Iee22aa299a11517f6c0efb73b57d5d256c8148c1
Svet Ganov [Thu, 7 Jul 2016 01:25:04 +0000 (01:25 +0000)]
Merge \"Use proper lock when accessing the generation registry\" into nyc-dev
am:
dcf2e205bf
Change-Id: I00b1a6aba01fd9155e4b0db17e9bd65d31425489
Lorenzo Colitti [Thu, 7 Jul 2016 01:24:58 +0000 (01:24 +0000)]
Merge \"Make registerDefaultNetwork work on metered networks.\" into nyc-dev
am:
33cdc4d136 -s ours
Change-Id: Iacee53c01e7de163e677ab57bc2d7044f8aff952
TreeHugger Robot [Thu, 7 Jul 2016 01:23:57 +0000 (01:23 +0000)]
Merge "Switch network cycle calculation to use Calendar." into nyc-mr1-dev
fionaxu [Thu, 7 Jul 2016 01:20:29 +0000 (01:20 +0000)]
DO NOT MERGE revert system api loadSafeLabel am:
863ac471cf am:
92b8cbd472
am:
b4849f8d74 -s ours
Change-Id: Id3089485c93309a4d1ee97e12aeda63c015f397a
fionaxu [Thu, 7 Jul 2016 01:13:47 +0000 (01:13 +0000)]
DO NOT MERGE revert system api loadSafeLabel am:
863ac471cf
am:
92b8cbd472
Change-Id: Ie23b6f96b4d624469f842c8822dc78f83c2d9714
fionaxu [Thu, 7 Jul 2016 01:07:43 +0000 (01:07 +0000)]
DO NOT MERGE revert system api loadSafeLabel
am:
863ac471cf
Change-Id: I9230b78b2e1ac29cfd76db00be0c31e690566ac7
Hugo Benichi [Thu, 7 Jul 2016 00:36:12 +0000 (09:36 +0900)]
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
Jorim Jaggi [Thu, 7 Jul 2016 00:34:28 +0000 (00:34 +0000)]
Revert "Fix navigation bar order in seascape"
This reverts commit
27315acfbbf9921e760647e2e96e74ec7de6015a.
Change-Id: I680f44eaca7813633d7c251ff0bb9c62f94d1fc5
TreeHugger Robot [Thu, 7 Jul 2016 00:30:38 +0000 (00:30 +0000)]
Merge "Fixing app transition due to left-nav bar inset." into nyc-mr1-dev
Daniel Nishi [Mon, 27 Jun 2016 18:44:01 +0000 (11:44 -0700)]
Add margins to the system icons when the user avatar is gone.
This resolves a regression caused by situtionally removing the
avatar on phones when there is only one user. Normally, the avatar's
width acts as padding against the end. By removing the avatar, the
buffer is also removed. This patch re-adds 6dp of margins to space
the system icons properly on phones.
Change-Id: I7b07b02fb74146e17109a7aaf23a41bb681683f3
FIXES:
29646859
TreeHugger Robot [Thu, 7 Jul 2016 00:14:07 +0000 (00:14 +0000)]
Merge "Move phone number formatting logic into DeviceInfoUtils." into nyc-mr1-dev
fionaxu [Thu, 30 Jun 2016 22:59:55 +0000 (15:59 -0700)]
DO NOT MERGE revert system api loadSafeLabel
Bug:
28557603
Change-Id: Ib2dd0fc19217655a4d6b49cdf49ce36dfd6577d5
John Reck [Fri, 1 Jul 2016 23:19:13 +0000 (16:19 -0700)]
Consider queue & dequeue times for should draw
Bug:
29413700
Change-Id: I4b27b077af569e3c60c57b0e11501e9f3af70579
Chen Xu [Wed, 6 Jul 2016 23:42:41 +0000 (23:42 +0000)]
Merge \\\\"DO NOT MERGE revert system api loadSafeLabel\\\\" into mnc-dev am:
d2e2288fe3 am:
59fc768893 am:
69a071e55c
am:
e5643a13c4 -s ours
Change-Id: I68bfaeedf5290ea792aa0570e68e24d0d6dada11
fionaxu [Wed, 6 Jul 2016 23:36:00 +0000 (23:36 +0000)]
Merge \\\"DO NOT MERGE revert system api loadSafeLabel\\\" into mnc-dev am:
d2e2288fe3 am:
59fc768893
am:
69a071e55c
Change-Id: If59d61dfdc00f740ffcf8fbe5233b191eb03a797
Chen Xu [Wed, 6 Jul 2016 23:29:51 +0000 (23:29 +0000)]
Merge \\"DO NOT MERGE revert system api loadSafeLabel\\" into mnc-dev am:
d2e2288fe3
am:
59fc768893
Change-Id: I1eeb704e6b0a29e3574e969649ba72bbb5d9a9c2
fionaxu [Wed, 6 Jul 2016 23:24:04 +0000 (23:24 +0000)]
Merge \"DO NOT MERGE revert system api loadSafeLabel\" into mnc-dev
am:
d2e2288fe3
Change-Id: If7bb704d5d6ae942b7ceac3e9f22acf4cf3a7b4b
Annie Chin [Wed, 6 Jul 2016 23:22:09 +0000 (23:22 +0000)]
Merge "Add callbacks to VoiceInteractionManagerService" into nyc-mr1-dev
Chen Xu [Wed, 6 Jul 2016 23:16:53 +0000 (23:16 +0000)]
Merge "DO NOT MERGE revert system api loadSafeLabel" into mnc-dev
Jeff Sharkey [Wed, 6 Jul 2016 23:11:48 +0000 (17:11 -0600)]
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
Makoto Onuki [Wed, 6 Jul 2016 23:05:03 +0000 (16:05 -0700)]
Hide APIs that shouldn't have been public
Change-Id: I40f1c8e9c6fe991e782bf3dd772f305df641b267
TreeHugger Robot [Wed, 6 Jul 2016 23:00:17 +0000 (23:00 +0000)]
Merge "Capture fingerprint statistics for estimating FRR" into nyc-mr1-dev
Scott Main [Wed, 6 Jul 2016 22:48:01 +0000 (22:48 +0000)]
Merge "remove "referenceonly" flag from the offline-docs build. Add new offline-docs-referenceonly make rule. And update online-sdk and offline-sdk to use the new site templates." into nyc-dev
Annie Chin [Wed, 6 Jul 2016 22:36:35 +0000 (22:36 +0000)]
Merge "Add getters for ButtonDispatcher HomeButton and its views" into nyc-mr1-dev
Michael Kwan [Wed, 6 Jul 2016 22:34:28 +0000 (22:34 +0000)]
Merge "Allow preference theming to remove divider." into nyc-mr1-dev
Winson [Wed, 6 Jul 2016 22:24:15 +0000 (15:24 -0700)]
Fixing app transition due to left-nav bar inset.
- Also center in available space regardless of which side the bar inset
is on.
Bug:
29917174
Change-Id: If84dfb3bbff3c3d3de70473c74f5bfc5a8f32a59
Fan Zhang [Wed, 6 Jul 2016 19:19:34 +0000 (12:19 -0700)]
Move phone number formatting logic into DeviceInfoUtils.
Bug:
28419411
Change-Id: Ib9a0ad60d44e4e24fdb6484d5bb582f4f796f8b3
Svetoslav Ganov [Wed, 6 Jul 2016 22:10:08 +0000 (22:10 +0000)]
Merge "Use proper lock when accessing the generation registry" into nyc-dev
Jim Miller [Wed, 6 Jul 2016 21:16:49 +0000 (14:16 -0700)]
Capture fingerprint statistics for estimating FRR
Fixes bug
29258254
Change-Id: I10620c9bf07e4cdd7df456548b6516b5e1f1f5ee
Ashutosh Joshi [Wed, 6 Jul 2016 20:54:28 +0000 (13:54 -0700)]
Make ContextHubService compliant with new context hub interface.
Context Hub HAL added messages with definition for all distinguished
messages. Fixing the ContextHubService to be compliant.
Bug:
29835220
Change-Id: I70751d0f5b06cd3c8a4ce93003bdaa86b7317a2c
TreeHugger Robot [Wed, 6 Jul 2016 20:54:02 +0000 (20:54 +0000)]
Merge "Skip screenshots when user storage is locked." into nyc-mr1-dev
TreeHugger Robot [Wed, 6 Jul 2016 20:47:50 +0000 (20:47 +0000)]
Merge "Don't cache external storage directories." into nyc-mr1-dev
Jeff Sharkey [Wed, 6 Jul 2016 20:39:42 +0000 (20:39 +0000)]
Merge "Ignore serial number checks when emulating FBE." into nyc-mr1-dev
Pankaj Kanwar [Wed, 6 Jul 2016 20:35:22 +0000 (20:35 +0000)]
Merge "Make registerDefaultNetwork work on metered networks." into nyc-dev
Daniel Nishi [Wed, 6 Jul 2016 19:54:26 +0000 (19:54 +0000)]
Merge "Move the MIME type icon detection into the platform." into nyc-mr1-dev
Svet Ganov [Wed, 6 Jul 2016 19:16:53 +0000 (12:16 -0700)]
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
TreeHugger Robot [Wed, 6 Jul 2016 19:45:14 +0000 (19:45 +0000)]
Merge "Frameworks/base: Refactor UserHandle and Environment a bit" into nyc-mr1-dev
Alan Viverette [Wed, 6 Jul 2016 19:33:19 +0000 (19:33 +0000)]
Merge "Fix: DatePicker can't show long date string at landscape" into nyc-mr1-dev
Amith Yamasani [Wed, 6 Jul 2016 18:09:54 +0000 (18:09 +0000)]
Merge "Log as histogram instead of counter" into nyc-mr1-dev
Andreas Gampe [Wed, 15 Jun 2016 00:13:37 +0000 (17:13 -0700)]
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
Julia Reynolds [Wed, 6 Jul 2016 18:03:35 +0000 (18:03 +0000)]
Merge "Don't bridge autobundle summaries to other devices." into nyc-mr1-dev
Daniel Nishi [Thu, 30 Jun 2016 19:20:41 +0000 (12:20 -0700)]
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
Sudheer Shanka [Wed, 6 Jul 2016 17:05:39 +0000 (17:05 +0000)]
Merge "Grant location permission to camera app." into nyc-mr1-dev
Robin Lee [Wed, 6 Jul 2016 15:57:20 +0000 (15:57 +0000)]
Merge "Update isValidLockdownProfile to block PPTP" into nyc-mr1-dev
Julia Reynolds [Wed, 6 Jul 2016 14:45:05 +0000 (10:45 -0400)]
Don't bridge autobundle summaries to other devices.
Change-Id: I2d0df16b2fbd32569e564399696c86e499910ddb
Fixes:
29114754
Alan Viverette [Wed, 6 Jul 2016 14:24:11 +0000 (10:24 -0400)]
Fix: DatePicker can't show long date string at landscape
maxLines="2" is not enough for some languages. Date string is
cut down at landscape. There is a room for additional 2 lines.
maxLines="4" is reasonable.
Bug:
29732198
Change-Id: I312d7ca7f8bf3f4c09dd76fa99274a7f7592bd22
Rubin Xu [Wed, 6 Jul 2016 13:21:42 +0000 (14:21 +0100)]
Bump ACTION_CHOOSE_PRIVATE_KEY_ALIAS broadcast to foreground
Bug:
29966726
Change-Id: Ifdbdd26df40518d9e50f9a0b0dfc5c01cb9accb2
TreeHugger Robot [Wed, 6 Jul 2016 13:09:41 +0000 (13:09 +0000)]
Merge "[net mgmt svc] add method to retrieve INetd reference" into nyc-mr1-dev
Erik Kline [Tue, 5 Jul 2016 02:34:21 +0000 (11:34 +0900)]
[net mgmt svc] add method to retrieve INetd reference
Bug:
21859053
Bug:
28135208
Change-Id: Idfb5ca65788ae8c7aea91f12d9d461686ad836d6
Robin Lee [Wed, 6 Jul 2016 09:30:04 +0000 (10:30 +0100)]
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
TreeHugger Robot [Wed, 6 Jul 2016 04:14:45 +0000 (04:14 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Wed, 6 Jul 2016 03:49:51 +0000 (03:49 +0000)]
Import translations. DO NOT MERGE
am:
4c78b8e544 -s ours
Change-Id: Iccd725b45dc4a9e128bad1a7a28a48558eee4ea1
TreeHugger Robot [Wed, 6 Jul 2016 03:21:07 +0000 (03:21 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Wed, 6 Jul 2016 02:37:55 +0000 (19:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: If1956ac983530432b46246ee0a53bfdccd81fcb1
Auto-generated-cl: translation import
Bill Yi [Tue, 5 Jul 2016 21:35:11 +0000 (14:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic110e666b92152c5280d96f51129c7ba0b53ef2e
Auto-generated-cl: translation import
Bill Yi [Tue, 5 Jul 2016 21:21:42 +0000 (14:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: I95cfccce32e6cb1431bc2d700573b73f5f983210
Auto-generated-cl: translation import
Bill Yi [Tue, 5 Jul 2016 21:07:10 +0000 (14:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idf9776c5e49200e5880dd16b81e43ae095471caa
Auto-generated-cl: translation import
TreeHugger Robot [Tue, 5 Jul 2016 14:39:46 +0000 (14:39 +0000)]
Merge "IpConn metrics: use @IntDef" into nyc-mr1-dev
Hugo Benichi [Mon, 4 Jul 2016 02:28:05 +0000 (11:28 +0900)]
IpConn metrics: use @IntDef
Change-Id: Iae23f04abd3d1a43e7217f4fd641cd5fa61a7a1b
Hugo Benichi [Tue, 5 Jul 2016 12:25:54 +0000 (12:25 +0000)]
Merge "IpConn metrics: correctly read RA lifetimes" into nyc-mr1-dev
Hugo Benichi [Fri, 1 Jul 2016 01:06:56 +0000 (10:06 +0900)]
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
Tony Mak [Tue, 5 Jul 2016 06:28:57 +0000 (07:28 +0100)]
Disallow OobConfig being suspended
Change-Id: I79d8e6b8bb77878767a0572a567a10ff08c0b6b8
Fix:
29892597
Hugo Benichi [Mon, 4 Jul 2016 00:22:30 +0000 (09:22 +0900)]
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
TreeHugger Robot [Tue, 5 Jul 2016 03:35:39 +0000 (03:35 +0000)]
Merge "Add test coverage for a bug in the lingering code." into nyc-mr1-dev
Lorenzo Colitti [Tue, 5 Jul 2016 02:07:04 +0000 (02:07 +0000)]
Merge "Unbreak unregisterNetworkCallback." into nyc-mr1-dev