OSDN Git Service
Bill Yi [Fri, 13 Sep 2019 00:49:20 +0000 (17:49 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
86dfbd6254 -s ours
am:
5c90432dc1 -s ours
am skip reason: subject contains skip directive
Change-Id: Ic722d4de71c99e005a84f5650c8bf9c82c392cd0
Bill Yi [Fri, 13 Sep 2019 00:42:18 +0000 (17:42 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
86dfbd6254 -s ours
am:
edbddf7f42 -s ours
am skip reason: subject contains skip directive
Change-Id: Ib0eeb1f2ac5bff404717b4550d48c32bc536ef61
Bill Yi [Fri, 13 Sep 2019 00:39:37 +0000 (17:39 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
86dfbd6254 -s ours
am skip reason: subject contains skip directive
Change-Id: I9979a3422b5926a7e210ded393484f6eb28e8600
Bill Yi [Fri, 13 Sep 2019 00:28:34 +0000 (17:28 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
f066797849 -s ours
am skip reason: subject contains skip directive
Change-Id: I83269163f1e1f3752a85cb4eaed860316efba142
Bill Yi [Fri, 13 Sep 2019 00:28:33 +0000 (17:28 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
86dfbd6254 -s ours
am skip reason: subject contains skip directive
Change-Id: Ib139ea535e149923d50d835e030636df7edbf7cc
Bill Yi [Thu, 12 Sep 2019 23:10:45 +0000 (16:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: I27cfc6c9ffa9def49d83eea920b88a5ce762fb53
Auto-generated-cl: translation import
Bill Yi [Thu, 12 Sep 2019 22:54:53 +0000 (15:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1cf797286a22443416d4b401e38f8923bb4edd43
Auto-generated-cl: translation import
cosmohsieh [Thu, 12 Sep 2019 21:09:30 +0000 (14:09 -0700)]
Merge "[Network Connection] Call NetworkRequestUserSelectionCallback#reject() if user quit activity without selection" into qt-qpr1-dev
am:
17cbea0112
Change-Id: Icc3c00f542746c1ffa423c04c160ba85e53ad834
TreeHugger Robot [Thu, 12 Sep 2019 20:49:56 +0000 (20:49 +0000)]
Merge "[Network Connection] Call NetworkRequestUserSelectionCallback#reject() if user quit activity without selection" into qt-qpr1-dev
Arc Wang [Thu, 12 Sep 2019 08:14:57 +0000 (01:14 -0700)]
Merge "[Wi-Fi] Can't change EAP method for a saved enterprise Wi-Fi network" into qt-qpr1-dev
am:
ec3055b9eb
Change-Id: I89755845ae509051e4fc2fcfb8f1dd1ee5ab195c
TreeHugger Robot [Thu, 12 Sep 2019 08:05:21 +0000 (08:05 +0000)]
Merge "[Wi-Fi] Can't change EAP method for a saved enterprise Wi-Fi network" into qt-qpr1-dev
Android Build Merger (Role) [Thu, 12 Sep 2019 05:57:41 +0000 (05:57 +0000)]
Merge "[automerger skipped] Import translations. DO NOT MERGE am:
8173de150d -s ours am:
9b956eb47f -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp
Bill Yi [Thu, 12 Sep 2019 05:57:29 +0000 (22:57 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
8173de150d -s ours
am:
9b956eb47f -s ours
am skip reason: subject contains skip directive
Change-Id: I56786fa936a90e1870aa8b49ccd3eb1e4e1c2de3
Bill Yi [Thu, 12 Sep 2019 05:57:28 +0000 (22:57 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
8173de150d -s ours
am:
e6107df474 -s ours
am skip reason: subject contains skip directive
Change-Id: I3fe8c6432c4b840365aeebdbf2c455a4e98bd514
Bill Yi [Thu, 12 Sep 2019 05:54:54 +0000 (22:54 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
deee385ba8 -s ours
am skip reason: subject contains skip directive
Change-Id: I270de5daddcee5c1ed3c779bcad217dd1526cbe8
Bill Yi [Thu, 12 Sep 2019 05:50:29 +0000 (22:50 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
8173de150d -s ours
am skip reason: subject contains skip directive
Change-Id: I010ba47035a6530ec5d50abd363a6ea013515551
Bill Yi [Thu, 12 Sep 2019 05:50:27 +0000 (22:50 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
8173de150d -s ours
am skip reason: subject contains skip directive
Change-Id: Ica53f59adc22c9442b6c823abc35a63c2e864d8e
Bill Yi [Thu, 12 Sep 2019 02:26:07 +0000 (19:26 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I1b2826dd790519a2946d8505aec03f72b1815f04
Bill Yi [Thu, 12 Sep 2019 02:10:50 +0000 (19:10 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I60bd87b13925d699bc7db9f6f215321ff20eea44
Mady Mellor [Wed, 11 Sep 2019 22:40:20 +0000 (22:40 +0000)]
Merge "qt-r1-bubbles-dev @ build
5835883" into qt-qpr1-dev-plus-aosp
Xin Li [Wed, 11 Sep 2019 21:57:08 +0000 (14:57 -0700)]
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (
5817612) into stage-aosp-master am:
aac7f8e2cd -s ours
am:
827172cee1 -s ours
am skip reason: change_id Idcc078c0e541c04633db6d94c613ac4c861ba963 with SHA1
7195e05dfa is in history
Change-Id: I717bb9c937ab8d3eaf4f5809efa874357f482a2e
Xin Li [Wed, 11 Sep 2019 21:09:27 +0000 (14:09 -0700)]
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (
5817612) into stage-aosp-master
am:
aac7f8e2cd -s ours
am skip reason: change_id Idcc078c0e541c04633db6d94c613ac4c861ba963 with SHA1
7195e05dfa is in history
Change-Id: I7826eee6fd99a83bf4e8a96bb51f0622fbdf84c3
Android Build Merger (Role) [Wed, 11 Sep 2019 19:10:12 +0000 (19:10 +0000)]
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am:
09c08d1da0 -s ours am:
8191079b21 -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp
Bill Yi [Wed, 11 Sep 2019 19:10:01 +0000 (12:10 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am:
09c08d1da0 -s ours
am:
8191079b21 -s ours
am skip reason: subject contains skip directive
Change-Id: Ie08d32473345828c033f4ccd3d8373bc4d6466f3
Bill Yi [Wed, 11 Sep 2019 19:09:59 +0000 (12:09 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am:
09c08d1da0 -s ours
am:
73a98df64b -s ours
am skip reason: subject contains skip directive
Change-Id: Ia3e5d45060f2c56472321a7d219587ce42ac15e9
Bill Yi [Wed, 11 Sep 2019 19:03:01 +0000 (12:03 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am:
09c08d1da0 -s ours
am skip reason: subject contains skip directive
Change-Id: I8a743a33b14e424069a75ac9d590ffca287300f1
Bill Yi [Wed, 11 Sep 2019 19:03:00 +0000 (12:03 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am:
09c08d1da0 -s ours
am skip reason: subject contains skip directive
Change-Id: I07fe60817626b45ba59b9e0f823aa7f462533b19
TreeHugger Robot [Wed, 11 Sep 2019 18:41:53 +0000 (18:41 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
Bill Yi [Wed, 11 Sep 2019 18:35:13 +0000 (11:35 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
am:
914bda7715 -s ours
am skip reason: subject contains skip directive
Change-Id: Ie6cf99a4b968e4983e5562741349e9cce58d806b
TreeHugger Robot [Wed, 11 Sep 2019 18:18:32 +0000 (18:18 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
Bill Yi [Wed, 11 Sep 2019 05:37:57 +0000 (22:37 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I1ee6e4e49b18ed13ab3e431583d316c0663a4f8f
Bill Yi [Wed, 11 Sep 2019 05:24:00 +0000 (22:24 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I1163141368fc482f675e7d9dd7b4503dfcd309bf
Bill Yi [Wed, 11 Sep 2019 04:08:03 +0000 (21:08 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
am:
7177991eba -s ours
am skip reason: subject contains skip directive
Change-Id: Ie0777550cf1f9db6ed3d3262331a80c4403ae61f
TreeHugger Robot [Wed, 11 Sep 2019 03:43:27 +0000 (03:43 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
Android Build Merger (Role) [Wed, 11 Sep 2019 03:23:08 +0000 (03:23 +0000)]
Merge "[automerger skipped] Import translations. DO NOT MERGE am:
c1bfd1f50d -s ours am:
59cd1121cc -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp
Bill Yi [Wed, 11 Sep 2019 03:22:51 +0000 (20:22 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
c1bfd1f50d -s ours
am:
805197327f -s ours
am skip reason: subject contains skip directive
Change-Id: Iae1bbc92d68d117d8ca3d5be730c0cb95e87cb0c
Bill Yi [Wed, 11 Sep 2019 03:22:51 +0000 (20:22 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
c1bfd1f50d -s ours
am:
59cd1121cc -s ours
am skip reason: subject contains skip directive
Change-Id: I56468e249d157f9befdeeb06feb108dfbb143e03
Bill Yi [Wed, 11 Sep 2019 03:15:44 +0000 (20:15 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
c1bfd1f50d -s ours
am skip reason: subject contains skip directive
Change-Id: Ie4a0625a623ccb37a3de288121c366d25c8ab946
Bill Yi [Wed, 11 Sep 2019 03:15:44 +0000 (20:15 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
c1bfd1f50d -s ours
am skip reason: subject contains skip directive
Change-Id: I6fcd972f09510bdba25fd0732dd37e168d356a70
Bill Yi [Wed, 11 Sep 2019 02:41:30 +0000 (19:41 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
140445577
Change-Id: Ica56884b49d5f16a84096f4c4f34bc0b639ad3e1
Bill Yi [Wed, 11 Sep 2019 01:35:47 +0000 (18:35 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
140445577
Change-Id: Ife760913fdf573fb8820f604e90fae666cab08e5
Miranda Kephart [Tue, 10 Sep 2019 20:52:49 +0000 (13:52 -0700)]
[automerger skipped] Merge "Merging from qt-qpr1-sysui-dev @ build
5855545" into qt-qpr1-dev
am:
24df1249f0 -s ours
am skip reason: change_id Ieea5138da3d182735fb92eedd607f52750c91e19 with SHA1
e9963e37d5 is in history
Change-Id: Ibf471a4f35352a1ed67ff4450bf99c351b77b542
Miranda Kephart [Tue, 10 Sep 2019 20:46:36 +0000 (13:46 -0700)]
[automerger skipped] Merging from qt-qpr1-sysui-dev @ build
5855545
am:
28812b0feb -s ours
am skip reason: change_id Ieea5138da3d182735fb92eedd607f52750c91e19 with SHA1
e9963e37d5 is in history
Change-Id: I00083b6cc58401b599d096e8f360b629b6f91ee3
Miranda Kephart [Tue, 10 Sep 2019 20:24:04 +0000 (20:24 +0000)]
Merge "Merging from qt-qpr1-sysui-dev @ build
5855545" into qt-qpr1-dev
Miranda Kephart [Tue, 10 Sep 2019 17:20:56 +0000 (17:20 +0000)]
Merge "Merge branch 'fetch_qt-qpr1-sysui-dev_5855545' into merge_qt-qpr1-sysui-dev_5855545" into qt-qpr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 10 Sep 2019 06:26:30 +0000 (06:26 +0000)]
Merge "Merge "Change cancel button type to skip for SUW" into qt-r1-dev am:
ff01d52d50 am:
006edb1f6d" into qt-qpr1-dev-plus-aosp
joshmccloskey [Tue, 10 Sep 2019 06:26:12 +0000 (23:26 -0700)]
Merge "Change cancel button type to skip for SUW" into qt-r1-dev am:
ff01d52d50
am:
349e664035
Change-Id: Iad6b5b3e8a637b910227d5cba56e09c8f075d4be
joshmccloskey [Tue, 10 Sep 2019 06:26:12 +0000 (23:26 -0700)]
Merge "Change cancel button type to skip for SUW" into qt-r1-dev am:
ff01d52d50
am:
006edb1f6d
Change-Id: Id8701b96d5fa1418cf020339d8b8b11a6ae07388
joshmccloskey [Tue, 10 Sep 2019 06:20:26 +0000 (23:20 -0700)]
Merge "Change cancel button type to skip for SUW" into qt-r1-dev
am:
ff01d52d50
Change-Id: Idcddf14e8aa3cfcd50b78ed112d51bf06424b840
joshmccloskey [Tue, 10 Sep 2019 06:20:15 +0000 (23:20 -0700)]
Merge "Change cancel button type to skip for SUW" into qt-r1-dev
am:
ff01d52d50
Change-Id: I08e856f94da8ac0b1151d61e8717088672852f6a
TreeHugger Robot [Tue, 10 Sep 2019 06:02:39 +0000 (06:02 +0000)]
Merge "Change cancel button type to skip for SUW" into qt-r1-dev
joshmccloskey [Mon, 9 Sep 2019 23:11:27 +0000 (16:11 -0700)]
Change cancel button type to skip for SUW
Test: Verified in SUW that enrollment will skip after
tapping the cancel button in the Introduction.
Fixes:
140702414
Change-Id: I9d9da0ff6d10b6ee6929cb52ff4a03a684f43d17
Mady Mellor [Fri, 30 Aug 2019 22:57:58 +0000 (15:57 -0700)]
qt-r1-bubbles-dev @ build
5835883
Test: presubmit setup on source branch
Bug:
129158983
Bug:
136034310
Bug:
137876221
Change-Id: I58f0287ed99a4daf3758316e4004bca05f17b0d1
Merged-In: If2b813f24cf5998829fe417e32179c5e8283d308
Miranda Kephart [Fri, 6 Sep 2019 14:40:29 +0000 (10:40 -0400)]
Merging from qt-qpr1-sysui-dev @ build
5855545
Test: manual, presubmit on the source branch
Merged-In: Idc3d5c39427722a5486552312552f7f77ef40980
Merged-In: Ieea5138da3d182735fb92eedd607f52750c91e19
Change-Id: Iefbdac334e3e1807f61e4832f7ac66b9023047f6
Miranda Kephart [Mon, 9 Sep 2019 18:14:14 +0000 (14:14 -0400)]
Merge branch 'fetch_qt-qpr1-sysui-dev_5855545' into merge_qt-qpr1-sysui-dev_5855545
Test: manual, presubmit on the source branch
Merged-In: Idc3d5c39427722a5486552312552f7f77ef40980
Change-Id: Ieea5138da3d182735fb92eedd607f52750c91e19
Xin Li [Sun, 8 Sep 2019 20:06:57 +0000 (13:06 -0700)]
Merge qt-r1-dev-plus-aosp-without-vendor (
5817612) into stage-aosp-master
Bug:
135460123
Change-Id: Ifbb4b45d2d592e4a4ede265d2c882dc1cb4a0410
Merged-In: Idcc078c0e541c04633db6d94c613ac4c861ba963
Bill Yi [Sun, 8 Sep 2019 01:39:45 +0000 (18:39 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
53e826122d -s ours
am:
8d9317075c -s ours
am skip reason: subject contains skip directive
Change-Id: I996bc04b56ca7193f37e45c668156dc142e2865e
Bill Yi [Sun, 8 Sep 2019 01:38:10 +0000 (18:38 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
53e826122d -s ours
am:
8d9317075c -s ours
am skip reason: subject contains skip directive
Change-Id: I827558296e4ebcdd2e1345e156e73dab3c70ae0c
Bill Yi [Sun, 8 Sep 2019 01:27:34 +0000 (18:27 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
53e826122d -s ours
am skip reason: subject contains skip directive
Change-Id: Idcf6bcf772195798c2853d81e1ab6623b17bf8df
Bill Yi [Sat, 7 Sep 2019 00:58:14 +0000 (17:58 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
53e826122d -s ours
am:
c47b5e1943 -s ours
am skip reason: subject contains skip directive
Change-Id: I2077d19fea3c18f021f13eef7fee86e43e45cd66
Bill Yi [Sat, 7 Sep 2019 00:51:15 +0000 (17:51 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
53e826122d -s ours
am skip reason: subject contains skip directive
Change-Id: I79de9a02a1f3aefd51e6d436b939fc562bf3af72
Bill Yi [Fri, 6 Sep 2019 16:27:30 +0000 (09:27 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: Ie16be62ead2b453c69d0201a5aa5e7ae3411405f
Raff Tsai [Fri, 6 Sep 2019 08:47:19 +0000 (01:47 -0700)]
Fix Settings crash when click uninstall button
am:
2d709131ba
Change-Id: I1e6228b5e4ecf10aa58bd41d2d8019b3d727b935
Raff Tsai [Fri, 6 Sep 2019 08:47:16 +0000 (01:47 -0700)]
Fix Settings crash when click uninstall button
am:
2d709131ba
Change-Id: I5e7c8f9e5ea9ac6854be24ddd025ee0849a200cf
Raff Tsai [Mon, 29 Jul 2019 08:24:39 +0000 (16:24 +0800)]
Fix Settings crash when click uninstall button
When mPackageName is null, mFinish is true. OnResume() doesn't
invoke refreshUI(). It causes uninstall button is still enabled.
The solution is hiding AppButtonsPreference when mFinish is true.
Fixes:
138524326
Test: make RunSettingsRoboTests ROBOTEST_FILTER
Change-Id: I9759e53f002afbd4c88d8d536df3bf01c343135e
(cherry picked from commit
88228c33994fe963022b950ff4affc81d4bf3021)
Android Build Merger (Role) [Fri, 6 Sep 2019 01:36:21 +0000 (01:36 +0000)]
Merge "[automerger skipped] Import translations. DO NOT MERGE am:
e2f5f9b876 -s ours am:
f85844d8e6 -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp
Bill Yi [Fri, 6 Sep 2019 01:36:05 +0000 (18:36 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
e2f5f9b876 -s ours
am:
f85844d8e6 -s ours
am skip reason: subject contains skip directive
Change-Id: I4a78368e63d392970943461484cb996bb9604167
Bill Yi [Fri, 6 Sep 2019 01:36:04 +0000 (18:36 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
e2f5f9b876 -s ours
am:
059dddf30e -s ours
am skip reason: subject contains skip directive
Change-Id: Ic2924bf0d5e799b623c62419029e2576833b79c1
Bill Yi [Fri, 6 Sep 2019 01:36:03 +0000 (18:36 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
e2f5f9b876 -s ours
am:
f85844d8e6 -s ours
am skip reason: subject contains skip directive
Change-Id: I71ccaf502f0cff035cfc533f6a1183382b79fdb2
Bill Yi [Fri, 6 Sep 2019 01:30:04 +0000 (18:30 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
e2f5f9b876 -s ours
am skip reason: subject contains skip directive
Change-Id: I0a5fec1d9bb34749d2add5aa4691007208c6b2b6
Bill Yi [Fri, 6 Sep 2019 01:30:03 +0000 (18:30 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
e2f5f9b876 -s ours
am skip reason: subject contains skip directive
Change-Id: Ib855906069bdfa6390895a92091cb28dbe9fd943
Bill Yi [Fri, 6 Sep 2019 00:10:26 +0000 (17:10 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
140445577
Change-Id: I162cbffdd4239b49c258bae8df318f7c4ebd0643
Android Build Merger (Role) [Thu, 5 Sep 2019 23:10:11 +0000 (23:10 +0000)]
Merge "Merge "Modified text to cancel enrollment" into qt-r1-dev am:
fde49ec3ad am:
cbeeed9942" into qt-qpr1-dev-plus-aosp
Joshua Mccloskey [Thu, 5 Sep 2019 23:10:02 +0000 (16:10 -0700)]
Merge "Modified text to cancel enrollment" into qt-r1-dev am:
fde49ec3ad
am:
cbeeed9942
Change-Id: Ia5e7d90e2348cb9ae30a769532f0969e632b2814
Joshua Mccloskey [Thu, 5 Sep 2019 23:10:01 +0000 (16:10 -0700)]
Merge "Modified text to cancel enrollment" into qt-r1-dev am:
fde49ec3ad
am:
820c723e59
Change-Id: Ib3f4d6c66e1cbe2dbdda9b8ae1bbf8ace74877dd
Joshua Mccloskey [Thu, 5 Sep 2019 23:10:00 +0000 (16:10 -0700)]
Merge "Modified text to cancel enrollment" into qt-r1-dev am:
fde49ec3ad
am:
cbeeed9942
Change-Id: I6a62cccc71ce78f49ab85713b162be1395f8769d
Joshua Mccloskey [Thu, 5 Sep 2019 23:00:59 +0000 (16:00 -0700)]
Merge "Modified text to cancel enrollment" into qt-r1-dev
am:
fde49ec3ad
Change-Id: I7691e528d2ceb433509558885ad8af750ddc6678
Joshua Mccloskey [Thu, 5 Sep 2019 22:59:59 +0000 (15:59 -0700)]
Merge "Modified text to cancel enrollment" into qt-r1-dev
am:
fde49ec3ad
Change-Id: I9f412f3eebda4dde2995932ad2ca2a16e2d2a82a
Joshua Mccloskey [Thu, 5 Sep 2019 22:44:12 +0000 (22:44 +0000)]
Merge "Modified text to cancel enrollment" into qt-r1-dev
Xin Li [Thu, 5 Sep 2019 21:29:14 +0000 (14:29 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am:
d7a8e234e9 -s ours am:
377369bd0d
am:
3a8baab596
Change-Id: If7ff85c16d821207f67a52224afcb7edf539d415
Xin Li [Thu, 5 Sep 2019 21:05:27 +0000 (14:05 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am:
d7a8e234e9 -s ours
am:
377369bd0d
Change-Id: Id7cae58babeb74b53bc047a2098fe05b06fbc066
Joshua Mccloskey [Thu, 5 Sep 2019 21:04:56 +0000 (14:04 -0700)]
Merge "Updated security settings string." into qt-r1-dev am:
b7ac44e643
am:
c542abdcaf
Change-Id: I710540bf4b92950876f6f39031b8b84d49bea0e8
Xin Li [Thu, 5 Sep 2019 20:32:29 +0000 (13:32 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"
am:
d7a8e234e9 -s ours
am skip reason: subject contains skip directive
Change-Id: I3a3eb2d8dfa2a3a55c55445bffa5ae5565a5ad5d
Joshua Mccloskey [Thu, 5 Sep 2019 20:31:50 +0000 (13:31 -0700)]
Merge "Updated security settings string." into qt-r1-dev am:
b7ac44e643
am:
648db67fec
Change-Id: Ie8c9b2a05d6b7ac5d02df2936eaf897fce585f3d
Joshua Mccloskey [Thu, 5 Sep 2019 20:22:56 +0000 (13:22 -0700)]
Merge "Updated security settings string." into qt-r1-dev am:
b7ac44e643
am:
648db67fec
Change-Id: Id42bb590b657ab4e3ae5164f51dcc50abb62a544
Joshua Mccloskey [Thu, 5 Sep 2019 20:17:36 +0000 (13:17 -0700)]
Merge "Updated security settings string." into qt-r1-dev
am:
b7ac44e643
Change-Id: Ife05eee951852b471138afb3f73fd4e153cc9d43
Joshua Mccloskey [Thu, 5 Sep 2019 19:50:45 +0000 (12:50 -0700)]
Merge "Updated security settings string." into qt-r1-dev
am:
b7ac44e643
Change-Id: Ib890b97401801fb5bcea20d1cd4fa284c1dec09f
joshmccloskey [Wed, 4 Sep 2019 19:44:56 +0000 (12:44 -0700)]
Modified text to cancel enrollment
Fixes:
140446388
Test: Manual.
Change-Id: If3f0affb390743cd7973957b5dea69d5e012dcb1
Joshua Mccloskey [Thu, 5 Sep 2019 19:22:29 +0000 (19:22 +0000)]
Merge "Updated security settings string." into qt-r1-dev
Xin Li [Thu, 5 Sep 2019 16:53:18 +0000 (16:53 +0000)]
Merge "DO NOT MERGE - Merge Android 10 into master"
Arc Wang [Thu, 5 Sep 2019 06:56:56 +0000 (14:56 +0800)]
[Wi-Fi] Can't change EAP method for a saved enterprise Wi-Fi network
Should only allow saved network UI initialization for once.
Bug:
140362368
Test: WifiConfigControllerTest
manual:
Manually change EAP method and other security fields for a saved
Wi-Fi neterprise network.
Change-Id: Iddc1dae53849760f43b41b75262358dff6ba09af
Merged-In: Iddc1dae53849760f43b41b75262358dff6ba09af
cosmohsieh [Thu, 5 Sep 2019 05:09:37 +0000 (13:09 +0800)]
[Network Connection] Call NetworkRequestUserSelectionCallback#reject() if user quit activity without selection
Call NetworkRequestUserSelectionCallback#reject() to notify framework that user quit this request without
selecting any network.
Bug:
138855477
Test: make RunSettingsRoboTests -j32 ROBOTEST_FILTER=com.android.settings.wifi.NetworkRequestErrorDialogFragmentTest
Change-Id: I4b06c9772598ab3f9416f32456cd0a65e2d70d68
Merged-In: I4b06c9772598ab3f9416f32456cd0a65e2d70d68
Xin Li [Wed, 4 Sep 2019 20:34:43 +0000 (13:34 -0700)]
DO NOT MERGE - Merge Android 10 into master
Bug:
139893257
Change-Id: Idcc078c0e541c04633db6d94c613ac4c861ba963
joshmccloskey [Tue, 3 Sep 2019 23:33:39 +0000 (16:33 -0700)]
Updated security settings string.
Test: Manual.
Bug:
140445577
Change-Id: Ie31132dcfcc10a8970b32c1a9bd082990560a353
Bill Yi [Mon, 2 Sep 2019 16:11:06 +0000 (09:11 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
6cf0558c80 -s ours
am skip reason: subject contains skip directive
Change-Id: I0dd23993b72e826f8bf6ac8df3542aa7fee88595
Bill Yi [Mon, 2 Sep 2019 16:10:52 +0000 (09:10 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
6cf0558c80 -s ours
am skip reason: subject contains skip directive
Change-Id: I3e4886467395d5f362668583a56336f2a3e3da3a
Bill Yi [Mon, 2 Sep 2019 06:17:12 +0000 (23:17 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ife4a90b13e0fea3568f7dd2097184b46cc542237
Android Build Merger (Role) [Sat, 31 Aug 2019 02:04:35 +0000 (02:04 +0000)]
Merge "[automerger skipped] Import translations. DO NOT MERGE am:
d595d265f0 -s ours am:
42b697c5fa -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp
Bill Yi [Sat, 31 Aug 2019 02:04:23 +0000 (19:04 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
d595d265f0 -s ours
am:
42b697c5fa -s ours
am skip reason: subject contains skip directive
Change-Id: I6c9235549213d93ed0a86b85fe9833216a459e6f
Bill Yi [Sat, 31 Aug 2019 02:04:21 +0000 (19:04 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
d595d265f0 -s ours
am:
42b697c5fa -s ours
am skip reason: subject contains skip directive
Change-Id: I672f90c2d80f4a9141a31211fe5d516a377374b6
OSDN Git Service
