OSDN Git Service
Andrew Sapperstein [Thu, 7 Jul 2016 20:07:43 +0000 (20:07 +0000)]
Merge \"Fix comment. The color is cyan 500 not teal.\" into nyc-mr1-dev
am:
bff9c1ab30
Change-Id: I1ce07ac6c8fffa1317ddd7e703cb5fe75dc26558
TreeHugger Robot [Thu, 7 Jul 2016 19:52:57 +0000 (19:52 +0000)]
Merge "Fix comment. The color is cyan 500 not teal." into nyc-mr1-dev
Jeff Sharkey [Thu, 7 Jul 2016 19:49:32 +0000 (19:49 +0000)]
Merge \"Remove \"starting apps\" boot message.\" into nyc-mr1-dev
am:
bb2d9ab98e
Change-Id: Ie4b072d38eaa281b6292ac70eb366734013c907d
Philip Cuadra [Thu, 7 Jul 2016 19:42:15 +0000 (19:42 +0000)]
Merge \"Make pinning files async in a background thread\" into nyc-mr1-dev
am:
f0df804e0a
Change-Id: Ic32e9e9d9260c18365c29f12cb60ad67a3590a47
Annie Chin [Thu, 7 Jul 2016 19:42:12 +0000 (19:42 +0000)]
Merge \"Move voice interaction callback list to VoiceInteractionManagerService\" into nyc-mr1-dev
am:
b91a5e7431
Change-Id: I5fdf69335aaf3dd6ee77753b4f3cc554e1a0342c
TreeHugger Robot [Thu, 7 Jul 2016 19:37:23 +0000 (19:37 +0000)]
Merge "Remove "starting apps" boot message." into nyc-mr1-dev
smain@google.com [Thu, 7 Jul 2016 19:35:55 +0000 (19:35 +0000)]
add redirect for URL hard-coded into the default proguard config file, and update related redirects for the entire /guide/developing/ path. am:
3bd0cec491
am:
fc7cc27a35
Change-Id: I097893a9c6cbd01fbced5daac804050e9b928740
TreeHugger Robot [Thu, 7 Jul 2016 19:35:26 +0000 (19:35 +0000)]
Merge "Make pinning files async in a background thread" into nyc-mr1-dev
smain@google.com [Thu, 7 Jul 2016 19:33:36 +0000 (19:33 +0000)]
add redirect for URL hard-coded into the default proguard config file, and update related redirects for the entire /guide/developing/ path. am:
3bd0cec491
am:
5e6dd44bfb
Change-Id: I2fa241dbe9193ea25e01f926ca9dfa0f23b970dc
Annie Chin [Thu, 7 Jul 2016 19:30:41 +0000 (19:30 +0000)]
Merge "Move voice interaction callback list to VoiceInteractionManagerService" into nyc-mr1-dev
smain@google.com [Thu, 7 Jul 2016 19:26:19 +0000 (19:26 +0000)]
add redirect for URL hard-coded into the default proguard config file, and update related redirects for the entire /guide/developing/ path.
am:
3bd0cec491
Change-Id: Id379926353bdfc47c0b59c0b19f794ad0e7715f3
smain@google.com [Thu, 7 Jul 2016 19:26:10 +0000 (19:26 +0000)]
add redirect for URL hard-coded into the default proguard config file, and update related redirects for the entire /guide/developing/ path.
am:
3bd0cec491
Change-Id: I4b6f7200c2ff403b74f1305b9779950bf98d3a67
smain@google.com [Thu, 7 Jul 2016 19:13:36 +0000 (12:13 -0700)]
add redirect for URL hard-coded into the default proguard config file,
and update related redirects for the entire /guide/developing/ path.
Change-Id: Ie23791e3765ff821d9abba220ebdde782d6439ed
Annie Chin [Thu, 7 Jul 2016 18:57:33 +0000 (11:57 -0700)]
Move voice interaction callback list to VoiceInteractionManagerService
Bug:
30005941
Change-Id: I23b3bba8b4525068b0f032d5ca908c0f1d181558
Android Build Merger (Role) [Thu, 7 Jul 2016 18:44:48 +0000 (18:44 +0000)]
Merge "Merge \\\\"docs: Edited \\\\"Promote with Ads\\\\" page; created \\\\"Nearby\\\\" feature page.\\\\" into mnc-io-docs am:
31302819c1 am:
5301f68827 am:
557b747fb4 am:
a666828702" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 7 Jul 2016 18:44:29 +0000 (18:44 +0000)]
Merge "Merge \\\\"docs: Updated \\\\"payments\\\\" page; created new \\\\"drive conversions\\\\" page.\\\\" into mnc-io-docs am:
a021c2d3e6 am:
11935fbcc9 am:
02fcab7f43 am:
499db93977" into nyc-mr1-dev-plus-aosp
Joe Fernandez [Thu, 7 Jul 2016 18:43:57 +0000 (18:43 +0000)]
Merge \\\\"docs: Edited \\\\"Promote with Ads\\\\" page; created \\\\"Nearby\\\\" feature page.\\\\" into mnc-io-docs am:
31302819c1 am:
5301f68827 am:
557b747fb4
am:
a666828702
Change-Id: I3bb2bff89c17679f4b8810061396313a0b65d80d
Joe Fernandez [Thu, 7 Jul 2016 18:43:54 +0000 (18:43 +0000)]
Merge \\\\"docs: Updated \\\\"payments\\\\" page; created new \\\\"drive conversions\\\\" page.\\\\" into mnc-io-docs am:
a021c2d3e6 am:
11935fbcc9 am:
02fcab7f43
am:
499db93977
Change-Id: If28976df19c4badd1d111bce33bd5df9afb37499
Joe Fernandez [Thu, 7 Jul 2016 18:39:10 +0000 (18:39 +0000)]
Merge \\\\"docs: Edited \\\\"Promote with Ads\\\\" page; created \\\\"Nearby\\\\" feature page.\\\\" into mnc-io-docs am:
31302819c1 am:
5301f68827 am:
557b747fb4
am:
e7d21d847e
Change-Id: I5869f23ae4b312ba4be2479e7240df8d07654bde
Joe Fernandez [Thu, 7 Jul 2016 18:39:06 +0000 (18:39 +0000)]
Merge \\\\"docs: Updated \\\\"payments\\\\" page; created new \\\\"drive conversions\\\\" page.\\\\" into mnc-io-docs am:
a021c2d3e6 am:
11935fbcc9 am:
02fcab7f43
am:
847457ed9a
Change-Id: Icff019fb735d58fe9c8118fcb8db2c1ae857c436
Kevin Hufnagle [Thu, 7 Jul 2016 18:32:16 +0000 (18:32 +0000)]
Merge \\\"docs: Edited \\\"Promote with Ads\\\" page; created \\\"Nearby\\\" feature page.\\\" into mnc-io-docs am:
31302819c1 am:
5301f68827
am:
557b747fb4
Change-Id: I873f467fec50364f7e12db782dd4ed176a2a6822
Kevin Hufnagle [Thu, 7 Jul 2016 18:32:09 +0000 (18:32 +0000)]
Merge \\\"docs: Edited \\\"Promote with Ads\\\" page; created \\\"Nearby\\\" feature page.\\\" into mnc-io-docs am:
31302819c1 am:
5301f68827
am:
557b747fb4
Change-Id: Id6f969efd5f636d3c20e8e8fe073b033f02210ab
Kevin Hufnagle [Thu, 7 Jul 2016 18:32:09 +0000 (18:32 +0000)]
Merge \\\"docs: Updated \\\"payments\\\" page; created new \\\"drive conversions\\\" page.\\\" into mnc-io-docs am:
a021c2d3e6 am:
11935fbcc9
am:
02fcab7f43
Change-Id: I92905b38e44a5c049705bf3bfb341803d56540ab
Kevin Hufnagle [Thu, 7 Jul 2016 18:32:04 +0000 (18:32 +0000)]
Merge \\\"docs: Updated \\\"payments\\\" page; created new \\\"drive conversions\\\" page.\\\" into mnc-io-docs am:
a021c2d3e6 am:
11935fbcc9
am:
02fcab7f43
Change-Id: Ie3448b4dbf85afa36b9a39e07683fe5386d83156
Joe Fernandez [Thu, 7 Jul 2016 18:21:05 +0000 (18:21 +0000)]
Merge \\"docs: Edited \\"Promote with Ads\\" page; created \\"Nearby\\" feature page.\\" into mnc-io-docs am:
31302819c1
am:
5301f68827
Change-Id: Ic59d70a5ce5693ed0facdc07e37dd23a7cfae061
Joe Fernandez [Thu, 7 Jul 2016 18:20:58 +0000 (18:20 +0000)]
Merge \\"docs: Updated \\"payments\\" page; created new \\"drive conversions\\" page.\\" into mnc-io-docs am:
a021c2d3e6
am:
11935fbcc9
Change-Id: I44cac66629a2c642ab86331bdda1bb1943df56a0
Kevin Hufnagle [Thu, 7 Jul 2016 18:14:09 +0000 (18:14 +0000)]
Merge \"docs: Edited \"Promote with Ads\" page; created \"Nearby\" feature page.\" into mnc-io-docs
am:
31302819c1
Change-Id: I971086d0b8bb3268fdd62f41567654857b92dba8
Kevin Hufnagle [Thu, 7 Jul 2016 18:14:06 +0000 (18:14 +0000)]
Merge \"docs: Updated \"payments\" page; created new \"drive conversions\" page.\" into mnc-io-docs
am:
a021c2d3e6
Change-Id: Idaed3f61c560217b31cc8a0e81d7a7ed761ee977
Jeff Sharkey [Mon, 27 Jun 2016 23:08:23 +0000 (17:08 -0600)]
Remove "starting apps" boot message.
The "starting apps" message is only shown for a short period of time
before we show the lock screen. Recent boot animations now have a
spin down phase which is just long enough to result in us flashing
this message for a very short period of time, which looks janky.
To avoid the janky behavior, remove this message altogether. Other
boot messages for dexopt'ing after an OTA remain intact.
Also fix security bug that would allow any app to show a message.
Bug:
29367890
Change-Id: I77bb65acbe0e5afb4033dc6b83e533e665dce690
Joe Fernandez [Thu, 7 Jul 2016 18:09:40 +0000 (18:09 +0000)]
Merge "docs: Edited "Promote with Ads" page; created "Nearby" feature page." into mnc-io-docs
Joe Fernandez [Thu, 7 Jul 2016 18:06:34 +0000 (18:06 +0000)]
Merge "docs: Updated "payments" page; created new "drive conversions" page." into mnc-io-docs
Fyodor Kupolov [Thu, 7 Jul 2016 18:05:50 +0000 (18:05 +0000)]
Merge \"Install preloaded apps into the demo user\" into nyc-mr1-dev
am:
c77a2be407
Change-Id: Ib762cc51c0e56b9440545b48fe2d11208abfd890
Annie Chin [Thu, 7 Jul 2016 18:05:45 +0000 (18:05 +0000)]
Merge \"Add a null check for mImpl.\" into nyc-mr1-dev
am:
5a4cfd36c2
Change-Id: I26403fba055ca356ed69b599525dc7b6cf795b61
Andrew Sapperstein [Thu, 7 Jul 2016 18:03:41 +0000 (11:03 -0700)]
Fix comment. The color is cyan 500 not teal.
Bug:
29881561
Change-Id: I3bce85829532901ce4dae00eced281ca0a6fd838
Fyodor Kupolov [Thu, 7 Jul 2016 18:00:53 +0000 (18:00 +0000)]
Merge "Install preloaded apps into the demo user" into nyc-mr1-dev
Philip Cuadra [Wed, 6 Jul 2016 23:00:32 +0000 (16:00 -0700)]
Make pinning files async in a background thread
Make the actual pinning of files be async in the system server background thread.
There's no need to block system_server from doing useful work on the ui
thread while the files are pinned.
bug
28251566
Change-Id: I905c165533692979ac179e987216378210396e75
Jeff Sharkey [Thu, 7 Jul 2016 17:49:36 +0000 (17:49 +0000)]
Merge \"Snapshot RemoteViews before releasing lock.\" into nyc-mr1-dev
am:
ffc0d5153c
Change-Id: I5c69b1d676d20a9d339a2dea635f07ab2a319638
Annie Chin [Thu, 7 Jul 2016 17:44:04 +0000 (17:44 +0000)]
Merge "Add a null check for mImpl." into nyc-mr1-dev
Hall Liu [Thu, 7 Jul 2016 17:37:28 +0000 (17:37 +0000)]
Merge \"Add video events to ParcelableCallAnalytics\" into nyc-mr1-dev
am:
335a69d460
Change-Id: Icc0aef243860e93e714fcbc4b8cdc336d99e81f1
Ashutosh Joshi [Thu, 7 Jul 2016 17:36:54 +0000 (17:36 +0000)]
Merge \"Make ContextHubService compliant with new context hub interface.\" into nyc-mr1-dev
am:
80d90d1783
Change-Id: Ibdda2e82b6175832474c07121d867ee4761e6d19
Jeff Sharkey [Thu, 7 Jul 2016 17:36:50 +0000 (17:36 +0000)]
Merge "Snapshot RemoteViews before releasing lock." into nyc-mr1-dev
Hall Liu [Thu, 7 Jul 2016 17:27:24 +0000 (17:27 +0000)]
Merge "Add video events to ParcelableCallAnalytics" into nyc-mr1-dev
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
Annie Chin [Thu, 7 Jul 2016 17:22:34 +0000 (10:22 -0700)]
Add a null check for mImpl.
Bug:
30005941
Change-Id: I1212aa66be71b7ee0e990596272a33fa7530770f
Daniel Nishi [Thu, 7 Jul 2016 16:44:50 +0000 (16:44 +0000)]
Merge \"Add margins to the system icons when the user avatar is gone.\" into nyc-mr1-dev
am:
3c75a0380d
Change-Id: I9a92b0501fe6cbd3a910f21ff89e893ee5d77c67
Hemal Patel [Thu, 7 Jul 2016 16:38:49 +0000 (16:38 +0000)]
Merge \\\\"Docs: Fixed wrong return type of a method\\\\" into mnc-io-docs am:
13ce5dca58 am:
e02e644b92 am:
518f5a4e09
am:
72be3294ce
Change-Id: I57c340ff1024dc58d930225a1ed7e8a3aa741a92
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:27:35 +0000 (16:27 +0000)]
Merge \\\\"Docs: Fixed wrong return type of a method\\\\" into mnc-io-docs am:
13ce5dca58 am:
e02e644b92 am:
518f5a4e09
am:
bbc07950fc
Change-Id: I84a001a5b46be5b724c1371c15d7ac47ae2de7dd
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:23:19 +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: I0dd2911c4456750b2f718cab37de1bf6056275a4
John Reck [Thu, 7 Jul 2016 16:18:06 +0000 (16:18 +0000)]
Merge \"Consider queue & dequeue times for should draw\" into nyc-mr1-dev
am:
3a465e7a12
Change-Id: I2ea38a087056e2f75aeb27c5bce03fe52690cd6e
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
Makoto Onuki [Thu, 7 Jul 2016 15:47:43 +0000 (15:47 +0000)]
Merge \"Hide APIs that shouldn\'t have been public\" into nyc-mr1-dev
am:
8317f93012
Change-Id: I28a43a5391d8f815029a3f78ef2f45bc67105bb9
Shibin George [Thu, 7 Jul 2016 15:41:48 +0000 (15:41 +0000)]
Merge \\\"Resolve deadlock between ActivityManagerService and PowerManagerService\\\" am:
06561db207 am:
2c565826ba
am:
26a0b16da8
Change-Id: Ib90892556fde2bf8c53a7074b5d2702059adff65
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
Shibin George [Thu, 7 Jul 2016 15:36:46 +0000 (15:36 +0000)]
Merge \\"Resolve deadlock between ActivityManagerService and PowerManagerService\\" am:
06561db207
am:
2c565826ba
Change-Id: I875f9f1ed5f6ab82c85ab35e7a24737d08aa3365
Shibin George [Thu, 7 Jul 2016 15:31:16 +0000 (15:31 +0000)]
Merge \"Resolve deadlock between ActivityManagerService and PowerManagerService\"
am:
06561db207
Change-Id: I7f78cf1ef0c490aceb527dbc82228d00fae2f7e4
Treehugger Robot [Thu, 7 Jul 2016 15:19:01 +0000 (15:19 +0000)]
Merge "Resolve deadlock between ActivityManagerService and PowerManagerService"
Shibin George [Tue, 5 Jul 2016 20:42:10 +0000 (02:12 +0530)]
Resolve deadlock between ActivityManagerService and PowerManagerService
ActivityManagerService lock and PowerManagerService.mLock can
be acquired in different threads in different orders.
registerReceiver() here tries to acquire ActivityManagerService
internally while holding mLock. A particular call from
WindowManagerService acquires these locks in reverse order.
This deadlock can be resolved by moving registerReceiver()
to another thread.
https://code.google.com/p/android/issues/detail?id=215254
Change-Id: I12cd610e61f212a3fb5e441f2c7a557c90afbda4
Signed-off-by: Shibin George <shibing@codeaurora.org>
Hugo Benichi [Thu, 7 Jul 2016 13:11:01 +0000 (13:11 +0000)]
Merge \"IpConn metrics: distinguish NUD_FAILED answers\" into nyc-mr1-dev
am:
42e608527a
Change-Id: I4303badea7760c6cd9a1b63db1df8a3766a638f2
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:46:47 +0000 (11:46 +0000)]
Merge \"Bump ACTION_CHOOSE_PRIVATE_KEY_ALIAS broadcast to foreground\" into nyc-mr1-dev
am:
f627e9c09e
Change-Id: Ia080af7aea13e630ed45a27233fd1efc2f3fe1b4
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:12:37 +0000 (11:12 +0000)]
Merge \"Do not show user locked notification after reboot when there is no lock\" into nyc-mr1-dev
am:
f32e96a8df
Change-Id: If32cda85b7737d04ffc83fc6686c176f9e6910a1
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 11:01:19 +0000 (11:01 +0000)]
Merge \"Rewrite lingering.\" into nyc-mr1-dev
am:
b0a574fbfc
Change-Id: I62d69f20101318b42d4d333b104dcf4f64dc1725
Lorenzo Colitti [Thu, 7 Jul 2016 10:55:38 +0000 (10:55 +0000)]
Merge "Rewrite lingering." into nyc-mr1-dev
Tony Mak [Thu, 7 Jul 2016 10:41:57 +0000 (10:41 +0000)]
Merge \"Disallow OobConfig being suspended\" into nyc-mr1-dev
am:
ccdad8f85b
Change-Id: Ic072ddf8787b88c08f67af73550c50a867328930
Esteban Talavera [Thu, 7 Jul 2016 10:33:21 +0000 (10:33 +0000)]
Merge "Disallow OobConfig being suspended" into nyc-mr1-dev
Hugo Benichi [Thu, 7 Jul 2016 09:38:29 +0000 (09:38 +0000)]
Merge \"ConnectivityManager: no double callback remove\" into nyc-mr1-dev
am:
78feae882a
Change-Id: Ib7b10c59c1f7c84ec78c7527fba8a6c9aa5b0c05
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:28:03 +0000 (09:28 +0000)]
Merge \"Make MediaScanner extract \"date taken\" from videos, if present\" into nyc-mr1-dev
am:
d63dbfdb6b
Change-Id: I5ea0eafbc2e122f2756098ac98b50c03fe773be5
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
Hugo Benichi [Thu, 7 Jul 2016 09:13:22 +0000 (09:13 +0000)]
Merge \"IpConn metrics: add times to DHCP bound state\" into nyc-mr1-dev
am:
bbf97cd121
Change-Id: I0002c00d03165ac4bfa4a9790984d9e5615d7ff4
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
Lorenzo Colitti [Thu, 7 Jul 2016 07:40:46 +0000 (07:40 +0000)]
Merge \"Prepare to delete useless loop in handleReleaseNetworkRequest.\" into nyc-mr1-dev
am:
6f9fb31b79
Change-Id: I8cd95575e7758ee94417ec15e407f396434f4c04
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
Sudheer Shanka [Thu, 7 Jul 2016 03:27:30 +0000 (03:27 +0000)]
Merge \"Enable the demo launcher package as well.\" into nyc-mr1-dev
am:
b5b2c196a8
Change-Id: Ie5c2c249a046edbd9c6f2347056f121b96b12284
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
Jorim Jaggi [Thu, 7 Jul 2016 02:35:48 +0000 (02:35 +0000)]
Merge \"Revert \"Fix navigation bar order in seascape\"\" into nyc-mr1-dev
am:
ce715e4922
Change-Id: I02b59a2f7ed17f9f5fd209cc090da62e37fa63ba
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
Android Build Merger (Role) [Thu, 7 Jul 2016 02:10:43 +0000 (02:10 +0000)]
Merge "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 am:
8e71c857ff" into nyc-mr1-dev-plus-aosp
fionaxu [Thu, 7 Jul 2016 02:10:11 +0000 (02:10 +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
am:
8e71c857ff
Change-Id: Ic168cf27b9e4cbd5c002a74323eeaa505e55e59b
fionaxu [Thu, 7 Jul 2016 02:09:39 +0000 (02:09 +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
am:
eea1ae16d5
Change-Id: Idefe8e70ff74378b6da441382c75d66e3104dccb
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 02:01:55 +0000 (02:01 +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: Ie8cab000503035a1b9e620912356df74e20f4c37
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
Chen Xu [Thu, 7 Jul 2016 01:37:57 +0000 (01:37 +0000)]
Merge \\\\\\"DO NOT MERGE revert system api loadSafeLabel\\\\\\" into mnc-dev am:
d2e2288fe3 am:
59fc768893 am:
69a071e55c am:
e5643a13c4 -s ours am:
ea5f6a74c0
am:
fb55beefc8
Change-Id: I2ca8a734fbcaf1860e39df6cdb4cdad0e065f5ea
Scott Main [Thu, 7 Jul 2016 01:37:52 +0000 (01:37 +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
am:
68d98965c5
Change-Id: I729284b793399191b9a53d5e507126a48de820ed
Svetoslav Ganov [Thu, 7 Jul 2016 01:37:48 +0000 (01:37 +0000)]
Merge \\"Use proper lock when accessing the generation registry\\" into nyc-dev am:
dcf2e205bf
am:
8503bf31bf
Change-Id: I1ab1849f80f3830c12506210329ba667f7c72488