Commit Graph

253881 Commits

Author SHA1 Message Date
TreeHugger Robot
78feae882a Merge "ConnectivityManager: no double callback remove" into nyc-mr1-dev 2016-07-07 09:33:35 +00:00
Bryan Mawhinney
d63dbfdb6b Merge "Make MediaScanner extract "date taken" from videos, if present" into nyc-mr1-dev 2016-07-07 09:22:45 +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
TreeHugger Robot
6f9fb31b79 Merge "Prepare to delete useless loop in handleReleaseNetworkRequest." into nyc-mr1-dev 2016-07-07 07:33:07 +00:00
Lorenzo Colitti
b57578ca4f 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
2016-07-07 16:18:57 +09: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
Lorenzo Colitti
446598c083 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
2016-07-07 14:50:12 +09:00
TreeHugger Robot
b5b2c196a8 Merge "Enable the demo launcher package as well." into nyc-mr1-dev 2016-07-07 03:19:23 +00:00
TreeHugger Robot
ce715e4922 Merge "Revert "Fix navigation bar order in seascape"" into nyc-mr1-dev 2016-07-07 02:28:06 +00:00
fionaxu
8e71c857ff 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
2016-07-07 02:03:11 +00:00
fionaxu
c8a7fd0502 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
2016-07-07 01:55:16 +00:00
fionaxu
aad33e6905 DO NOT MERGE revert system api loadSafeLabel am: 863ac471cf am: 92b8cbd472 am: b4849f8d74 -s ours am: d061c3abfa am: f6923d2993
am: 50904bedb5

Change-Id: I733cc2b3421780398a2a764748c9d9155c39327b
2016-07-07 01:47:45 +00:00
Sudheer Shanka
194e415384 Enable the demo launcher package as well.
Bug: 29922954
Change-Id: I81ad01d9ca5e3505df716bde2506e0f1e7f7a6b7
2016-07-07 01:41:23 +00:00
fionaxu
50904bedb5 DO NOT MERGE revert system api loadSafeLabel am: 863ac471cf am: 92b8cbd472 am: b4849f8d74 -s ours am: d061c3abfa
am: f6923d2993

Change-Id: If22f635f2e4cf0a3ce79ef6916abe3cb60c6b419
2016-07-07 01:39:09 +00:00
Fyodor Kupolov
56d32190e0 Install preloaded apps into the demo user
Apks preloaded in /data/preloads/apps are now automatically installed when
device is running in demo mode.

Apps are also installed into system user, so that they can be cached for
the next demo user session.

Bug: 29908713
Change-Id: If0fb45bb31c169a1e3020621a173867b8530532d
2016-07-06 18:36:31 -07:00
fionaxu
f6923d2993 DO NOT MERGE revert system api loadSafeLabel am: 863ac471cf am: 92b8cbd472 am: b4849f8d74 -s ours
am: d061c3abfa

Change-Id: Ia6af0a650e4fe0afdcf56ecee7473be2cdef7b32
2016-07-07 01:32:07 +00:00
Android Build Merger (Role)
cba5f29304 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 2016-07-07 01:26:33 +00:00
Android Build Merger (Role)
925a5ffa5e 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 2016-07-07 01:26:22 +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
Android Build Merger (Role)
6f93a6c2c3 Merge "Merge \"Make registerDefaultNetwork work on metered networks.\" into nyc-dev am: 33cdc4d136 -s ours" into nyc-mr1-dev 2016-07-07 01:26:04 +00:00
fionaxu
e1df7dfa22 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
2016-07-07 01:25:21 +00:00
smain@google.com
c526ad0e89 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
2016-07-07 01:25:11 +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
Lorenzo Colitti
17b1adca7c Merge \"Make registerDefaultNetwork work on metered networks.\" into nyc-dev
am: 33cdc4d136  -s ours

Change-Id: Iacee53c01e7de163e677ab57bc2d7044f8aff952
2016-07-07 01:24:58 +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
fionaxu
d061c3abfa DO NOT MERGE revert system api loadSafeLabel am: 863ac471cf am: 92b8cbd472
am: b4849f8d74  -s ours

Change-Id: Id3089485c93309a4d1ee97e12aeda63c015f397a
2016-07-07 01:20:29 +00:00
Fyodor Kupolov
4e8ce9ec4e Schedule backup of a package on a background thread
Scheduling involves writing to journal file. This part can be done on the
background thread in order to speed up the unlocking. Deferring writes to
journal file should be safe, because the system will reschedule backups in
case of a crash.

Bug: 29619732
Bug: 29645167
Change-Id: I0667ac2bf159e0f40b7a5066f41ea0841df98437
2016-07-06 18:20:29 -07:00
fionaxu
b4849f8d74 DO NOT MERGE revert system api loadSafeLabel am: 863ac471cf
am: 92b8cbd472

Change-Id: Ie23b6f96b4d624469f842c8822dc78f83c2d9714
2016-07-07 01:13:47 +00:00
Jean-Michel Trivi
7872affa96 More javadoc for audio recording activity API
Better overview of feature inside AudioRecordingConfiguration
 class description.
Addition of @see links in AudioManager query and callback methods.

Bug 27929523

