OSDN Git Service
Phil Weaver [Wed, 12 Jul 2017 23:34:40 +0000 (23:34 +0000)]
Phil Weaver [Wed, 12 Jul 2017 23:30:03 +0000 (23:30 +0000)]
Phil Weaver [Wed, 12 Jul 2017 23:28:02 +0000 (23:28 +0000)]
Phil Weaver [Wed, 12 Jul 2017 23:22:01 +0000 (23:22 +0000)]
Phil Weaver [Wed, 12 Jul 2017 23:15:37 +0000 (23:15 +0000)]
Back-port fixes for b/
62196835 am:
5bdffc5d57 am:
5a7eb970e2 -s ours am:
f433884a84 am:
ba928bd522 am:
1add6be25e am:
ba46064323 am:
111a2c7987 am:
4d608d2f35 am:
a6e0a6e31d am:
cba64fb461 am:
998ef870c5 am:
bb89a1e3fe am:
f645a57a5e am:
c3fc745a1c
am:
26e98edf31
Change-Id: I75d7844c2a000fab74cc82881f8ca4cc43f7acf3
Phil Weaver [Wed, 12 Jul 2017 23:10:07 +0000 (23:10 +0000)]
Back-port fixes for b/
62196835 am:
5bdffc5d57 am:
5a7eb970e2 -s ours am:
f433884a84 am:
ba928bd522 am:
1add6be25e am:
ba46064323 am:
111a2c7987 am:
4d608d2f35 am:
a6e0a6e31d am:
cba64fb461 am:
998ef870c5 am:
bb89a1e3fe am:
f645a57a5e
am:
c3fc745a1c
Change-Id: I534f11f2eb0f737a2640acf4482a4af27927f694
Phil Weaver [Wed, 12 Jul 2017 23:03:33 +0000 (23:03 +0000)]
Back-port fixes for b/
62196835 am:
5bdffc5d57 am:
5a7eb970e2 -s ours am:
f433884a84 am:
ba928bd522 am:
1add6be25e am:
ba46064323 am:
111a2c7987 am:
4d608d2f35 am:
a6e0a6e31d am:
cba64fb461 am:
998ef870c5 am:
bb89a1e3fe
am:
f645a57a5e
Change-Id: Ibff94cad13a97c9b4a696f5e6df0522e8ac89d50
Phil Weaver [Wed, 12 Jul 2017 22:57:43 +0000 (22:57 +0000)]
Back-port fixes for b/
62196835 am:
5bdffc5d57 am:
5a7eb970e2 -s ours am:
f433884a84 am:
ba928bd522 am:
1add6be25e am:
ba46064323 am:
111a2c7987 am:
4d608d2f35 am:
a6e0a6e31d am:
cba64fb461 am:
998ef870c5
am:
bb89a1e3fe
Change-Id: I9e53b0461cb3f28ddc023ba551c1cb4eb1007340
Phil Weaver [Wed, 12 Jul 2017 22:51:18 +0000 (22:51 +0000)]
Back-port fixes for b/
62196835 am:
5bdffc5d57 am:
5a7eb970e2 -s ours am:
f433884a84 am:
ba928bd522 am:
1add6be25e am:
ba46064323 am:
111a2c7987 am:
4d608d2f35 am:
a6e0a6e31d am:
cba64fb461
am:
998ef870c5
Change-Id: Icaf066033ce67780052b30be3de891907129404e
Siddharth Ray [Wed, 12 Jul 2017 22:46:23 +0000 (22:46 +0000)]
Merge "Average of top 4 CNO" into oc-dr1-dev
am:
e7f5c6aa38
Change-Id: I0080002fb2110fe08d24551f204ff68fcd1d273d
Phil Weaver [Wed, 12 Jul 2017 22:41:32 +0000 (22:41 +0000)]
Back-port fixes for b/
62196835 am:
5bdffc5d57 am:
5a7eb970e2 -s ours am:
f433884a84 am:
ba928bd522 am:
1add6be25e am:
ba46064323 am:
111a2c7987 am:
4d608d2f35 am:
a6e0a6e31d
am:
cba64fb461
Change-Id: I9c4fc2279ffa79ee85dc8a46be21095918fa52ad
Winson Chung [Wed, 12 Jul 2017 22:41:22 +0000 (22:41 +0000)]
Merge "Fixing some issues with the assistant stack" into oc-dr1-dev
am:
fbb85140f8
Change-Id: Iaf515fe72bd89ce4cf903ebb6d1c631353482c95
TreeHugger Robot [Wed, 12 Jul 2017 22:38:43 +0000 (22:38 +0000)]
Merge "Average of top 4 CNO" into oc-dr1-dev
Phil Weaver [Wed, 12 Jul 2017 22:35:35 +0000 (22:35 +0000)]
Back-port fixes for b/
62196835 am:
5bdffc5d57 am:
5a7eb970e2 -s ours am:
f433884a84 am:
ba928bd522 am:
1add6be25e am:
ba46064323 am:
111a2c7987 am:
4d608d2f35
am:
a6e0a6e31d
Change-Id: Ia5af67f07974b520d8c3e7424c07402793a486f2
Winson Chung [Wed, 12 Jul 2017 22:32:42 +0000 (22:32 +0000)]
Merge "Fixing some issues with the assistant stack" into oc-dr1-dev
Phil Weaver [Wed, 12 Jul 2017 22:30:08 +0000 (22:30 +0000)]
Back-port fixes for b/
62196835 am:
5bdffc5d57 am:
5a7eb970e2 -s ours am:
f433884a84 am:
ba928bd522 am:
1add6be25e am:
ba46064323 am:
111a2c7987
am:
4d608d2f35
Change-Id: Id1626217e80920f162b735336ac708c4dd9467f9
Phil Weaver [Wed, 12 Jul 2017 22:24:06 +0000 (22:24 +0000)]
Back-port fixes for b/
62196835 am:
5bdffc5d57 am:
5a7eb970e2 -s ours am:
f433884a84 am:
ba928bd522 am:
1add6be25e am:
ba46064323
am:
111a2c7987
Change-Id: Idb7d3c789c6241aa8d77eb6077930b47c7ba69e4
Phil Weaver [Wed, 12 Jul 2017 22:18:59 +0000 (22:18 +0000)]
Back-port fixes for b/
62196835 am:
5bdffc5d57 am:
5a7eb970e2 -s ours am:
f433884a84 am:
ba928bd522 am:
1add6be25e
am:
ba46064323
Change-Id: I7119e3f003562f6d826d40ad3577b9db0e44c2c6
Phil Weaver [Wed, 12 Jul 2017 22:14:01 +0000 (22:14 +0000)]
Back-port fixes for b/
62196835 am:
5bdffc5d57 am:
5a7eb970e2 -s ours am:
f433884a84 am:
ba928bd522
am:
1add6be25e
Change-Id: I83a6c654862443a69bfeeaf675a8c038b3f7fb53
Winson Chung [Wed, 12 Jul 2017 22:10:42 +0000 (22:10 +0000)]
Merge "Prevent non-fullscreen activities from triggering auto-enter PiP" into oc-dr1-dev
am:
d24ed58bc2
Change-Id: I57175352ca15a23dc7daecc352017dc2bb9ee79e
Phil Weaver [Wed, 12 Jul 2017 22:06:27 +0000 (22:06 +0000)]
Back-port fixes for b/
62196835 am:
5bdffc5d57 am:
5a7eb970e2 -s ours am:
f433884a84
am:
ba928bd522
Change-Id: I74a7b0488371606dd9bdccab854d23c0e09b1ac9
Winson Chung [Wed, 12 Jul 2017 22:04:43 +0000 (22:04 +0000)]
Merge "Prevent non-fullscreen activities from triggering auto-enter PiP" into oc-dr1-dev
Phil Weaver [Wed, 12 Jul 2017 22:00:31 +0000 (22:00 +0000)]
Back-port fixes for b/
62196835 am:
5bdffc5d57 am:
5a7eb970e2 -s ours
am:
f433884a84
Change-Id: I737838098a36efafe1509c4814ac1120a3bb8297
Phil Weaver [Wed, 12 Jul 2017 21:55:31 +0000 (21:55 +0000)]
Back-port fixes for b/
62196835 am:
5bdffc5d57
am:
5a7eb970e2 -s ours
Change-Id: Ifd4b5ff2487c8b8035ffaf6ed7e55539f26a463e
Phil Weaver [Wed, 12 Jul 2017 21:43:46 +0000 (21:43 +0000)]
Back-port fixes for b/
62196835
am:
5bdffc5d57
Change-Id: Ia5dafc7a8724d296e710f32d936bb493b51951de
Winson Chung [Wed, 12 Jul 2017 19:58:56 +0000 (19:58 +0000)]
Fix egregious state check for window focusability.
am:
3d0a74a9e4
Change-Id: I68aac94729227b30e2ba05bf2e89afae5a9debbf
Winson Chung [Wed, 12 Jul 2017 19:37:19 +0000 (12:37 -0700)]
Fix egregious state check for window focusability.
- The original check should have not assumed that these are only app
windows.
Bug:
63614176
Test: Ensure that you can unlock with password
Change-Id: I71a9959378bbd98a8ed6715d67119d38c3daceb5
Selim Cinek [Wed, 12 Jul 2017 19:31:33 +0000 (19:31 +0000)]
Merge "Using transformation method in the ImageFloatingTextView" into oc-dr1-dev
am:
997e4ac2bb
Change-Id: Ifffc5f1dfe2a5d606e5eae128cbe0a331d4aaf7c
Winson Chung [Tue, 11 Jul 2017 22:07:45 +0000 (15:07 -0700)]
Prevent non-fullscreen activities from triggering auto-enter PiP
Bug:
63581685
Test: android.server.cts.ActivityManagerPinnedStackTests
Test: #testAppOpsDenyPipOnPause
Test: Launch screenshot from notification tray above auto-enter PiP
activity
Change-Id: I0bddfd5c47d6053d079b9bd426003d526e8bb0dd
TreeHugger Robot [Wed, 12 Jul 2017 19:23:16 +0000 (19:23 +0000)]
Merge "Using transformation method in the ImageFloatingTextView" into oc-dr1-dev
Roshan Pius [Wed, 12 Jul 2017 18:48:55 +0000 (18:48 +0000)]
Merge "wifi: Params for SAR limits" into oc-dr1-dev
am:
bc15a1e3ee
Change-Id: Iecd39b0d0449a356c5dfef7ec60fbca4906bf2cf
Roshan Pius [Wed, 12 Jul 2017 18:33:20 +0000 (18:33 +0000)]
Merge "wifi: Params for SAR limits" into oc-dr1-dev
Eugene Susla [Wed, 12 Jul 2017 18:20:09 +0000 (18:20 +0000)]
Merge "[Companion] Prevent NPE in CallbackProxy" into oc-dr1-dev
am:
9e419d3082
Change-Id: I0aa741d69e2f579a914973aff6a093a19d9097b4
TreeHugger Robot [Wed, 12 Jul 2017 18:11:34 +0000 (18:11 +0000)]
Merge "[Companion] Prevent NPE in CallbackProxy" into oc-dr1-dev
Erik Kline [Wed, 12 Jul 2017 18:08:25 +0000 (18:08 +0000)]
Merge "Avoid exposing OffloadCallbackEvent values" am:
aff0d1afb6 am:
74868feecd
am:
1b6044f363 -s ours
Change-Id: I2f2ac148c3a2042d3a96013a14e1efd92886c241
Erik Kline [Wed, 12 Jul 2017 18:06:56 +0000 (18:06 +0000)]
Merge "Stop unnecessary tethering reconfigurations" am:
8ad1c81b07 am:
009d42ffe0
am:
626c3e8739 -s ours
Change-Id: If8586140a21eea1fae0b61e073db3a7665d111ac
Erik Kline [Wed, 12 Jul 2017 17:58:56 +0000 (17:58 +0000)]
Merge "Avoid exposing OffloadCallbackEvent values" am:
aff0d1afb6
am:
74868feecd
Change-Id: I5495caada5fc8869c4c770bbddb37d73b2603f62
Erik Kline [Wed, 12 Jul 2017 17:57:15 +0000 (17:57 +0000)]
Merge "Stop unnecessary tethering reconfigurations" am:
8ad1c81b07
am:
009d42ffe0
Change-Id: I000020b5e1bca50b39c627a64fe98e0fd6d80b9e
Peter Qiu [Wed, 12 Jul 2017 17:53:10 +0000 (17:53 +0000)]
Merge "WifiMetrics: add Passpoint related metrics" into oc-dr1-dev
am:
b07f49dd92
Change-Id: I37cfce7193a4fa7bc1d8edc2e513d62345ed8406
Erik Kline [Wed, 12 Jul 2017 17:49:42 +0000 (17:49 +0000)]
Merge "Avoid exposing OffloadCallbackEvent values"
am:
aff0d1afb6
Change-Id: I4cebe1df49397405ee6492c8420f07f01ea2e3f7
Geoffrey Pitsch [Wed, 12 Jul 2017 17:48:07 +0000 (17:48 +0000)]
Merge "Move @Ignore from class-level to test level." into oc-dr1-dev
am:
bcc318f9cf
Change-Id: I88f83646fbefeaacacd60c24859f7bd228b0d097
Erik Kline [Wed, 12 Jul 2017 17:47:54 +0000 (17:47 +0000)]
Merge "Stop unnecessary tethering reconfigurations"
am:
8ad1c81b07
Change-Id: I261ae05664d620997d38ca40edaffd8ca11b308e
Peter Qiu [Wed, 12 Jul 2017 17:44:25 +0000 (17:44 +0000)]
Merge "WifiMetrics: add Passpoint related metrics" into oc-dr1-dev
Eric Laurent [Wed, 12 Jul 2017 17:41:36 +0000 (17:41 +0000)]
Merge "audioservice: modify default music volume" into oc-dr1-dev
am:
b6f946c081
Change-Id: Ia13c9e28deba3ddd0b7ab74862d2febbf01f1142
TreeHugger Robot [Wed, 12 Jul 2017 17:40:15 +0000 (17:40 +0000)]
Merge "Move @Ignore from class-level to test level." into oc-dr1-dev
Treehugger Robot [Wed, 12 Jul 2017 17:39:56 +0000 (17:39 +0000)]
Merge "Avoid exposing OffloadCallbackEvent values"
TreeHugger Robot [Wed, 12 Jul 2017 17:35:49 +0000 (17:35 +0000)]
Merge "audioservice: modify default music volume" into oc-dr1-dev
Treehugger Robot [Wed, 12 Jul 2017 17:35:15 +0000 (17:35 +0000)]
Merge "Stop unnecessary tethering reconfigurations"
Ningyuan Wang [Wed, 12 Jul 2017 17:24:40 +0000 (17:24 +0000)]
Merge "Document WifiScanner callback behaviors" into oc-dr1-dev
am:
4a82979153
Change-Id: I66871bfc1148c29fce78063d258911fbe85cba05
Selim Cinek [Mon, 10 Jul 2017 15:41:16 +0000 (17:41 +0200)]
Using transformation method in the ImageFloatingTextView
Otherwise things like singleline and password don't work.
Test: runtest -x core/tests/coretests/src/com/android/internal/widget/ImageFloatingTextViewTest.java
Change-Id: I9d7d13c038be38319e6516715137789f612a43f7
Fixes:
36713596
TreeHugger Robot [Wed, 12 Jul 2017 17:14:05 +0000 (17:14 +0000)]
Merge "Document WifiScanner callback behaviors" into oc-dr1-dev
Tom Cherry [Wed, 12 Jul 2017 17:13:19 +0000 (17:13 +0000)]
Merge "Remove ALOGD_IF_SLOW" into oc-dr1-dev-plus-aosp
Geoffrey Pitsch [Wed, 12 Jul 2017 16:59:14 +0000 (16:59 +0000)]
Merge "canBeModified accessors for AmbientDisplay pickup setting" into oc-dr1-dev
am:
7c9a6b502a
Change-Id: I40ced751c59fbc10d0a23a3e06fe66cc59eafd17
Geoffrey Pitsch [Wed, 12 Jul 2017 16:50:53 +0000 (16:50 +0000)]
Merge "canBeModified accessors for AmbientDisplay pickup setting" into oc-dr1-dev
Neil Fuller [Wed, 12 Jul 2017 16:07:03 +0000 (16:07 +0000)]
Merge "Address further API review comments" am:
b279ec51b6 am:
cf8e06c0ac
am:
92189b6e21
Change-Id: I6b15cc75923cd712ca62302b8f797899ad43ad00
Erik Kline [Wed, 12 Jul 2017 16:00:02 +0000 (16:00 +0000)]
Merge "Add OffloadHardwareInterface.getForwardedStats() wrapper" am:
b27c5e92a2 am:
e5e3bdd460
am:
b63707c0ca -s ours
Change-Id: I4910aa2c3e1284b0959d576af99fa1ef7a0071bf
Neil Fuller [Wed, 12 Jul 2017 15:59:57 +0000 (15:59 +0000)]
Merge "Address further API review comments" am:
b279ec51b6
am:
cf8e06c0ac
Change-Id: I7364fbcc09eaf47a3c90def9fd03b5f9f1d92a7d
Erik Kline [Wed, 12 Jul 2017 15:53:04 +0000 (15:53 +0000)]
Merge "Add OffloadHardwareInterface.getForwardedStats() wrapper" am:
b27c5e92a2
am:
e5e3bdd460
Change-Id: I6e9bdfa3632ffa9abace5823c0982440f269a2c1
Neil Fuller [Wed, 12 Jul 2017 15:52:20 +0000 (15:52 +0000)]
Merge "Address further API review comments"
am:
b279ec51b6
Change-Id: Idbb8fc5c6e6cd912acbca1b5b144533dbfff2775
Erik Kline [Wed, 12 Jul 2017 15:47:59 +0000 (15:47 +0000)]
Merge "Add OffloadHardwareInterface.getForwardedStats() wrapper"
am:
b27c5e92a2
Change-Id: Ibb5f53e5e81c7969ae8edf73a42d11cd8505b0d4
Erik Kline [Tue, 11 Jul 2017 15:15:26 +0000 (00:15 +0900)]
Avoid exposing OffloadCallbackEvent values
Keep the android.hardware.tetheroffload.control.V1_0.OffloadCallbackEvent
import from leaking outside of OffloadHardwareInterface by converting each
event type into a separate callback.
Add basic logging implementation in OffloadController. Seems like every
call just needs to log save for two that actually need to do work:
- onSupportAvailable()
* poll stats and notify NetworkStatsService
* (re)push all state, as the hardware now supports offload (again)
- onStoppedLimitReached()
* poll stats and notify NetworkStatsService
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passed
Bug:
29337859
Bug:
32163131
Merged-In: I7c7675922a561a4642120df51715a550dab7f503
Merged-In: Ie91b974fbf70a4242f8b220d5fa3d6a0de59201d
Merged-In: I46c2e5252ae72a09a1550862847c1af441ece072
(cherry picked from commit
a0885000f227ebf15f0b78d1d28c7a5de4afa8ea)
Change-Id: I1981d8da79f24dd0b4d76b930a5f179682500294
Geoffrey Pitsch [Wed, 12 Jul 2017 15:40:32 +0000 (11:40 -0400)]
Move @Ignore from class-level to test level.
Workaround for reporting error.
Test: runtest systemui
Bug:
63521982
Change-Id: I81e70605471469b0ffa630ff874427a621fc1135
Treehugger Robot [Wed, 12 Jul 2017 15:37:40 +0000 (15:37 +0000)]
Merge "Address further API review comments"
Treehugger Robot [Wed, 12 Jul 2017 15:36:18 +0000 (15:36 +0000)]
Merge "Add OffloadHardwareInterface.getForwardedStats() wrapper"
Erik Kline [Wed, 12 Jul 2017 15:32:58 +0000 (15:32 +0000)]
Merge "Avoid exposing OffloadCallbackEvent values" into oc-dr1-dev
am:
fcceb3ada4
Change-Id: Ie91b974fbf70a4242f8b220d5fa3d6a0de59201d
Erik Kline [Sat, 8 Jul 2017 11:36:37 +0000 (20:36 +0900)]
Stop unnecessary tethering reconfigurations
The TetheringConfiguraiton is retrieved at startup and on every
ACTION_CONFIGURATION_CHANGED broadcast. Re-retrieving the config
at every upstream selection is unnecessary and fills up the logs.
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
Bug:
32163131
Bug:
63250751
Merged-In: Id089375a5699ac1157fc5f445876fee558d7bc7e
Merged-In: I1fc87f9c2a31f7fd16889275e6ba197b2b48a264
Merged-In: Ia6276ada690aa3e4870bb83dc4bf3ddcddc35e7b
(cherry picked from commit
6ee73daa0aa90620e4b2cb13ead4b53d16f45010)
Change-Id: Ic51123e173cc29cfcb52210707f2a0f8d2ab2e3b
TreeHugger Robot [Wed, 12 Jul 2017 15:23:04 +0000 (15:23 +0000)]
Merge "Avoid exposing OffloadCallbackEvent values" into oc-dr1-dev
Evan Laird [Wed, 12 Jul 2017 15:07:38 +0000 (15:07 +0000)]
Merge "Update keyguard mic icon to rounded" into oc-dr1-dev
am:
ea0beea5dd
Change-Id: I25406b379b0cb7d554505ad72912b45d01880f33
Evan Laird [Wed, 12 Jul 2017 15:05:23 +0000 (15:05 +0000)]
Merge "Update animations in QS" into oc-dr1-dev
am:
497d73f35e
Change-Id: I64226ee9f79dc94e2009d27572b85b1668bff3d7
TreeHugger Robot [Wed, 12 Jul 2017 14:58:20 +0000 (14:58 +0000)]
Merge "Update keyguard mic icon to rounded" into oc-dr1-dev
TreeHugger Robot [Wed, 12 Jul 2017 14:58:04 +0000 (14:58 +0000)]
Merge "Update animations in QS" into oc-dr1-dev
Erik Kline [Wed, 12 Jul 2017 14:51:35 +0000 (14:51 +0000)]
Merge "Stop unnecessary tethering reconfigurations" into oc-dr1-dev
am:
49a16f0998
Change-Id: I1fc87f9c2a31f7fd16889275e6ba197b2b48a264
TreeHugger Robot [Wed, 12 Jul 2017 14:43:53 +0000 (14:43 +0000)]
Merge "Stop unnecessary tethering reconfigurations" into oc-dr1-dev
Erik Kline [Wed, 12 Jul 2017 06:46:54 +0000 (15:46 +0900)]
Add OffloadHardwareInterface.getForwardedStats() wrapper
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
Bug:
29337859
Bug:
32163131
Merged-In: I41f837e16eff9a4cd763d65155bd9b5d5d980acd
Merged-In: Id9766983a3bbd885ef0f0d3ba9e33de903939f2d
Merged-In: Id831bc99cadbd59d280b026866707dbbe3b0e542
(cherry picked from commit
9a5b02a89c02d5ff633d8456b22d3d5b7a15bd44)
Change-Id: I0752b6e2cf1e0b9a5075f7911408528538683c84
Erik Kline [Wed, 12 Jul 2017 14:15:29 +0000 (14:15 +0000)]
Merge "Add OffloadHardwareInterface.getForwardedStats() wrapper" into oc-dr1-dev
am:
9df88e1fe7
Change-Id: Id9766983a3bbd885ef0f0d3ba9e33de903939f2d
Jorim Jaggi [Wed, 12 Jul 2017 14:07:21 +0000 (14:07 +0000)]
Merge "Don't animate bouncer changes when fading out Keyguard" into oc-dr1-dev
am:
f33b1eda88
Change-Id: I2ea9ccbfe01cfa948fb6dc6012859fc43a5c284b
TreeHugger Robot [Wed, 12 Jul 2017 14:06:52 +0000 (14:06 +0000)]
Merge "Add OffloadHardwareInterface.getForwardedStats() wrapper" into oc-dr1-dev
Jorim Jaggi [Wed, 12 Jul 2017 12:57:33 +0000 (12:57 +0000)]
Merge "Don't animate bouncer changes when fading out Keyguard" into oc-dr1-dev
Erik Kline [Wed, 12 Jul 2017 06:46:54 +0000 (15:46 +0900)]
Add OffloadHardwareInterface.getForwardedStats() wrapper
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
Bug:
29337859
Bug:
32163131
Change-Id: Id831bc99cadbd59d280b026866707dbbe3b0e542
Lorenzo Colitti [Wed, 12 Jul 2017 11:41:21 +0000 (20:41 +0900)]
resolve merge conflicts of
5e7b01c8236b to oc-dr1-dev-plus-aosp
Test: make -j64 framework services
Change-Id: I00460c8fe606fdce1f121685919d9a2e54febe5a
Lorenzo Colitti [Wed, 12 Jul 2017 07:57:49 +0000 (07:57 +0000)]
Merge "Use RFC 7217 stable privacy addresses" into oc-dr1-dev
Hugo Benichi [Wed, 12 Jul 2017 07:14:03 +0000 (07:14 +0000)]
Merge "CaptivePortalLogin ignores some ssl errors." into oc-dev-plus-aosp
am:
3425a6e5c7 -s ours
Change-Id: I1967f5540ff997645a8a2f69b4a7939a01fc69e0
Hugo Benichi [Wed, 12 Jul 2017 07:02:42 +0000 (07:02 +0000)]
Merge "CaptivePortalLogin ignores some ssl errors." into oc-dev-plus-aosp
Hugo Benichi [Wed, 12 Jul 2017 06:34:05 +0000 (06:34 +0000)]
Merge "Instrument captive portal login activity" into oc-dev-plus-aosp
am:
50c561a3db -s ours
Change-Id: I068db2d0b7e08f373ce2e1d7ed2618245cec6562
Erik Kline [Wed, 12 Jul 2017 06:32:14 +0000 (06:32 +0000)]
Merge "Restructure use of absent tether_offload_disabled setting" am:
5bb30496cf am:
c8b4ef85dc
am:
d21ad47d43 -s ours
Change-Id: I0d755e5c6a8d89fe91706e1b06863d0fc660b245
TreeHugger Robot [Wed, 12 Jul 2017 06:29:01 +0000 (06:29 +0000)]
Merge "Instrument captive portal login activity" into oc-dev-plus-aosp
Erik Kline [Wed, 12 Jul 2017 06:25:04 +0000 (06:25 +0000)]
Merge "Restructure use of absent tether_offload_disabled setting" am:
5bb30496cf
am:
c8b4ef85dc
Change-Id: I2210e9d25a4e7c497b9383324e574c9f8aca0d6f
Hugo Benichi [Sat, 17 Jun 2017 04:36:35 +0000 (13:36 +0900)]
CaptivePortalLogin ignores some ssl errors.
This patch changes the ssl error handler of the captive portal login
activity to ignore errors for resources coming from a different hostname
that the top-level page currently loading.
This allows logging into misconfigured portals that incorrectly bans ssl
to some hostnames necessary for loading their portal login pages.
Bug:
62332137
Test: manually tested with captive portal entwork.
Merged-In: I05378ed74e678829e46fbeee18df916ec6ec2856
Merged-In: Iff025d68b824eac2c30b9656fd2494338eb07eb3
(cherry pick from commit
22542ed48090e2e6e9474b658fdd368041a4060b which
was skipped from merging into oc-dev-plus-aosp due to missing patch)
Change-Id: I4e1be381195a8d1e510fd62533039ab3cd441679
Hugo Benichi [Mon, 5 Jun 2017 05:52:24 +0000 (14:52 +0900)]
Instrument captive portal login activity
Also add CAPTIVE_PORTAL_LOGIN_ACTIVITY_SSL_ERROR constants to
metrics_constants.proto for counting ssl error pages shown by the
captive portal login activity.
Bug:
36203355
Bug:
34901696
Bug:
36532213
Test: manually tested with captive portal testing setup while watching
event logs: adb logcat -b events | grep captiveportallogin
06-08 16:25:20.279 21558 21558 I sysui_action: [1004,com.android.captiveportallogin]
06-08 17:01:04.052 21558 21558 I sysui_action: [1007,com.android.captiveportallogin]
Merged-In: Ia05853506d424ad4cb2c11770ae7718fbef3f01c
Merged-In: I55ea3c61842f16bf6a98e812fb6dc940f96f895c
Merged-In: I38b8e4dd3d62ad1261695780aeb2377f26a25997
Merged-In: I9184f6263a003c2be28f41a550c6164c8d6ee907
(cherry picked from commit
c61dc92fc0619d101c4b789f6305012701cc47a0)
Change-Id: I89ca3dfc74d09b7b2d303c0eb01b7b9883b01a42
Erik Kline [Wed, 12 Jul 2017 06:18:11 +0000 (06:18 +0000)]
Merge "Restructure use of absent tether_offload_disabled setting"
am:
5bb30496cf
Change-Id: I9d1ec7d1c060278018c80c9374d724ee0ddba3a4
Treehugger Robot [Wed, 12 Jul 2017 06:06:07 +0000 (06:06 +0000)]
Merge "Restructure use of absent tether_offload_disabled setting"
Andreas Gampe [Wed, 12 Jul 2017 05:00:56 +0000 (05:00 +0000)]
Merge "Connectivity: Fix format arguments" am:
ba8ab362ad am:
2a13286d8d
am:
ce4c57fd0e
Change-Id: Ia789f019394b7870994fcce8e64dee3b0501f7c1
Andreas Gampe [Wed, 12 Jul 2017 04:53:54 +0000 (04:53 +0000)]
Merge "Connectivity: Fix format arguments" am:
ba8ab362ad
am:
2a13286d8d
Change-Id: I7517abe404637f92d7e361033d2d609b981f05f4
Andreas Gampe [Wed, 12 Jul 2017 04:48:10 +0000 (04:48 +0000)]
Merge "Connectivity: Fix format arguments"
am:
ba8ab362ad
Change-Id: I844c7d1faea3dcc90cf9816cae984277d7525f15
Treehugger Robot [Wed, 12 Jul 2017 04:35:34 +0000 (04:35 +0000)]
Merge "Connectivity: Fix format arguments"
Erik Kline [Fri, 7 Jul 2017 08:38:30 +0000 (17:38 +0900)]
Restructure use of absent tether_offload_disabled setting
This restructures the fetching of the default disposition such
that we disable (and enable) the feature with only a single
character change.
Additionally: fix unittests with proper use of FakeSettingsProvider.
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passed with developer enabled and disabled
Bug:
29337859
Bug:
32163131
Bug:
63250751
(cherry picked from commit
c87cd411843484225897ebdf91cd05073c1c5f35)
Merged-In: Ib32489d07778465134bca52c589baddbd78ab129
Merged-In: I03d68b0da192fbd6172639343d4ab88c20127ad7
Merged-In: I10c0af2b2c4f6b6e613380e637cc3acb1f7a55a3
Change-Id: Ie16a022be8dacd76b0402bcb777680c36163a084
Di Lu [Wed, 12 Jul 2017 04:13:52 +0000 (04:13 +0000)]
Merge "Remove return value of ipSecAddSecurityAssociation" am:
cd5c1161ab am:
38e72983a5
am:
c554c2c1cb
Change-Id: I94e533d415e0afdbd4be72536ec667513a32f025
Di Lu [Wed, 12 Jul 2017 04:08:24 +0000 (04:08 +0000)]
Merge "Remove return value of ipSecAddSecurityAssociation" am:
cd5c1161ab
am:
38e72983a5
Change-Id: I08b1498e05321b8cda04f56d07a0a5f50260d7d2
Hugo Benichi [Wed, 12 Jul 2017 04:07:18 +0000 (04:07 +0000)]
Merge "Add first OWNERS files for core networking" am:
4066930a36 am:
531cae76fd
am:
59de81533d
Change-Id: Id149a16336fd5adfe8b247bb4b116db1ee357653
Di Lu [Wed, 12 Jul 2017 04:02:24 +0000 (04:02 +0000)]
Merge "Remove return value of ipSecAddSecurityAssociation"
am:
cd5c1161ab
Change-Id: I3cf6dbc44af4934c34b074dccdfff77dede6a693
OSDN Git Service
