Beverly
90da133162
Merge "Uninstall app through notif closes app settings." into oc-mr1-dev am: 7fc4dd7e7b
...
am: 793e3641c0
2017-08-07 17:27:17 +00:00
Beverly
793e3641c0
Merge "Uninstall app through notif closes app settings." into oc-mr1-dev
...
am: 7fc4dd7e7b
2017-08-07 17:21:53 +00:00
TreeHugger Robot
7fc4dd7e7b
Merge "Uninstall app through notif closes app settings." into oc-mr1-dev
2017-08-07 17:16:06 +00:00
Peter Qiu
486fc9dca9
wifi: WifiConfigController: fix possible NPE in showSecurityFields
...
Bug: 64438040
Test: make RunSettingsRoboTests -j40 ROBOTEST_FILTER=WifiConfigControllerTest
Change-Id: I2ddc5c07a3c95cba91cef532dc2c84529146d100
2017-08-07 10:10:15 -07:00
Matthew Fritze
108c4a490e
Merge "Merge "Expose Location toggling logic" into oc-dr1-dev am: 4f0e5f8395 -s ours am: f1398725a8 -s ours" into oc-mr1-dev-plus-aosp
...
am: ab0fa22e71
2017-08-07 17:09:08 +00:00
Matthew Fritze
d780e6c06e
Merge "Expose Location toggling logic" into oc-dr1-dev am: 4f0e5f8395 am: d1b29a4350 -s ours
...
am: 4023fdd48d
2017-08-07 17:08:20 +00:00
Android Build Merger (Role)
ab0fa22e71
Merge "Merge "Expose Location toggling logic" into oc-dr1-dev am: 4f0e5f8395 -s ours am: f1398725a8 -s ours" into oc-mr1-dev-plus-aosp
2017-08-07 17:06:17 +00:00
Matthew Fritze
13c0095207
Merge "Expose Location toggling logic" into oc-dr1-dev am: 4f0e5f8395 -s ours
...
am: f1398725a8
2017-08-07 17:05:37 +00:00
Matthew Fritze
4023fdd48d
Merge "Expose Location toggling logic" into oc-dr1-dev am: 4f0e5f8395
...
am: d1b29a4350
2017-08-07 17:05:20 +00:00
Matthew Fritze
f1398725a8
Merge "Expose Location toggling logic" into oc-dr1-dev
...
am: 4f0e5f8395
2017-08-07 17:03:14 +00:00
Matthew Fritze
d1b29a4350
Merge "Expose Location toggling logic" into oc-dr1-dev
...
am: 4f0e5f8395
2017-08-07 17:02:19 +00:00
TreeHugger Robot
4f0e5f8395
Merge "Expose Location toggling logic" into oc-dr1-dev
2017-08-07 16:53:29 +00:00
Matthew Fritze
059295559c
Expose Location toggling logic am: 6593453d59
...
am: 1857058348
2017-08-07 15:17:46 +00:00
Matthew Fritze
1857058348
Expose Location toggling logic
...
am: 6593453d59
2017-08-07 15:15:41 +00:00
Beverly
2aeff818c8
Uninstall app through notif closes app settings.
...
Change-Id: I7887c7887b654c78a0fea16e898679e434fbeb53
Fixes: 62051546
Test: manual
2017-08-07 14:21:36 +00:00
Robin Lee
13e64c9c10
Remove old VPN tests which instrumented Settings
...
This is not actually a Settings test and never was, it just used
Settings as a convenient delivery mechanism for system-level privileges.
Tests for the Settings app should only check that the Settings app
is behaving within its remit, ie. showing system server state and making
the appropriate calls to set up a connection when certain UI elements
are pressed.
Also since the test relies heavily on off-device state it makes a lot
more sense to run as a hostside test and have the same test code
responsible for pushing certificates and network configs to the device
instead of including manual instructions.
For an end-to-end legacy VPN test see ACTS: https://android.googlesource.com/platform/tools/test/connectivity/+/master/acts/tests/google/net/LegacyVpnTest.py
For an end-to-end app VPN test see CTS hostside: https://android.googlesource.com/platform/cts/+/master/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/AlwaysOnVpnTest.java
Test: make Settings
Change-Id: Ia105c3ebd2fa5064adc4422bd3d77c3abba55634
Fix: 64040865
2017-08-07 10:56:32 +02:00
Bill Yi
640a6f75b8
Import translations. DO NOT MERGE am: c89d5b0093 -s ours am: 335a436998 -s ours am: cf297dcca3 -s ours
...
am: 7f49c85987
2017-08-07 06:30:53 +00:00
Bill Yi
7f49c85987
Import translations. DO NOT MERGE am: c89d5b0093 -s ours am: 335a436998 -s ours
...
am: cf297dcca3
2017-08-07 06:22:10 +00:00
Bill Yi
cf297dcca3
Import translations. DO NOT MERGE am: c89d5b0093 -s ours
...
am: 335a436998
2017-08-07 06:02:28 +00:00
Bill Yi
335a436998
Import translations. DO NOT MERGE
...
am: c89d5b0093
2017-08-07 05:50:24 +00:00
Matthew Fritze
6593453d59
Expose Location toggling logic
...
Specifically refactor the check for secondary user and the
method to toggle location mode using the previously set
location mode.
Test: robotests
Bug: 62022517
Change-Id: I519fad6d802efd8af2e77c623f698e19d4cdc800
2017-08-06 14:29:16 -07:00
Matthew Fritze
ef722b029c
Merge "Add INTENT_ONLY as a ResultPayload Availibility" into oc-mr1-dev am: 688e5438dd
...
am: a9dfbcee2b
2017-08-06 20:55:07 +00:00
Matthew Fritze
a9dfbcee2b
Merge "Add INTENT_ONLY as a ResultPayload Availibility" into oc-mr1-dev
...
am: 688e5438dd
2017-08-06 20:52:37 +00:00
TreeHugger Robot
688e5438dd
Merge "Add INTENT_ONLY as a ResultPayload Availibility" into oc-mr1-dev
2017-08-06 20:46:27 +00:00
Bill Yi
c89d5b0093
Import translations. DO NOT MERGE
...
Change-Id: Iba61a113e9577a1afa3e18880e803c65352e1a73
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-06 10:38:44 -07:00
Bill Yi
1873ef963c
Import translations. DO NOT MERGE am: 57c8508960 -s ours
...
am: e9376927a0
2017-08-06 05:02:30 +00:00
Bill Yi
e9376927a0
Import translations. DO NOT MERGE
...
am: 57c8508960
2017-08-06 04:55:27 +00:00
Bill Yi
57c8508960
Import translations. DO NOT MERGE
...
Change-Id: I2383afbd653fa9e3a1ed0e469bdbd891868f992e
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-05 19:27:58 -07:00
Doris Ling
13fb3db4a5
Merge "Merge "Fix crash when dismissing suggestions." into oc-dr1-dev am: 8f54cd46ff am: 1f39ca8abf -s ours" into oc-mr1-dev-plus-aosp
...
am: ab8ee77a54
2017-08-05 05:46:38 +00:00
Doris Ling
780b81a28c
Merge "Fix crash when dismissing suggestions." into oc-dr1-dev am: 8f54cd46ff -s ours am: e46ed6b7c5 -s ours
...
am: b358605a3e
2017-08-05 05:46:12 +00:00
Android Build Merger (Role)
ab8ee77a54
Merge "Merge "Fix crash when dismissing suggestions." into oc-dr1-dev am: 8f54cd46ff am: 1f39ca8abf -s ours" into oc-mr1-dev-plus-aosp
2017-08-05 05:40:07 +00:00
Doris Ling
b358605a3e
Merge "Fix crash when dismissing suggestions." into oc-dr1-dev am: 8f54cd46ff -s ours
...
am: e46ed6b7c5
2017-08-05 05:39:42 +00:00
Doris Ling
fe9be5cfc7
Merge "Fix crash when dismissing suggestions." into oc-dr1-dev am: 8f54cd46ff
...
am: 1f39ca8abf
2017-08-05 05:39:41 +00:00
Doris Ling
1f39ca8abf
Merge "Fix crash when dismissing suggestions." into oc-dr1-dev
...
am: 8f54cd46ff
2017-08-05 05:32:43 +00:00
Doris Ling
e46ed6b7c5
Merge "Fix crash when dismissing suggestions." into oc-dr1-dev
...
am: 8f54cd46ff
2017-08-05 05:32:42 +00:00
TreeHugger Robot
8f54cd46ff
Merge "Fix crash when dismissing suggestions." into oc-dr1-dev
2017-08-05 05:20:42 +00:00
Bill Yi
4f132c2739
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 26e4fda3f2 -s ours am: a064cc02fc -s ours" into oc-mr1-dev-plus-aosp
...
am: 7984efb252
2017-08-05 03:19:25 +00:00
Bill Yi
987f17e658
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 26e4fda3f2 -s ours am: cf898e3ff4 -s ours
...
am: de2c068f79
2017-08-05 03:19:02 +00:00
Android Build Merger (Role)
7984efb252
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 26e4fda3f2 -s ours am: a064cc02fc -s ours" into oc-mr1-dev-plus-aosp
2017-08-05 03:03:54 +00:00
Bill Yi
ed632b96a2
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 26e4fda3f2 -s ours
...
am: a064cc02fc
2017-08-05 03:03:35 +00:00
Bill Yi
de2c068f79
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 26e4fda3f2 -s ours
...
am: cf898e3ff4
2017-08-05 03:03:20 +00:00
Bill Yi
a064cc02fc
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: 26e4fda3f2
2017-08-05 02:49:27 +00:00
Bill Yi
cf898e3ff4
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: 26e4fda3f2
2017-08-05 02:49:07 +00:00
TreeHugger Robot
26e4fda3f2
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
2017-08-05 02:37:34 +00:00
Meng Wang
758a33dd51
RadioInfo: fix OMADM buttons am: d4e0fe7f93 am: 66a4bff1c8
...
am: 257814a658
2017-08-05 00:28:43 +00:00
Meng Wang
3524827f84
RadioInfo: fix OMADM buttons am: d4e0fe7f93 am: 8c2cd0d047
...
am: eee2dac885
2017-08-05 00:28:18 +00:00
Meng Wang
257814a658
RadioInfo: fix OMADM buttons am: d4e0fe7f93
...
am: 66a4bff1c8
2017-08-05 00:16:45 +00:00
Meng Wang
eee2dac885
RadioInfo: fix OMADM buttons am: d4e0fe7f93
...
am: 8c2cd0d047
2017-08-05 00:15:23 +00:00
Meng Wang
66a4bff1c8
RadioInfo: fix OMADM buttons
...
am: d4e0fe7f93
2017-08-05 00:04:44 +00:00
Meng Wang
8c2cd0d047
RadioInfo: fix OMADM buttons
...
am: d4e0fe7f93
2017-08-05 00:04:43 +00:00