Change-Id: I9159ffd40d68f7c65f59570119821087643f9030
2016-07-06 18:12:01 -07:00
fionaxu
92b8cbd472 DO NOT MERGE revert system api loadSafeLabel
am: 863ac471cf

Change-Id: I9230b78b2e1ac29cfd76db00be0c31e690566ac7
2016-07-07 01:07:43 +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
Jorim Jaggi
c44368016a Revert "Fix navigation bar order in seascape"
This reverts commit 27315acfbb.

Change-Id: I680f44eaca7813633d7c251ff0bb9c62f94d1fc5
2016-07-07 00:34:28 +00:00
TreeHugger Robot
8d90128bc9 Merge "Fixing app transition due to left-nav bar inset." into nyc-mr1-dev 2016-07-07 00:30:39 +00:00
Daniel Nishi
f79cd873f6 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
2016-07-06 17:20:59 -07:00
TreeHugger Robot
53185e42b5 Merge "Move phone number formatting logic into DeviceInfoUtils." into nyc-mr1-dev 2016-07-07 00:14:08 +00:00
fionaxu
863ac471cf DO NOT MERGE revert system api loadSafeLabel
Bug: 28557603
Change-Id: Ib2dd0fc19217655a4d6b49cdf49ce36dfd6577d5
2016-07-06 17:05:32 -07:00
John Reck
0def73aac5 Consider queue & dequeue times for should draw
Bug: 29413700

Change-Id: I4b27b077af569e3c60c57b0e11501e9f3af70579
2016-07-06 17:00:43 -07:00
Chen Xu
ea5f6a74c0 Merge \\\\"DO NOT MERGE revert system api loadSafeLabel\\\\" into mnc-dev am: d2e2288fe3 am: 59fc768893 am: 69a071e55c
am: e5643a13c4  -s ours

Change-Id: I68bfaeedf5290ea792aa0570e68e24d0d6dada11
2016-07-06 23:42:41 +00:00
Hall Liu
bd72c9f62a Add video events to ParcelableCallAnalytics
Adds an isVideoCall boolean and a list of session upgrade/downgrade
requests.

Bug: 29239768
Change-Id: I4386a8fb5efe8fc673ffc904f2ddfa8400dcce38
2016-07-06 16:40:08 -07:00
Jeff Sharkey
8a918b13a8 Snapshot RemoteViews before releasing lock.
The MSG_NOTIFY_UPDATE_APP_WIDGET message is sent asynchronously,
meaning it tries sending RemoteViews without the lock held, possibly
while another Binder thread is trying to mutate it.

Fix this by creating a copy for the thread to safely dispatch.

Bug: 29889779
Change-Id: I341fbbf89abee97a66cd67f1dd2a728282b68bfa
2016-07-06 17:39:21 -06:00
fionaxu
e5643a13c4 Merge \\\"DO NOT MERGE revert system api loadSafeLabel\\\" into mnc-dev am: d2e2288fe3 am: 59fc768893
am: 69a071e55c

Change-Id: If59d61dfdc00f740ffcf8fbe5233b191eb03a797
2016-07-06 23:36:00 +00:00
Chen Xu
69a071e55c Merge \\"DO NOT MERGE revert system api loadSafeLabel\\" into mnc-dev am: d2e2288fe3
am: 59fc768893

Change-Id: I1eeb704e6b0a29e3574e969649ba72bbb5d9a9c2
2016-07-06 23:29:51 +00:00
Christopher Tate
59397a8e05 Explicitly flush compress/encrypt stream before close
We're losing the stream footer for mysterious reasons; maybe this
will help even though supposedly close() is expected to flush pending
buffered writes anyway.  In particular, an explicit flush of the
compression stage will generate a SYNC_FLUSH point, which ordinary
deflate-at-close operation does not.

Bug 28056941

Change-Id: I96580411257932d7addb176c6672eae72a5ac6f7
2016-07-06 16:27:32 -07:00
Christopher Tate
a2a6533d65 Harden framework against backup transport crashes
Make sure we catch any exception thrown back from the transport,
rather than relying on it to maintain the interface surface.  Some
exceptions turn out to be beyond the call-target's control to
prevent.

Bug 29761883

Change-Id: Ifafbac300e7d7dab793237b2fd47d3122751435f
2016-07-06 16:27:32 -07:00
fionaxu
59fc768893 Merge \"DO NOT MERGE revert system api loadSafeLabel\" into mnc-dev
am: d2e2288fe3

Change-Id: If7bb704d5d6ae942b7ceac3e9f22acf4cf3a7b4b
2016-07-06 23:24:04 +00:00
Jim Miller
016593fe84 Fix bug with launching home activity from LockSettingsService
This fixes a bug where LockSettingsService was sending a broadcast instead of launching
the home activity.

Fixes bug 29988032

Change-Id: Ibdbb15928fee575375576a31181d91323073a9fb
2016-07-06 16:23:45 -07:00
Annie Chin
d58f07f58a Merge "Add callbacks to VoiceInteractionManagerService" into nyc-mr1-dev 2016-07-06 23:22:10 +00:00
Chen Xu
d2e2288fe3 Merge "DO NOT MERGE revert system api loadSafeLabel" into mnc-dev 2016-07-06 23:16:55 +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