OSDN Git Service
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
Hugo Benichi [Wed, 12 Jul 2017 04:01:15 +0000 (04:01 +0000)]
Merge "Add first OWNERS files for core networking" am:
4066930a36
am:
531cae76fd
Change-Id: I099ee71d8b9ed767af2f4556e4798a1263dab9c0
Hugo Benichi [Wed, 12 Jul 2017 03:54:57 +0000 (03:54 +0000)]
Merge "Add first OWNERS files for core networking"
am:
4066930a36
Change-Id: Ib8e1b85be03ad5e75a89a7951a59b9bc2a04d112
Eric Laurent [Wed, 12 Jul 2017 03:47:59 +0000 (03:47 +0000)]
Merge "audioservice: fix media volume reset at boot" into oc-dr1-dev
am:
09a93b9739
Change-Id: Id77262dcf3f4fe46c8a080c7b5147161809c6332
Treehugger Robot [Wed, 12 Jul 2017 03:41:57 +0000 (03:41 +0000)]
Merge "Add first OWNERS files for core networking"
TreeHugger Robot [Wed, 12 Jul 2017 03:38:14 +0000 (03:38 +0000)]
Merge "audioservice: fix media volume reset at boot" into oc-dr1-dev
Erik Kline [Wed, 12 Jul 2017 03:11:15 +0000 (03:11 +0000)]
Merge "Restructure use of absent tether_offload_disabled setting" into oc-dr1-dev
am:
d8fdb26ebf
Change-Id: I03d68b0da192fbd6172639343d4ab88c20127ad7
George Burgess IV [Wed, 12 Jul 2017 03:07:46 +0000 (03:07 +0000)]
Merge "app_main: silence static analyzer warnings" am:
cf188f664a am:
8a4be2a6ae
am:
5987ab35ca
Change-Id: Idc8694cc79e336bb93b38d25fbd7b25ca7a31f0b
TreeHugger Robot [Wed, 12 Jul 2017 03:05:18 +0000 (03:05 +0000)]
Merge "Restructure use of absent tether_offload_disabled setting" into oc-dr1-dev
Winson Chung [Wed, 12 Jul 2017 03:02:44 +0000 (03:02 +0000)]
Merge "Fix z-order issue with text cursors and PiP." into oc-dr1-dev
am:
bd2682d056
Change-Id: I0dd3a57d7f2e87074f1bd5275c011116dcba1d9d
Jack He [Wed, 12 Jul 2017 03:00:58 +0000 (03:00 +0000)]
Merge "GATT: Expose opportunistic client API to Java" into oc-dr1-dev
am:
b822ad3e06 -s ours
Change-Id: Ib97a6200288808c35d30d86d8043284cf9e1437f
George Burgess IV [Wed, 12 Jul 2017 03:00:43 +0000 (03:00 +0000)]
Merge "app_main: silence static analyzer warnings" am:
cf188f664a
am:
8a4be2a6ae
Change-Id: Ic7b6e1092261a0e76fc84b213166729ea3451166
George Burgess IV [Wed, 12 Jul 2017 02:54:24 +0000 (02:54 +0000)]
Merge "app_main: silence static analyzer warnings"
am:
cf188f664a
Change-Id: Ibad16ec8fabb4edaaa832bc43505f81fefb10ec7
Winson Chung [Wed, 12 Jul 2017 02:53:59 +0000 (02:53 +0000)]
Merge "Fix z-order issue with text cursors and PiP." into oc-dr1-dev
Jack He [Wed, 12 Jul 2017 02:53:22 +0000 (02:53 +0000)]
GATT: Expose opportunistic client API to Java
am:
79bf7d755f -s ours
Change-Id: I1a757066905894c1fb70f3010a723f37b43103d1
TreeHugger Robot [Wed, 12 Jul 2017 02:47:56 +0000 (02:47 +0000)]
Merge "GATT: Expose opportunistic client API to Java" into oc-dr1-dev
Treehugger Robot [Wed, 12 Jul 2017 02:43:14 +0000 (02:43 +0000)]
Merge "app_main: silence static analyzer warnings"
qingxi [Wed, 12 Jul 2017 02:31:24 +0000 (02:31 +0000)]
Merge "Move eSIM factory reset implementation to RecoverySystem" into oc-dr1-dev
am:
a249de50d1
Change-Id: I784617e0c34275adc5d177e6728b4b2c86dc1f5d
TreeHugger Robot [Wed, 12 Jul 2017 02:17:42 +0000 (02:17 +0000)]
Merge "Move eSIM factory reset implementation to RecoverySystem" into oc-dr1-dev
Svet Ganov [Wed, 12 Jul 2017 02:17:20 +0000 (02:17 +0000)]
Merge "Avoid a race in autofill manager service." into oc-dr1-dev
am:
d622be1754
Change-Id: I1e94b6e3601078b9f999f5f33a3d8425035de8c2
TreeHugger Robot [Wed, 12 Jul 2017 02:09:00 +0000 (02:09 +0000)]
Merge "Avoid a race in autofill manager service." into oc-dr1-dev
jiabin [Wed, 12 Jul 2017 01:56:45 +0000 (01:56 +0000)]
Merge "Use DisplayListener instead of WindowRotationListener in AudioService." into oc-dr1-dev
am:
4c66a1dd0d
Change-Id: I75bf198fe6d32ef3dcb4080b17d9f8fe2ab0dbce
TreeHugger Robot [Wed, 12 Jul 2017 01:48:36 +0000 (01:48 +0000)]
Merge "Use DisplayListener instead of WindowRotationListener in AudioService." into oc-dr1-dev
Andreas Gampe [Wed, 12 Jul 2017 01:43:13 +0000 (01:43 +0000)]
Merge "IpSecService: Actually throw exception" am:
3eff26449f am:
c5f089e6d5
am:
d7c0357277
Change-Id: I9d5b81d6f62b6d8ff7561d908c6d61b4a21c7419
Andreas Gampe [Wed, 12 Jul 2017 01:36:08 +0000 (01:36 +0000)]
Merge "IpSecService: Actually throw exception" am:
3eff26449f
am:
c5f089e6d5
Change-Id: Iefbe52615c1795cf1757b1f7557daf26e1d560d3
Andreas Gampe [Wed, 12 Jul 2017 01:29:47 +0000 (01:29 +0000)]
Merge "IpSecService: Actually throw exception"
am:
3eff26449f
Change-Id: I415b249d564c5ffdd2d9381b53a31dd6f6c18eab
Treehugger Robot [Wed, 12 Jul 2017 01:17:19 +0000 (01:17 +0000)]
Merge "IpSecService: Actually throw exception"
Jack He [Wed, 5 Jul 2017 21:55:35 +0000 (14:55 -0700)]
GATT: Expose opportunistic client API to Java
* Allow Java based programs to create an opportunistic GATT client
* Such client does not hold a GATT connection. It automatically
disconnects when no other GATT connections are active for the
remote device.
Bug:
63347806
Test: make, run battery service
Change-Id: Ib9333817d7f17a1fa3ddacfa51c680890bac19ec
Merged-In: Ib9333817d7f17a1fa3ddacfa51c680890bac19ec
(cherry picked from commit
13f52c8118c09ffc57b581a7d44b08e5e66d62fe)
Eric Laurent [Tue, 11 Jul 2017 21:08:11 +0000 (14:08 -0700)]
audioservice: fix media volume reset at boot
mSafeUsbMediaVolumeIndex must be initialized after createStreamStates()
because it relies on audio policy having correct ranges for volum indexes.
Also change the safe volume threshold for USB headset from -15dBFs to
-30dBFs to account for max EQ gain.
Bug:
63462140
Bug:
63388412
Test: Verify USB headset media volume is unchanged after reboot
when no SIM is present.
Change-Id: I5252d97e3f3dcde7568681abb066752ef0d936d2
George Burgess IV [Wed, 12 Jul 2017 00:18:26 +0000 (17:18 -0700)]
app_main: silence static analyzer warnings
This silences two warnings:
frameworks/base/cmds/app_process/app_main.cpp:238:11: warning: Potential
memory leak
frameworks/base/cmds/app_process/app_main.cpp:261:9: warning: Potential
memory leak
As the (existing) comment notes, we nuke argv later in main(), so these
copies are necessary. Since these args need to live for basically the
entire life of the process, it seems pointless to go out of our way to
free them.
Bug:
27101951
Test: mma. Static analyzer warnings are gone.
Change-Id: Icbfabfede9db909f6acb274b697cb6076c3fc11f
Hugo Benichi [Fri, 7 Jul 2017 02:55:41 +0000 (11:55 +0900)]
Add first OWNERS files for core networking
Covering
core/java/android/net/
core/java/com/android/server/net/
packages/CaptivePortalLogin/
services/core/java/com/android/server/
ConnectivityService.java
NsdServic.java
NetworkManagementService.java
services/core/java/com/android/server/connectivity/
services/net/
tests/net/
Android core networking files not covered:
services/core/jni/com_android_server_connectivity_tethering_OffloadHardwareInterface.cpp
services/core/proto/ipconnectivity.proto (path unique to aosp)
Bug:
63408147
Test: builds
Change-Id: Ifbb923d5ffdcada83864b5e0eb07911682d66efa
Winson Chung [Wed, 12 Jul 2017 00:09:35 +0000 (00:09 +0000)]
Merge "Ensure transparent assistant works with PiP" into oc-dr1-dev
am:
8d10791f5b
Change-Id: Ie8ea7cec050551193b1c0520e349f6552fe0b6dd
Winson Chung [Wed, 12 Jul 2017 00:01:48 +0000 (00:01 +0000)]
Merge "Ensure transparent assistant works with PiP" into oc-dr1-dev
Winson Chung [Tue, 11 Jul 2017 16:59:56 +0000 (09:59 -0700)]
Fix z-order issue with text cursors and PiP.
- When an activity is in PiP, its windows are top most and always
computed incorrectly as the IME target. As a result, the popup
windows for the cursors don't find the right parent and are not
promoted to be above the IME.
Bug:
63546389
Test: Enter PiP, open app with bottom anchored input, and select
some text. Ensure that the cursors are top-most.
Test: go/wm-smoke
Change-Id: I1267504e10544b0a075bbf73e41e001d07a5f74c
jiabin [Mon, 26 Jun 2017 20:48:14 +0000 (13:48 -0700)]
Use DisplayListener instead of WindowRotationListener in AudioService.
In AudioService should use a DisplayListener to listen for the default
display's orientation, not handling window orientation in AudioService.
Bug:
62460024
Test: Manually test on Marlin.
Change-Id: I0b7280f9e851b10e8c23406cae3407b45c97bdda
(cherry picked from commit
383c1cefd112c0cd56a3b34a9891ce095d3013de)
Daichi Hirono [Tue, 11 Jul 2017 23:01:55 +0000 (23:01 +0000)]
Fix method sinature of FuseAppLoop JNI code
am:
81977b8929
Change-Id: I876f3dea409cdb90f21d4aa23ba140bcfc5ba224
Andreas Gampe [Tue, 11 Jul 2017 17:25:09 +0000 (10:25 -0700)]
IpSecService: Actually throw exception
Add a missing throw.
Bug:
19797138
Test: m
Test: Device boots
Change-Id: I6c6058ecc95a5b85da43a42bac2846c31cefc038
Jack He [Tue, 11 Jul 2017 20:45:54 +0000 (20:45 +0000)]
Merge "GATT: Expose opportunistic client API to Java" am:
782ba0aca8 am:
f0efa2c810
am:
778d7cd3a7
Change-Id: Ifc8800964fc602c6eca3df03e16d1c303389dff0
Daichi Hirono [Tue, 11 Jul 2017 02:18:34 +0000 (11:18 +0900)]
Fix method sinature of FuseAppLoop JNI code
The file size passed to replyLookup and replyGetAttr needed to be jlong,
but they were jint before the fix.
Bug:
63543158
Test: Transfer 4GB+ files through ProxyFileDescriptor
Change-Id: Idaf27538e067854a25ae413651d8f83f0df3f387
(cherry picked from commit
d2229a65f53e7b9e9fc861ac300607a329153c4c)
Jack He [Tue, 11 Jul 2017 20:37:36 +0000 (20:37 +0000)]
Merge "GATT: Expose opportunistic client API to Java" am:
782ba0aca8
am:
f0efa2c810
Change-Id: I242ede1cfe035f51920a5a1cb90cf0616bae1e93
Jason Monk [Tue, 11 Jul 2017 20:31:22 +0000 (20:31 +0000)]
Merge "Final tweaks to power menu" into oc-dr1-dev
am:
0a2ada5416
Change-Id: I2f19770417a30863f99675820908623eb7a8cec0
Jack He [Tue, 11 Jul 2017 20:23:53 +0000 (20:23 +0000)]
Merge "GATT: Expose opportunistic client API to Java"
am:
782ba0aca8
Change-Id: If29bc145c1947f2e10472565ae753696e8057dd1
TreeHugger Robot [Tue, 11 Jul 2017 20:22:16 +0000 (20:22 +0000)]
Merge "Final tweaks to power menu" into oc-dr1-dev
Treehugger Robot [Tue, 11 Jul 2017 20:15:17 +0000 (20:15 +0000)]
Merge "GATT: Expose opportunistic client API to Java"
qingxi [Fri, 23 Jun 2017 22:32:53 +0000 (15:32 -0700)]
Move eSIM factory reset implementation to RecoverySystem
This CL reverts the implementation of eSIM factory reset in
MasterClearReceiver and uses RecoverySystem#rebootWipeUserData to erase
eSIM data. Besides this, when the eSIM data isn't erased, we should call
EuiccManager#retainSubscriptionsForFactoryReset to let the fastboot know
that.
Bug:
62957212
Test: TreeHugger
Merged-In: I08ab9d53ec4fc73a65e8e7d0c39ac95b2d44d012
Change-Id: I08ab9d53ec4fc73a65e8e7d0c39ac95b2d44d012
Jack He [Wed, 5 Jul 2017 21:55:35 +0000 (14:55 -0700)]
GATT: Expose opportunistic client API to Java
* Allow Java based programs to create an opportunistic GATT client
* Such client does not hold a GATT connection. It automatically
disconnects when no other GATT connections are active for the
remote device.
Bug:
63347806
Test: make, run battery service
Change-Id: Ib9333817d7f17a1fa3ddacfa51c680890bac19ec
Lucas Dupin [Tue, 11 Jul 2017 17:36:07 +0000 (17:36 +0000)]
Merge "Fix scrim opacity in the brightness mirror" into oc-dr1-dev
am:
c393be76d9
Change-Id: I37af2f178220bc7cd0b6fbac51d6cf3f84193ab9
Lucas Dupin [Tue, 11 Jul 2017 17:29:13 +0000 (17:29 +0000)]
Merge "Fix scrim opacity in the brightness mirror" into oc-dr1-dev
Philip Quinn [Tue, 11 Jul 2017 16:53:04 +0000 (16:53 +0000)]
Merge "Hide the Keyguard bottom area overlay when dozing." into oc-dr1-dev
am:
2b6d358d55
Change-Id: Id8de1f9a19f39a5869b7eb6efda16dfe7c163815
Philip Quinn [Tue, 11 Jul 2017 16:44:49 +0000 (16:44 +0000)]
Merge "Hide the Keyguard bottom area overlay when dozing." into oc-dr1-dev
Jason Monk [Tue, 11 Jul 2017 16:34:04 +0000 (16:34 +0000)]
Merge "Fix zen panel theming" into oc-dr1-dev
am:
1cd7e7a431
Change-Id: I40430a3de3c8866a83a6e160f6a4d2adbd7481d4
Jason Monk [Tue, 11 Jul 2017 16:32:27 +0000 (16:32 +0000)]
Merge "Try to work on test flakyness." into oc-dr1-dev
am:
0c3d08d61c
Change-Id: I004c7f9ebb19a1628445d0a44dcf10754b2d2943
TreeHugger Robot [Tue, 11 Jul 2017 16:28:44 +0000 (16:28 +0000)]
Merge "Fix zen panel theming" into oc-dr1-dev
TreeHugger Robot [Tue, 11 Jul 2017 16:24:50 +0000 (16:24 +0000)]
Merge "Try to work on test flakyness." into oc-dr1-dev
Jason Monk [Tue, 11 Jul 2017 15:07:08 +0000 (11:07 -0400)]
Final tweaks to power menu
- Redlines
- More scrim on shutdown
- Fix ordering in seascape
Test: visual
Change-Id: Id5a92f323162a5157b71e9798f7d4692292bced6
Fixes:
63534082
Fixes:
37013646
Christine Franks [Tue, 11 Jul 2017 14:47:35 +0000 (14:47 +0000)]
Merge "Support demo mode and demo users" into oc-dr1-dev
am:
2f87ca1637
Change-Id: I429ce9d2c273c9b093e2f9fe789d126a0b95f198
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
Change-Id: Ib32489d07778465134bca52c589baddbd78ab129
Christine Franks [Tue, 11 Jul 2017 14:37:06 +0000 (14:37 +0000)]
Merge "Support demo mode and demo users" into oc-dr1-dev
Jason Monk [Tue, 11 Jul 2017 14:13:31 +0000 (10:13 -0400)]
Fix zen panel theming
The theme of the panel might be different than sysui now, so it
needs to use the right context.
Test: visual
Change-Id: Ic647421113f6721e63e69afc2b9c5d6c5b0e86f2
Fixes:
63530105
Jason Monk [Tue, 11 Jul 2017 14:05:03 +0000 (10:05 -0400)]
Try to work on test flakyness.
- Add bt permission
- mock more BT stuff
- Disable test that is causing crash on main thread
Test: runtest systemui
Change-Id: I5cddb71941cce4f9b595c65ef69919186addb6df
Fixes:
63568935
Lucas Dupin [Tue, 11 Jul 2017 13:33:55 +0000 (13:33 +0000)]
Merge "Lock pattern should be red when error" into oc-dr1-dev
am:
b02cbdeeb3
Change-Id: Iaf3f580af7b8e3bc7a4bfb7a9d5344bb37ab4dc6
TreeHugger Robot [Tue, 11 Jul 2017 13:25:01 +0000 (13:25 +0000)]
Merge "Lock pattern should be red when error" into oc-dr1-dev
Hugo Benichi [Tue, 11 Jul 2017 13:17:55 +0000 (13:17 +0000)]
Merge "CaptivePortalLogin ignores some ssl errors." into stage-aosp-master am:
d23be95dd7 -s ours
am:
eed04347e7
Change-Id: I742f7418f887e2622e6e4286b47c855ef50a09bb
Hugo Benichi [Tue, 11 Jul 2017 13:10:48 +0000 (13:10 +0000)]
Merge "CaptivePortalLogin ignores some ssl errors." into stage-aosp-master
am:
d23be95dd7 -s ours
Change-Id: I0210c4fd8516d0f9d7b2df23dca1bd519ffc01c9
Hugo Benichi [Tue, 11 Jul 2017 11:56:52 +0000 (11:56 +0000)]
Merge "CaptivePortalLogin ignores some ssl errors." into stage-aosp-master
Bin Chen [Tue, 11 Jul 2017 11:23:55 +0000 (11:23 +0000)]
Merge "Fix typo in Parcel javadoc." am:
ed0e6009df am:
d29e275b5b
am:
4d4b9a2ac6
Change-Id: Ief5a7469fbf2161d116dc210f3aa007bb4d69455
Bin Chen [Tue, 11 Jul 2017 11:17:15 +0000 (11:17 +0000)]
Merge "Fix typo in Parcel javadoc." am:
ed0e6009df
am:
d29e275b5b
Change-Id: Id1fa7cc2948153697c8c34a2e4db632153218162
Bin Chen [Tue, 11 Jul 2017 11:10:23 +0000 (11:10 +0000)]
Merge "Fix typo in Parcel javadoc."
am:
ed0e6009df
Change-Id: I06d3ac4d00cfec5179ca6e636365617c644f9fcd
Treehugger Robot [Tue, 11 Jul 2017 10:58:30 +0000 (10:58 +0000)]
Merge "Fix typo in Parcel javadoc."
Hugo Benichi [Tue, 11 Jul 2017 10:30:50 +0000 (10:30 +0000)]
Merge "Instrument captive portal login activity" into stage-aosp-master am:
858ed182d6 -s ours
am:
2380d0e286 -s ours
Change-Id: Ibd569d8ad58a5631a1c1fcceca0e342c960f1660
Neil Fuller [Tue, 11 Jul 2017 10:26:05 +0000 (10:26 +0000)]
Merge "Merge "Move column definitions to an inner class" am:
ab0bb48965" into stage-aosp-master am:
cb996b5574
am:
9e86604cbd
Change-Id: I8118b8b1041ade5e19fee06289d1ba4c1848837f
Hugo Benichi [Tue, 11 Jul 2017 10:24:22 +0000 (10:24 +0000)]
Merge "Instrument captive portal login activity" into stage-aosp-master
am:
858ed182d6 -s ours
Change-Id: Ia9a74f588f8600bf2e453d7e7f1b5e1a818c432d
Hugo Benichi [Tue, 11 Jul 2017 10:24:15 +0000 (10:24 +0000)]
Merge "NetworkCapabilities: Added support for TRANSPORT_LOWPAN" into stage-aosp-master am:
6ab950dd5f
am:
6659fdba55 -s ours
Change-Id: I30a343b25381f201cad4bff45df4ab6a1cf38e34
Neil Fuller [Tue, 11 Jul 2017 10:16:54 +0000 (10:16 +0000)]
Merge "Merge "Move column definitions to an inner class" am:
ab0bb48965" into stage-aosp-master
am:
cb996b5574
Change-Id: I42513c054183772a27fb985cee66440a88003143
Hugo Benichi [Tue, 11 Jul 2017 10:15:19 +0000 (10:15 +0000)]
Merge "NetworkCapabilities: Added support for TRANSPORT_LOWPAN" into stage-aosp-master
am:
6ab950dd5f
Change-Id: I23fbbc7bf6ec53dc04ba4328166038f19b972268
Hugo Benichi [Tue, 11 Jul 2017 10:11:39 +0000 (10:11 +0000)]
Merge "Instrument captive portal login activity" into stage-aosp-master
Android Build Merger (Role) [Tue, 11 Jul 2017 10:08:59 +0000 (10:08 +0000)]
Merge "Merge "Move column definitions to an inner class" am:
ab0bb48965" into stage-aosp-master
Neil Fuller [Tue, 11 Jul 2017 10:07:37 +0000 (10:07 +0000)]
Merge "Move column definitions to an inner class"
am:
ab0bb48965
Change-Id: Ie9fa51f05dc7df781e9e9bdeb9d3c21ca4cde6c8
Hugo Benichi [Tue, 11 Jul 2017 10:06:03 +0000 (10:06 +0000)]
Merge "NetworkCapabilities: Added support for TRANSPORT_LOWPAN" into stage-aosp-master
Neil Fuller [Tue, 11 Jul 2017 10:01:01 +0000 (10:01 +0000)]
Merge "Move column definitions to an inner class"
Hugo Benichi [Tue, 11 Jul 2017 07:32:04 +0000 (07:32 +0000)]
Merge "Fix for the missing focus in WebView form fields." am:
2708da7bf6 -s ours am:
76ea0eb773
am:
2633524cd5
Change-Id: I2ad45500377e1e1a8b4ce550a058eec7facbde7f
Hugo Benichi [Tue, 11 Jul 2017 07:25:43 +0000 (07:25 +0000)]
Merge "New Metrics constants for captive portal related UI" into stage-aosp-master am:
369bbf5d05
am:
06f8914e3d -s ours
Change-Id: Ica33b5ad53a52af9d95d2bc8c606ee6fedd776a4
Hugo Benichi [Tue, 11 Jul 2017 07:25:32 +0000 (07:25 +0000)]
Merge "Fix for the missing focus in WebView form fields." am:
2708da7bf6 -s ours
am:
76ea0eb773
Change-Id: I4799a8a5a3cf3c68774f40a560a1198d9af61eb6
Hugo Benichi [Tue, 11 Jul 2017 07:20:46 +0000 (07:20 +0000)]
Merge "New Metrics constants for captive portal related UI" into stage-aosp-master
am:
369bbf5d05
Change-Id: I02802f762a62fc29ff383523d2c52ebd536a9715
Hugo Benichi [Tue, 11 Jul 2017 07:16:21 +0000 (07:16 +0000)]
Merge "Fix for the missing focus in WebView form fields."
am:
2708da7bf6 -s ours
Change-Id: Ia27a1468e2e81444562d592a0c9d5e4f48cc776c
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.
(cherry pick from commit
22542ed48090e2e6e9474b658fdd368041a4060b which
was skipped from merging into stage-aosp-master)
Change-Id: Iff025d68b824eac2c30b9656fd2494338eb07eb3
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]
Change-Id: I38b8e4dd3d62ad1261695780aeb2377f26a25997
Merged-In: Ia05853506d424ad4cb2c11770ae7718fbef3f01c
Merged-In: I9184f6263a003c2be28f41a550c6164c8d6ee907
(cherry picked from commit
c61dc92fc0619d101c4b789f6305012701cc47a0)
Hugo Benichi [Tue, 11 Jul 2017 07:08:43 +0000 (07:08 +0000)]
Merge "New Metrics constants for captive portal related UI" into stage-aosp-master
Hugo Benichi [Tue, 11 Jul 2017 07:05:26 +0000 (07:05 +0000)]
Merge "Fix for the missing focus in WebView form fields."
susnata [Fri, 23 Jun 2017 16:13:05 +0000 (09:13 -0700)]
Fix for the missing focus in WebView form fields.
This looks like a regression for WebView (58.0.3029.125) in android
'O'. But this seems to have been fixed in early version of 60 (webview).
This workaround gets us past the problem, until we get the newer version
of WebView.
Bug:
62449959
Test: Manual
Change-Id: Iab22f8f0db0ab58cb0a184c3f88e6b3770a35fb0
Merged-In: I29883bf7d1567c1ce7be90b4efde4b3da93b99a2
(cherry pick from commit
97640400c4aa6bf05d5606ea749b54ad63de97cd)
Robert Quattlebaum [Mon, 15 May 2017 22:53:29 +0000 (15:53 -0700)]
NetworkCapabilities: Added support for TRANSPORT_LOWPAN
This change simply adds a new constant, `TRANSPORT_LOWPAN`, for
identifying low-power wireless networks like Thread.
Bug: b/
33073713
Test: builds
Change-Id: I50d9b8df1a0270e06c28f001adf6c52a142a85af
Merged-In: Ie4aa77496f8ff466fa1a5fbc556e9c029457a689
(cherry pick from commit
557e0c38b98f66d6147206f23d24d8d73b09e3e5)
Hugo Benichi [Wed, 31 May 2017 02:11:37 +0000 (11:11 +0900)]
New Metrics constants for captive portal related UI
This patch adds 5 new constants in metrics_constants for counting
various UI interactions involving captive portals:
- sign-in button in wifi network details card
- captive portal login activity start up
- captive portal login activity menu interactions (2 constants)
- captive portal login activity auto-closes on portal dismissed
Bug:
34901696
Bug:
26303355
Test: compiled, flashed
Change-Id: I01e2f2942b9d0183512cfddb248e66d3e33418d3
Merged-In: I489e5f2f8ff27da60fed215fa5f51326933fd79e
(cherry pick from commit
11da42bbb63dba98515e6a3ca7c55e77cbb3c7bf)
Android Build Merger (Role) [Tue, 11 Jul 2017 04:07:00 +0000 (04:07 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
88e9aa19e2 -s ours am:
91dcbe4bd9 -s ours" into oc-dr1-dev-plus-aosp
Bill Yi [Tue, 11 Jul 2017 04:05:50 +0000 (04:05 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
88e9aa19e2 -s ours
am:
91dcbe4bd9 -s ours
Change-Id: I9fb6e2699b3f737053741a2e26095241413dda76
Bill Yi [Tue, 11 Jul 2017 04:05:25 +0000 (04:05 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
88e9aa19e2 -s ours
am:
8b44d3722d -s ours
Change-Id: I0dd1d3f0f62fa0a7c7379259f15f07e4f7e98a10
Bill Yi [Tue, 11 Jul 2017 04:04:10 +0000 (04:04 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
9a18d59281 -s ours
Change-Id: If4df3f6424ae3719649f69669fb341e5bacc61e1
Android Build Merger (Role) [Tue, 11 Jul 2017 04:01:11 +0000 (04:01 +0000)]
Merge "Import translations. DO NOT MERGE am:
48cf1d9768 -s ours am:
829d7186d5 -s ours am:
c928f9b87d -s ours" into oc-dr1-dev-plus-aosp
Bill Yi [Tue, 11 Jul 2017 04:00:23 +0000 (04:00 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
88e9aa19e2 -s ours
Change-Id: Id4a8d9d891b06a789132f9d9915306f336f52902
Bill Yi [Tue, 11 Jul 2017 03:59:40 +0000 (03:59 +0000)]
Import translations. DO NOT MERGE am:
48cf1d9768 -s ours am:
829d7186d5 -s ours
am:
e2a38c087f -s ours
Change-Id: I1a354721fbdb5b6f2011e1852006eb9edb8bb7d2
Bill Yi [Tue, 11 Jul 2017 03:59:39 +0000 (03:59 +0000)]
Import translations. DO NOT MERGE am:
48cf1d9768 -s ours am:
829d7186d5 -s ours
am:
c928f9b87d -s ours
Change-Id: Ie4abec8395e6de552cbfc70f228196defc49595f
OSDN Git Service
