OSDN Git Service
Chad Brubaker [Fri, 8 Jul 2016 18:06:09 +0000 (11:06 -0700)]
Mention target API limits for ACTION_STORAGE_CHANGED
Bug:
28450538
Change-Id: I9c69f9d0bdda5b69aec2dc3014a612d84082dc64
Joe Fernandez [Thu, 7 Jul 2016 19:05:36 +0000 (19:05 +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
am:
8c41799b67
Change-Id: I793e33f9ebe499c869a98a0212d4b26fbca7e750
Joe Fernandez [Thu, 7 Jul 2016 19:05:33 +0000 (19:05 +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
am:
454150963b
Change-Id: I593c789aa4fd33f92466d883a088ee90bfbbcdb7
Kevin Hufnagle [Thu, 7 Jul 2016 19:05:31 +0000 (19:05 +0000)]
Merge \\\\\"docs: Edited \\\\\"Promote with Ads\\\\\" page; created \\\\\"Nearby\\\\\" feature page.\\\\\" into mnc-io-docs am:
31302819c1 am:
5301f68827 am:
557b747fb4 am:
e7d21d847e
am:
f4627a80d4
Change-Id: Iea3927d9805f9282690b6906e0d01d90d471f18c
Kevin Hufnagle [Thu, 7 Jul 2016 19:05:27 +0000 (19:05 +0000)]
Merge \\\\\"docs: Updated \\\\\"payments\\\\\" page; created new \\\\\"drive conversions\\\\\" page.\\\\\" into mnc-io-docs am:
a021c2d3e6 am:
11935fbcc9 am:
02fcab7f43 am:
847457ed9a
am:
ace7cdfc1b
Change-Id: I401f2fe9938f0a385a3cdc42199ebe8052152da3
TreeHugger Robot [Thu, 7 Jul 2016 18:49:38 +0000 (18:49 +0000)]
Merge "Unify readback Surface/TextureView copy mechanism"
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: 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: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: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
Fyodor Kupolov [Thu, 7 Jul 2016 18:13:01 +0000 (18:13 +0000)]
Merge \\"Install preloaded apps into the demo user\\" into nyc-mr1-dev am:
c77a2be407
am:
9b9f2013f4
Change-Id: I0292062b3f4f581f992101ca2c9112af6cad7c2b
Annie Chin [Thu, 7 Jul 2016 18:12:57 +0000 (18:12 +0000)]
Merge \\"Add a null check for mImpl.\\" into nyc-mr1-dev am:
5a4cfd36c2
am:
567be59cb4
Change-Id: Ib84725d14d7b0adbc0e26d67648a997f827a32cd
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
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
Jeff Sharkey [Thu, 7 Jul 2016 17:57:00 +0000 (17:57 +0000)]
Merge \\"Snapshot RemoteViews before releasing lock.\\" into nyc-mr1-dev am:
ffc0d5153c
am:
18d0841650
Change-Id: Iad6d527d6e0a81c127b7836e231044aeb40f065c
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
Hall Liu [Thu, 7 Jul 2016 17:45:17 +0000 (17:45 +0000)]
Merge \\"Add video events to ParcelableCallAnalytics\\" into nyc-mr1-dev am:
335a69d460
am:
77be2eb8f7
Change-Id: Ib1fc0358e6f965046788eba9ac11a7d5c9b5709b
Ashutosh Joshi [Thu, 7 Jul 2016 17:45:08 +0000 (17:45 +0000)]
Merge \\"Make ContextHubService compliant with new context hub interface.\\" into nyc-mr1-dev am:
80d90d1783
am:
b1e2e9a8e9
Change-Id: I4de4ae8b49d963f51caf5c479e86a79b16daa758
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
Philip P. Moltmann [Thu, 7 Jul 2016 17:04:56 +0000 (17:04 +0000)]
Merge "Fix doc for default print document content type"
Chris Craik [Thu, 7 Jul 2016 00:14:05 +0000 (17:14 -0700)]
Unify readback Surface/TextureView copy mechanism
Removes last usage of old rendering pipeline.
Change-Id: Ia920dec9cd726ca221e11e888562c7df39a9761e
Daniel Nishi [Thu, 7 Jul 2016 16:50:39 +0000 (16:50 +0000)]
Merge \\"Add margins to the system icons when the user avatar is gone.\\" into nyc-mr1-dev am:
3c75a0380d
am:
c0c4affe07
Change-Id: I4738a03ea901be7df95a953b887b0660f20d7d5b
Hemal Patel [Thu, 7 Jul 2016 16:45:25 +0000 (16:45 +0000)]
Merge \\\\\"Docs: Fixed wrong return type of a method\\\\\" into mnc-io-docs am:
13ce5dca58 am:
e02e644b92 am:
518f5a4e09 am:
72be3294ce
am:
b6dfa869ea
Change-Id: I926a6c8628b1d5e6434d8df3bc6450817b94f90b
Hemal Patel [Thu, 7 Jul 2016 16:45:16 +0000 (16:45 +0000)]
Merge \\\\\"Docs: Fixed wrong return type of a method\\\\\" into mnc-io-docs am:
13ce5dca58 am:
e02e644b92 am:
518f5a4e09 am:
bbc07950fc
am:
9ef1e926a6
Change-Id: I723c21b76e791336d25af5ce46ad1c13c097572b
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
John Reck [Thu, 7 Jul 2016 16:40:20 +0000 (16:40 +0000)]
Merge \\"Consider queue & dequeue times for should draw\\" into nyc-mr1-dev am:
3a465e7a12
am:
6354336493
Change-Id: Idbe85f08c27cc6f9433badd886a1fe7d9ba73c4f
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
Dave Langemak [Thu, 7 Jul 2016 15:56:10 +0000 (15:56 +0000)]
Merge \\"Hide APIs that shouldn\\'t have been public\\" into nyc-mr1-dev am:
8317f93012
am:
d34da3b659
Change-Id: I49e9fc1f0f58db9f6200b954b5b639ac263ca8da
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:47:33 +0000 (15:47 +0000)]
Merge \\\\"Resolve deadlock between ActivityManagerService and PowerManagerService\\\\" am:
06561db207 am:
2c565826ba am:
26a0b16da8
am:
43e8af64c2
Change-Id: I9c261e2c4223069f8cfa8d16a5e96babc4522af0
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:17:27 +0000 (13:17 +0000)]
Merge \\"IpConn metrics: distinguish NUD_FAILED answers\\" into nyc-mr1-dev am:
42e608527a
am:
99b36c8b4f
Change-Id: Iade155a1941674edf642e99bd506d1676b67ab42
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:52:25 +0000 (11:52 +0000)]
Merge \\"Bump ACTION_CHOOSE_PRIVATE_KEY_ALIAS broadcast to foreground\\" into nyc-mr1-dev am:
f627e9c09e
am:
2a1491061d
Change-Id: I30bad0f21b35f98db769a92ea81be7be50b86186
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:18:34 +0000 (11:18 +0000)]
Merge \\"Do not show user locked notification after reboot when there is no lock\\" into nyc-mr1-dev am:
f32e96a8df
am:
844ebd767c
Change-Id: I07976d8ba15a94c71359c4723c64d9d9374ec2ba
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
Lorenzo Colitti [Thu, 7 Jul 2016 11:06:53 +0000 (11:06 +0000)]
Merge \\"Rewrite lingering.\\" into nyc-mr1-dev am:
b0a574fbfc
am:
2249ae1c47
Change-Id: Ieff4a63ad1d5959760e69f68e832ca256ec2c2ae
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
Esteban Talavera [Thu, 7 Jul 2016 10:47:37 +0000 (10:47 +0000)]
Merge \\"Disallow OobConfig being suspended\\" into nyc-mr1-dev am:
ccdad8f85b
am:
8ccaacde33
Change-Id: I28c0621afb77e4c2d6471b0390d4acf794f4d1ea
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:45:36 +0000 (09:45 +0000)]
Merge \\"ConnectivityManager: no double callback remove\\" into nyc-mr1-dev am:
78feae882a
am:
a965203d5f
Change-Id: I8fb5bac2bb6b7665192c8c788d7818d637500935
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
Bryan Mawhinney [Thu, 7 Jul 2016 09:33:38 +0000 (09:33 +0000)]
Merge \\"Make MediaScanner extract \\"date taken\\" from videos, if present\\" into nyc-mr1-dev am:
d63dbfdb6b
am:
1cba847a71
Change-Id: I02937c5323fc6523b796cc6282ddc38a172b3fa0
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:18:59 +0000 (09:18 +0000)]
Merge \\"IpConn metrics: add times to DHCP bound state\\" into nyc-mr1-dev am:
bbf97cd121
am:
af71487dd7
Change-Id: Icecc32a3c9d220f64dc807008354bb0678cf5564
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:49:13 +0000 (07:49 +0000)]
Merge \\"Prepare to delete useless loop in handleReleaseNetworkRequest.\\" into nyc-mr1-dev am:
6f9fb31b79
am:
2ae8c05f58
Change-Id: I68c75cd5980075bdb2586ba5967fcb6ce20dc158
TreeHugger Robot [Thu, 7 Jul 2016 07:45:16 +0000 (07:45 +0000)]
Merge "Introduce Paint.hasGlyph performance tests."
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
Seigo Nonaka [Thu, 30 Jun 2016 09:02:36 +0000 (18:02 +0900)]
Introduce Paint.hasGlyph performance tests.
Bug:
29142734
Change-Id: I0209af2a9378130de2c0297578f8ab8900cacbb4
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
Jin Seok Park [Thu, 7 Jul 2016 05:44:04 +0000 (05:44 +0000)]
Merge "ExifInterface: Add support for preview images"
Sudheer Shanka [Thu, 7 Jul 2016 03:33:54 +0000 (03:33 +0000)]
Merge \\"Enable the demo launcher package as well.\\" into nyc-mr1-dev am:
b5b2c196a8
am:
be22429bb6
Change-Id: Iba60a6a38d756141328597be8098eec6a0e24926
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