OSDN Git Service
Diego Perez [Wed, 11 Jan 2017 15:57:12 +0000 (15:57 +0000)]
Merge "Call onApplyWindowInsets after requestApplyWindowInsets"
Lenka Trochtova [Wed, 11 Jan 2017 15:48:30 +0000 (15:48 +0000)]
Merge "Don't offer the BT sharing option to the user if BT is disallowed." am:
0c1a4b6a97 am:
345362c66f am:
44a53bab46
am:
aa369e5d19
Change-Id: Iac1ae24754e012d31341f3a2b6fec3c637180f8e
Neil Fuller [Wed, 11 Jan 2017 15:45:29 +0000 (15:45 +0000)]
Merge "Refactor RFCOMM / BluetoothSocket usage of LocalSocket" am:
649a89e524 am:
f4e236c794 am:
43d53395dc
am:
75f84f2261
Change-Id: I5cf584048e1e2cde67c33d77e99cd181db4e8c82
Richard Uhler [Wed, 11 Jan 2017 15:41:36 +0000 (15:41 +0000)]
Merge "Cleanup code given PATCHOAT_FOR_RELOCATION has been removed." am:
8582826f8d am:
5c5637e1bd am:
4911e517ab
am:
c662c1541b
Change-Id: I2ac812bdbd3a8fb8619d5c8d1694fb67a8a69632
Erik Kline [Wed, 11 Jan 2017 15:40:27 +0000 (15:40 +0000)]
Merge "Prepare UpstreamNetworkMonitor for extraction" am:
f84e5e8f76 am:
d48902d37e am:
305796276b
am:
1559d51f86
Change-Id: I4cbcc423be83613555e69f894e2d09004d363e5a
Santos Cordon [Wed, 11 Jan 2017 15:39:30 +0000 (15:39 +0000)]
Merge "Add Brightness setting for VR Mode." into nyc-mr2-dev am:
a00c235600
am:
27e121f27f
Change-Id: I527300ce4f4182c278a2e065f2e5a3c322c79433
Santos Cordon [Wed, 11 Jan 2017 15:38:29 +0000 (15:38 +0000)]
Add Brightness setting for VR Mode. am:
d6a5660a2c
am:
f85ab8306f -s ours
Change-Id: Iea1f7d32d9c478fd7b1e0477ec12d811d6bd0daf
Lenka Trochtova [Wed, 11 Jan 2017 15:09:46 +0000 (15:09 +0000)]
Merge "Don't offer the BT sharing option to the user if BT is disallowed." am:
0c1a4b6a97 am:
345362c66f
am:
44a53bab46
Change-Id: Ide191d76911c7909b2ffa6969f6d2481b1b27276
Philipp Weiß [Wed, 11 Jan 2017 15:03:25 +0000 (15:03 +0000)]
Merge "Add ticker text for network logging notification"
Lenka Trochtova [Wed, 11 Jan 2017 14:59:18 +0000 (14:59 +0000)]
Merge "Don't offer the BT sharing option to the user if BT is disallowed." am:
0c1a4b6a97
am:
345362c66f
Change-Id: I56d94f43683581d940d3711c9ca86fee0861b0e6
Jorim Jaggi [Wed, 11 Jan 2017 14:58:47 +0000 (14:58 +0000)]
Merge "Clean up starting window to prepare for saved surfaces"
Lenka Trochtova [Wed, 11 Jan 2017 14:49:09 +0000 (14:49 +0000)]
Merge "Don't offer the BT sharing option to the user if BT is disallowed."
am:
0c1a4b6a97
Change-Id: Ic304d77ea532a1a6a6539ba9d4dca35a0f628ff2
Treehugger Robot [Wed, 11 Jan 2017 14:40:05 +0000 (14:40 +0000)]
Merge "Don't offer the BT sharing option to the user if BT is disallowed."
Neil Fuller [Wed, 11 Jan 2017 13:54:10 +0000 (13:54 +0000)]
Merge "Refactor RFCOMM / BluetoothSocket usage of LocalSocket" am:
649a89e524 am:
f4e236c794
am:
43d53395dc
Change-Id: Ib7055c5ddf2caa52082aee4b67e3ebd213e09e4b
Neil Fuller [Wed, 11 Jan 2017 13:48:14 +0000 (13:48 +0000)]
Merge "Refactor RFCOMM / BluetoothSocket usage of LocalSocket" am:
649a89e524
am:
f4e236c794
Change-Id: If23b5efe912c5b0a76487c46723288ff6a903a14
phweiss [Tue, 10 Jan 2017 18:31:07 +0000 (19:31 +0100)]
Add ticker text for network logging notification
Set ticker text to title for accessibility.
Bug:
31207965
Test: manual
Change-Id: I0b78f9e6464dd470b74e0db97813623b335835d9
Neil Fuller [Wed, 11 Jan 2017 13:37:37 +0000 (13:37 +0000)]
Merge "Refactor RFCOMM / BluetoothSocket usage of LocalSocket"
am:
649a89e524
Change-Id: Ib8dc0ec183b870931bf4befea5ff32532009fddd
Neil Fuller [Wed, 11 Jan 2017 13:27:09 +0000 (13:27 +0000)]
Merge "Refactor RFCOMM / BluetoothSocket usage of LocalSocket"
Richard Uhler [Wed, 11 Jan 2017 10:58:30 +0000 (10:58 +0000)]
Merge "Cleanup code given PATCHOAT_FOR_RELOCATION has been removed." am:
8582826f8d am:
5c5637e1bd
am:
4911e517ab
Change-Id: I5fd04eb1e91d4ff590a195598566a85bbc00999f
Rubin Xu [Wed, 11 Jan 2017 10:56:21 +0000 (10:56 +0000)]
Merge "Update active fingerprint group when switching profiles"
Richard Uhler [Wed, 11 Jan 2017 10:48:00 +0000 (10:48 +0000)]
Merge "Cleanup code given PATCHOAT_FOR_RELOCATION has been removed." am:
8582826f8d
am:
5c5637e1bd
Change-Id: I27f00cca9b511d6950e12b59f179faae21f07147
Richard Uhler [Wed, 11 Jan 2017 10:37:33 +0000 (10:37 +0000)]
Merge "Cleanup code given PATCHOAT_FOR_RELOCATION has been removed."
am:
8582826f8d
Change-Id: If5d55f55d86c4e4711e36a7f517336fbdda96e3d
Treehugger Robot [Wed, 11 Jan 2017 10:28:16 +0000 (10:28 +0000)]
Merge "Cleanup code given PATCHOAT_FOR_RELOCATION has been removed."
Erik Kline [Wed, 11 Jan 2017 08:48:33 +0000 (08:48 +0000)]
Merge "Prepare UpstreamNetworkMonitor for extraction" am:
f84e5e8f76 am:
d48902d37e
am:
305796276b
Change-Id: Iba225c91bb8b27887805cdba29493c817a969f98
Richard Uhler [Thu, 8 Dec 2016 10:33:09 +0000 (10:33 +0000)]
Cleanup code given PATCHOAT_FOR_RELOCATION has been removed.
Test: make, device boots, installed an app
Test: adb shell cmd package compile -m speed|speed-profile <app>
Bug:
33192586
Change-Id: I8ef7d4926773586251fedf8a7737a8005f119859
Erik Kline [Wed, 11 Jan 2017 08:42:55 +0000 (08:42 +0000)]
Merge "Prepare UpstreamNetworkMonitor for extraction" am:
f84e5e8f76
am:
d48902d37e
Change-Id: Ia3c21d905c5f4eaa1dd0ea09f3113989e9d8eecc
Erik Kline [Wed, 11 Jan 2017 08:38:00 +0000 (08:38 +0000)]
Merge "Prepare UpstreamNetworkMonitor for extraction"
am:
f84e5e8f76
Change-Id: I4e4d525ff1dc23189e4ef6978a1980319d6b85f2
Erik Kline [Wed, 11 Jan 2017 08:29:17 +0000 (08:29 +0000)]
Merge "Prepare UpstreamNetworkMonitor for extraction"
Seigo Nonaka [Wed, 11 Jan 2017 08:24:06 +0000 (08:24 +0000)]
Merge "Introduce full justification."
TreeHugger Robot [Wed, 11 Jan 2017 06:30:20 +0000 (06:30 +0000)]
Merge "Require InputContentInfo.requestPermission()"
David Stevens [Wed, 11 Jan 2017 05:36:22 +0000 (05:36 +0000)]
Merge "Fix calculation of duration in AnimationSet"
Andreas Gampe [Wed, 11 Jan 2017 04:53:19 +0000 (04:53 +0000)]
Merge "Zygote: Add fdsToIgnore" am:
5b22a826d5 am:
140b9b65a1 am:
e4cff36099
am:
3b51506c5c
Change-Id: I24e391d2cd7b9bff0808fc9355059b1b71bcba3e
Calin Juravle [Wed, 11 Jan 2017 04:50:28 +0000 (04:50 +0000)]
Merge changes I5b94a8f0,Ie6cdd846,Ie6b5f5e6,Ib962edf6,I9d779b2d, ... am:
619d6282c3 am:
6d0b836562 am:
8ad84c5e70
am:
4b1548bd5a
Change-Id: I0aeb97b80a4d5b3eeb18c4a2ac7467c9035f700a
Calin Juravle [Wed, 11 Jan 2017 04:49:33 +0000 (04:49 +0000)]
Add an extra debug flag to BackgroundDexOptimizer am:
3a2b7f7d59 am:
236477e86e am:
f5d005b8c2
am:
5c451a64fd
Change-Id: I9260b16dbc9f070c158bb2afecb10f31c4c500f2
Calin Juravle [Wed, 11 Jan 2017 04:48:34 +0000 (04:48 +0000)]
Some refactoring in BackgroundDexOptService. am:
95176bb18e am:
377cc26e3a am:
e1a0a76381
am:
a9d1bfadf0 -s ours
Change-Id: Iec487a8c0daf72f095ed4e51217bda2c00e7ce8d
Calin Juravle [Wed, 11 Jan 2017 04:47:40 +0000 (04:47 +0000)]
Do not try to resolve realpath in DexManager. am:
b96dba9bad am:
b8f31d8a85 am:
d86ca1cd25
am:
6d90cdb03b
Change-Id: Ic5040d3de6d00629ff184a951b84a4ea6e491f9d
Calin Juravle [Wed, 11 Jan 2017 04:46:20 +0000 (04:46 +0000)]
Log DexManager realpath errors only in debug mode. am:
271bacbf5c am:
42c7fc7f27 am:
46b323869f
am:
4b92117bf6 -s ours
Change-Id: Ibd3705e5a0e2469ae49a86b4b3471b63776c3523
Calin Juravle [Wed, 11 Jan 2017 04:45:05 +0000 (04:45 +0000)]
Record data about dex files use on disk am:
5a9094c1b6 am:
dc10a3bdb0 am:
ea1c34d45e
am:
a9911290ed -s ours
Change-Id: I59409244cc1f6112dffab1e055ceae2dea32e78d
Calin Juravle [Wed, 11 Jan 2017 04:44:02 +0000 (04:44 +0000)]
Add logic for recording dex files use on disk am:
6ea5ace7b3 am:
34bdf1680a am:
bc7f234daa
am:
edc6306402
Change-Id: I829dca06b129ec7e8d185980c16078f783ec3ed0
TreeHugger Robot [Wed, 11 Jan 2017 04:41:02 +0000 (04:41 +0000)]
Merge "JNI attach/detach threads executing GNSS HAL callback methods"
Erik Kline [Tue, 10 Jan 2017 08:37:54 +0000 (17:37 +0900)]
Prepare UpstreamNetworkMonitor for extraction
Test: as follows:
- built (bullhead)
- flashed
- booted
- runtest frameworks-net
- tested basic wifi-to-mobile tethering (no DUN)
Bug:
32163131
Change-Id: Id0b2497f231af5e79ae3bbf42c73bc78031b6fa3
TreeHugger Robot [Wed, 11 Jan 2017 04:25:03 +0000 (04:25 +0000)]
Merge "Shuffle around shell protected broadcast checks."
TreeHugger Robot [Wed, 11 Jan 2017 04:19:59 +0000 (04:19 +0000)]
Merge "YAMAFFR - Yet Another Major AutoFill Framework Refactoring"
Lorenzo Colitti [Wed, 11 Jan 2017 03:52:19 +0000 (03:52 +0000)]
Merge "Remove requestRouteToHost and {start,stop}UsingNetworkFeature."
David Stevens [Wed, 11 Jan 2017 02:58:27 +0000 (18:58 -0800)]
Fix calculation of duration in AnimationSet
Unfortunately, AnimationSet.getDuration is defined incorrectly, so
this fix doesn't actually affect any behavior.
Test: None
Change-Id: I8328b603aee23252b5fab4acfd34d3f0e8fe06c0
Santos Cordon [Wed, 11 Jan 2017 03:12:11 +0000 (03:12 +0000)]
Merge "Add Brightness setting for VR Mode." into nyc-mr2-dev
am:
a00c235600
Change-Id: Idcf0447ec99e148b865c2f8fe25c614bc149aa32
Santos Cordon [Wed, 11 Jan 2017 03:12:05 +0000 (03:12 +0000)]
Add Brightness setting for VR Mode.
am:
d6a5660a2c
Change-Id: If371f485471eb1ab0a3e07964c197cb9b8ef1c9f
Santos Cordon [Wed, 11 Jan 2017 03:02:52 +0000 (03:02 +0000)]
Merge "Add Brightness setting for VR Mode." into nyc-mr2-dev
Santos Cordon [Wed, 11 Jan 2017 03:01:58 +0000 (03:01 +0000)]
Merge "Add Brightness setting for VR Mode."
Andreas Gampe [Wed, 11 Jan 2017 03:01:40 +0000 (03:01 +0000)]
Merge "Zygote: Add fdsToIgnore" am:
5b22a826d5 am:
140b9b65a1
am:
e4cff36099
Change-Id: I89cd109839b4af2510a5b1789a146f7efea4cb80
Calin Juravle [Wed, 11 Jan 2017 02:58:50 +0000 (02:58 +0000)]
Merge changes I5b94a8f0,Ie6cdd846,Ie6b5f5e6,Ib962edf6,I9d779b2d, ... am:
619d6282c3 am:
6d0b836562
am:
8ad84c5e70
Change-Id: I3b632d25a35dca6601cd6b88862d1a302a9eb471
Calin Juravle [Wed, 11 Jan 2017 02:57:52 +0000 (02:57 +0000)]
Add an extra debug flag to BackgroundDexOptimizer am:
3a2b7f7d59 am:
236477e86e
am:
f5d005b8c2
Change-Id: Icb9d089b68ec192b73b31b965c66f2f747ce220b
Calin Juravle [Wed, 11 Jan 2017 02:56:53 +0000 (02:56 +0000)]
Some refactoring in BackgroundDexOptService. am:
95176bb18e am:
377cc26e3a
am:
e1a0a76381
Change-Id: Id97538a51933ccbb9c62511e5949664780b7e861
Calin Juravle [Wed, 11 Jan 2017 02:56:00 +0000 (02:56 +0000)]
Do not try to resolve realpath in DexManager. am:
b96dba9bad am:
b8f31d8a85
am:
d86ca1cd25
Change-Id: I6b01cc2af9447ca2d5a871c6e1dd9ccf8d84e640
Calin Juravle [Wed, 11 Jan 2017 02:54:25 +0000 (02:54 +0000)]
Log DexManager realpath errors only in debug mode. am:
271bacbf5c am:
42c7fc7f27
am:
46b323869f
Change-Id: I55e04d69bba9d14f0527c648d29f8ec8b7bbddfb
Calin Juravle [Wed, 11 Jan 2017 02:53:31 +0000 (02:53 +0000)]
Record data about dex files use on disk am:
5a9094c1b6 am:
dc10a3bdb0
am:
ea1c34d45e
Change-Id: Ie9f489ff2ec89e9014eb683e269139ba633762bb
Calin Juravle [Wed, 11 Jan 2017 02:52:35 +0000 (02:52 +0000)]
Add logic for recording dex files use on disk am:
6ea5ace7b3 am:
34bdf1680a
am:
bc7f234daa
Change-Id: Iaf2ffd60d374eef179705e35743338ff3d8105c3
Andreas Gampe [Wed, 11 Jan 2017 02:46:57 +0000 (02:46 +0000)]
Merge "Zygote: Add fdsToIgnore" am:
5b22a826d5
am:
140b9b65a1
Change-Id: Ib4c46887ed5d87ef143bd866320d77b75d8711a3
Calin Juravle [Wed, 11 Jan 2017 02:44:08 +0000 (02:44 +0000)]
Merge changes I5b94a8f0,Ie6cdd846,Ie6b5f5e6,Ib962edf6,I9d779b2d, ... am:
619d6282c3
am:
6d0b836562
Change-Id: I22594f44c2487a7b0933de9c298389f9a6688549
Calin Juravle [Wed, 11 Jan 2017 02:43:15 +0000 (02:43 +0000)]
Add an extra debug flag to BackgroundDexOptimizer am:
3a2b7f7d59
am:
236477e86e
Change-Id: I30686bda79e0400d6aaca8ee71ca0c449452ed31
Jeff Sharkey [Wed, 11 Jan 2017 02:42:43 +0000 (19:42 -0700)]
Shuffle around shell protected broadcast checks.
If a shell is running as root, they should be able to send protected
broadcasts, but we still want to suppress Log.wtf() when sending
broadcasts from the shell.
Test: builds, boots
Bug:
34107119
Change-Id: Id475b2c9d98ca6a675ee1545ed324736f0587caf
Calin Juravle [Wed, 11 Jan 2017 02:42:21 +0000 (02:42 +0000)]
Some refactoring in BackgroundDexOptService. am:
95176bb18e
am:
377cc26e3a
Change-Id: If18489475e12e1d5c641f512a6b21f0ba70c6b6a
Calin Juravle [Wed, 11 Jan 2017 02:41:28 +0000 (02:41 +0000)]
Do not try to resolve realpath in DexManager. am:
b96dba9bad
am:
b8f31d8a85
Change-Id: I4b9e9c0781a4db89a49d588bcebb953c6144f5a3
Calin Juravle [Wed, 11 Jan 2017 02:40:14 +0000 (02:40 +0000)]
Log DexManager realpath errors only in debug mode. am:
271bacbf5c
am:
42c7fc7f27
Change-Id: I68f14e9a0b7507a93a9569e670b3693958fd7c09
Calin Juravle [Wed, 11 Jan 2017 02:39:00 +0000 (02:39 +0000)]
Record data about dex files use on disk am:
5a9094c1b6
am:
dc10a3bdb0
Change-Id: Ife1e626d722ba129cdcb6cd4a8f454cf28ca267c
Calin Juravle [Wed, 11 Jan 2017 02:38:01 +0000 (02:38 +0000)]
Add logic for recording dex files use on disk am:
6ea5ace7b3
am:
34bdf1680a
Change-Id: I075e6c5224b374f2d03d711e4d5492d60e4da572
Stephen Chen [Wed, 11 Jan 2017 02:34:36 +0000 (02:34 +0000)]
Merge "Delete old WifiNotificationController strings." am:
6daef4499f am:
f412290e94 am:
62f70c44b8
am:
8e52be9d55
Change-Id: I86add6c75edea299edb3bb4dad63450504889d56
Andreas Gampe [Wed, 11 Jan 2017 02:33:05 +0000 (02:33 +0000)]
Merge "Zygote: Add fdsToIgnore"
am:
5b22a826d5
Change-Id: I458e354acf620cb434de41790ce94b814ff0a4ea
Stephen Chen [Wed, 11 Jan 2017 02:28:54 +0000 (02:28 +0000)]
Merge "Delete old WifiNotificationController strings." am:
6daef4499f am:
f412290e94
am:
62f70c44b8
Change-Id: I95544b5507b89bc4354f49a191714fb3b56a09f6
Calin Juravle [Wed, 11 Jan 2017 02:28:11 +0000 (02:28 +0000)]
Merge changes I5b94a8f0,Ie6cdd846,Ie6b5f5e6,Ib962edf6,I9d779b2d, ...
am:
619d6282c3
Change-Id: I7f13f7a7557288f2b5cc515b424161c946241d5a
Calin Juravle [Wed, 11 Jan 2017 02:28:08 +0000 (02:28 +0000)]
Add an extra debug flag to BackgroundDexOptimizer
am:
3a2b7f7d59
Change-Id: I309923c247bef67ffbdba56955582f6decde3800
Calin Juravle [Wed, 11 Jan 2017 02:27:25 +0000 (02:27 +0000)]
Some refactoring in BackgroundDexOptService.
am:
95176bb18e
Change-Id: I191aeed8a7264bb13c4cef8b1ba135fd03a75d58
Calin Juravle [Wed, 11 Jan 2017 02:26:36 +0000 (02:26 +0000)]
Do not try to resolve realpath in DexManager.
am:
b96dba9bad
Change-Id: I67aba48784bca9a51f63e47b54c211ba535dd0e4
Calin Juravle [Wed, 11 Jan 2017 02:25:05 +0000 (02:25 +0000)]
Log DexManager realpath errors only in debug mode.
am:
271bacbf5c
Change-Id: I94aca4959284912e6d5008f56617254be2fc3ea7
Stephen Chen [Wed, 11 Jan 2017 02:24:26 +0000 (02:24 +0000)]
Merge "Delete old WifiNotificationController strings." am:
6daef4499f
am:
f412290e94
Change-Id: I40bfd75b95a299516d08b4fdf699317249156eda
Calin Juravle [Wed, 11 Jan 2017 02:24:14 +0000 (02:24 +0000)]
Record data about dex files use on disk
am:
5a9094c1b6
Change-Id: I50378b1351a5ae83ac55f1b26e2e0c5f3230c6d2
Calin Juravle [Wed, 11 Jan 2017 02:23:29 +0000 (02:23 +0000)]
Add logic for recording dex files use on disk
am:
6ea5ace7b3
Change-Id: I82246efd8e78c1c4ac18a67f0274b10545605207
Treehugger Robot [Wed, 11 Jan 2017 02:20:36 +0000 (02:20 +0000)]
Merge "Zygote: Add fdsToIgnore"
Stephen Chen [Wed, 11 Jan 2017 02:20:14 +0000 (02:20 +0000)]
Merge "Delete old WifiNotificationController strings."
am:
6daef4499f
Change-Id: I20a68ca904cc0ad8042be61820808f4ff4680bee
Treehugger Robot [Wed, 11 Jan 2017 02:15:28 +0000 (02:15 +0000)]
Merge changes I5b94a8f0,Ie6cdd846,Ie6b5f5e6,Ib962edf6,I9d779b2d, ...
* changes:
Add an extra debug flag to BackgroundDexOptimizer
Some refactoring in BackgroundDexOptService.
Do not try to resolve realpath in DexManager.
Log DexManager realpath errors only in debug mode.
Record data about dex files use on disk
Add logic for recording dex files use on disk
Treehugger Robot [Wed, 11 Jan 2017 02:12:48 +0000 (02:12 +0000)]
Merge "Delete old WifiNotificationController strings."
Jeremy Joslin [Wed, 11 Jan 2017 01:59:48 +0000 (01:59 +0000)]
Merge "Moved isCallerActiveScorer() to the score service." am:
663b444196 am:
5fbd2791ac am:
11b1311e21
am:
99ca0df8d4 -s ours
Change-Id: I735bd4d65c5764a3a7d6d288d45a57ec1ea98638
Hugo Benichi [Wed, 11 Jan 2017 01:52:31 +0000 (01:52 +0000)]
Merge changes I559eb049,I52425b84 am:
60d10ea0f4 am:
575726487f am:
5e4f253e6c
am:
bb06be4c02
Change-Id: Ic8a1d64286d8ab05fa6462705becc26d5305d333
Hugo Benichi [Wed, 11 Jan 2017 01:51:09 +0000 (01:51 +0000)]
DO NOT MERGE Captive portals: login activity probes like NetworkMonitor am:
2c02197bdd -s ours am:
2a913049ab -s ours am:
debe4cea39
am:
b8e55cfbfe -s ours
Change-Id: Icf2ff95f201523d52a5089db80bc2bb4f7b28088
Hugo Benichi [Wed, 11 Jan 2017 01:50:16 +0000 (01:50 +0000)]
DO NOT MERGE Logging improvements in CaptivePortalLoginActivity am:
7f086e162b -s ours am:
7520a07036 -s ours am:
fd13a23784
am:
2790a7218b -s ours
Change-Id: I26c4ca38f3f8843044438ab1adb7f4bcfdf9232d
Jeremy Joslin [Wed, 11 Jan 2017 01:50:13 +0000 (01:50 +0000)]
Merge "Moved isCallerActiveScorer() to the score service." am:
663b444196 am:
5fbd2791ac
am:
11b1311e21
Change-Id: I9e00b4593005729cdf2b01e2347f0513a6d52cf0
Jeremy Joslin [Wed, 11 Jan 2017 01:45:43 +0000 (01:45 +0000)]
Merge "Moved isCallerActiveScorer() to the score service." am:
663b444196
am:
5fbd2791ac
Change-Id: If5649294845f01a390bccd47fe99add3b27b0829
Hugo Benichi [Wed, 11 Jan 2017 01:44:39 +0000 (01:44 +0000)]
Merge changes I1eaab5ea,I42928da8 am:
b1e3c8aaf4 am:
22e7d2ed20 am:
994978461f
am:
93287d99dd
Change-Id: Iad49f5af3946a8708382d0baab14e046132469b6
Hugo Benichi [Wed, 11 Jan 2017 01:43:19 +0000 (01:43 +0000)]
Merge changes I559eb049,I52425b84 am:
60d10ea0f4 am:
575726487f
am:
5e4f253e6c
Change-Id: I348f7bf72778409db883c4bc0a27ff49a351ce38
Hugo Benichi [Wed, 11 Jan 2017 01:43:18 +0000 (01:43 +0000)]
DO NOT MERGE Captive portal systel log improvements am:
b32417a772 -s ours am:
6352f85398 -s ours am:
9b07cb2fc1
am:
486221fbcd -s ours
Change-Id: Iec0a3049392c38f1cc8ebce0983ea68cfc455cbc
Hugo Benichi [Wed, 11 Jan 2017 01:42:01 +0000 (01:42 +0000)]
DO NOT MERGE Captive portals: login activity probes like NetworkMonitor am:
2c02197bdd -s ours am:
2a913049ab -s ours
am:
debe4cea39
Change-Id: I6f4c7a0c15373e56fc178f287f6a0eb54d0d4018
Hugo Benichi [Wed, 11 Jan 2017 01:42:01 +0000 (01:42 +0000)]
DO NOT MERGE Fix flaky IpPrefixTest. am:
f6b180ff1a -s ours am:
68ec108b6e -s ours am:
b1a3f76900
am:
ee61522c31 -s ours
Change-Id: Ide65a8c7cad788c760c599f2569bc40922c26d60
Jeremy Joslin [Wed, 11 Jan 2017 01:41:14 +0000 (01:41 +0000)]
Merge "Moved isCallerActiveScorer() to the score service."
am:
663b444196
Change-Id: I44134284edc88567703435ce663b3d0efd9cff26
Hugo Benichi [Wed, 11 Jan 2017 01:41:10 +0000 (01:41 +0000)]
DO NOT MERGE Logging improvements in CaptivePortalLoginActivity am:
7f086e162b -s ours am:
7520a07036 -s ours
am:
fd13a23784
Change-Id: I7d87e45371cc337c44b9d3660afb48cfeabaf90d
John Reck [Wed, 11 Jan 2017 01:41:03 +0000 (01:41 +0000)]
Merge "Fix a use-of-uninitialized-value warning." am:
95ef9ec5b1 am:
44e14d0d2b am:
5f3ed9b7de
am:
68dce922af
Change-Id: Id1c35f315618663a6139c2729871cdfd02fe451f
Hugo Benichi [Wed, 11 Jan 2017 01:34:23 +0000 (01:34 +0000)]
Merge changes I1eaab5ea,I42928da8 am:
b1e3c8aaf4 am:
22e7d2ed20
am:
994978461f
Change-Id: Id4b45a161e8b2d6b077bc27bd7ab797a308fea29
Hugo Benichi [Wed, 11 Jan 2017 01:32:49 +0000 (01:32 +0000)]
DO NOT MERGE Captive portal systel log improvements am:
b32417a772 -s ours am:
6352f85398 -s ours
am:
9b07cb2fc1
Change-Id: Ie831b10e45cee740f519896312ede84ebb69e6f2
Hugo Benichi [Wed, 11 Jan 2017 01:31:54 +0000 (01:31 +0000)]
DO NOT MERGE Fix flaky IpPrefixTest. am:
f6b180ff1a -s ours am:
68ec108b6e -s ours
am:
b1a3f76900
Change-Id: Ieeeb425675715dc9910c4901f9c1bce7dbd168ad
John Reck [Wed, 11 Jan 2017 01:30:59 +0000 (01:30 +0000)]
Merge "Fix a use-of-uninitialized-value warning." am:
95ef9ec5b1 am:
44e14d0d2b
am:
5f3ed9b7de
Change-Id: I6e35191f4ddda2590eae4cfac9af5c781d0e493b
Treehugger Robot [Wed, 11 Jan 2017 01:30:02 +0000 (01:30 +0000)]
Merge "Moved isCallerActiveScorer() to the score service."