Automerger Merge Worker
10a9293134
Merge "Merge "[WifiSettings2] Remove redundant save() call for new configs" into rvc-dev am: 4a76598ba5 am: 300909e22c am: a98440f340" into rvc-qpr-dev-plus-aosp
2020-03-02 14:32:53 +00:00
Automerger Merge Worker
31469683f6
Merge "[WifiSettings2] Remove redundant save() call for new configs" into rvc-dev am: 4a76598ba5 am: 300909e22c am: a98440f340
...
Change-Id: I8f0bf84d3aa12338a4297a4c79e44dfe8aaaf282
2020-03-02 14:32:49 +00:00
Automerger Merge Worker
4927d9d7f3
Merge "Merge "[WifiSettings2] Remove redundant save() call for new configs" into rvc-dev am: 4a76598ba5 am: 8de6fc23f2" into rvc-d1-dev-plus-aosp am: 1b5264cf5f
...
Change-Id: Iaa521b0d0b0679ab227cfa5685565eb68a298898
2020-03-02 14:32:45 +00:00
Automerger Merge Worker
cdfc2b1f4d
Merge "[WifiSettings2] Remove redundant save() call for new configs" into rvc-dev am: 4a76598ba5 am: 300909e22c am: 95a522b46f
...
Change-Id: I2200fd8516a4f8166d28fc29ca3ccb9565c4132e
2020-03-02 14:32:35 +00:00
Arc Wang
9e46a0bc93
[Wi-Fi] Ignore incorrect user certificates
...
These incorrect user certificates displayed when users
editing a Wi-Fi network of WPA3-Enterprise in 192bit.
Bug: 149763958
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigControllerTest
Change-Id: Idcbc80aa3e945f83ba6b77ebf9ef443398ef8e3c
Merged-In: Iab35ac975933abc54fda83b99a2109d53d6722d4
2020-03-02 22:28:46 +08:00
Automerger Merge Worker
1b5264cf5f
Merge "Merge "[WifiSettings2] Remove redundant save() call for new configs" into rvc-dev am: 4a76598ba5 am: 8de6fc23f2" into rvc-d1-dev-plus-aosp
2020-03-02 14:21:12 +00:00
Automerger Merge Worker
a98440f340
Merge "[WifiSettings2] Remove redundant save() call for new configs" into rvc-dev am: 4a76598ba5 am: 300909e22c
...
Change-Id: I4c3acec257871bf056d42fdb7adccd59472a9688
2020-03-02 14:21:08 +00:00
Automerger Merge Worker
a13d2069e0
Merge "[WifiSettings2] Remove redundant save() call for new configs" into rvc-dev am: 4a76598ba5 am: 8de6fc23f2
...
Change-Id: I90ff92c278d433650c47e41893073237c3cac263
2020-03-02 14:21:05 +00:00
Automerger Merge Worker
95a522b46f
Merge "[WifiSettings2] Remove redundant save() call for new configs" into rvc-dev am: 4a76598ba5 am: 300909e22c
...
Change-Id: Id3ecdebf02151d7c46b6bf5e2e3ded924881bb26
2020-03-02 14:20:58 +00:00
Automerger Merge Worker
8de6fc23f2
Merge "[WifiSettings2] Remove redundant save() call for new configs" into rvc-dev am: 4a76598ba5
...
Change-Id: Idddc73ccfd806168f29b7bb30459686740cd7b60
2020-03-02 14:08:35 +00:00
Automerger Merge Worker
300909e22c
Merge "[WifiSettings2] Remove redundant save() call for new configs" into rvc-dev am: 4a76598ba5
...
Change-Id: I36d2ba74ca0e28c8bc696ca2a9d09f59f045f3f8
2020-03-02 14:08:33 +00:00
TreeHugger Robot
4a76598ba5
Merge "[WifiSettings2] Remove redundant save() call for new configs" into rvc-dev
2020-03-02 13:56:51 +00:00
Automerger Merge Worker
e77673594d
Merge "Fix NPE in PanelFragment" am: 06cafcd733 am: 98e3ed4e5d am: 6ad23a342d am: 9b798aa738 am: 2b481a5969
...
Change-Id: Ic082a4f9aa65114eec606edb77c3c7bb8e2be8e8
2020-03-02 12:35:57 +00:00
Automerger Merge Worker
2b481a5969
Merge "Fix NPE in PanelFragment" am: 06cafcd733 am: 98e3ed4e5d am: 6ad23a342d am: 9b798aa738
...
Change-Id: Ib814aa115d5fe159726ef676092b88a681d6c45a
2020-03-02 12:26:47 +00:00
Automerger Merge Worker
9b798aa738
Merge "Fix NPE in PanelFragment" am: 06cafcd733 am: 98e3ed4e5d am: 6ad23a342d
...
Change-Id: I9b7146a9409ead2395d9abee3aba3416158639a6
2020-03-02 12:07:12 +00:00
Alex Johnston
051c3ecaa3
Add policy transparency dialog to 'Remove work profile'
...
* In New COPE mode, no explanation was being shown to the
user as to why the work profile cannot be removed.
* This CL adds a policy transparency dialog when the
'Remove work profile' preference is selected.
* This was done by modifying AccountRestrictionHelper to
set the preference to disabled by admin if the device is
in New COPE mode and the base restriction
DISALLOW_REMOVE_MANAGED_PROFILE is enforced.
Bug: 149391073
Test: Manual testing
Change-Id: Iec0f57b988e1d4fd08bca040abd1bb30b6991507
Merged-In: Iec0f57b988e1d4fd08bca040abd1bb30b6991507
(cherry picked from commit 56e8278498
2020-03-02 12:05:22 +00:00
Automerger Merge Worker
6ad23a342d
Merge "Fix NPE in PanelFragment" am: 06cafcd733 am: 98e3ed4e5d
...
Change-Id: I710a54c16476313e83bf8ee9c12c0712a184c65c
2020-03-02 11:52:50 +00:00
Automerger Merge Worker
98e3ed4e5d
Merge "Fix NPE in PanelFragment" am: 06cafcd733
...
Change-Id: Ia08ab086c610de141b4cadd2ae097b596351e46e
2020-03-02 11:37:36 +00:00
Treehugger Robot
06cafcd733
Merge "Fix NPE in PanelFragment"
2020-03-02 11:21:05 +00:00
Automerger Merge Worker
b4909b5f21
Merge "Fix the button display problem in Dark theme page" into rvc-dev am: 985b1e8ffb am: 5962711f8f am: 8023599c8d am: 20f76a8e72
...
Change-Id: I9762058e95c97b20ba6cb4955998b81e7fc011cb
2020-03-02 10:44:49 +00:00
Automerger Merge Worker
3cf34d6fcc
Merge "Fix MediaSession.Token#equals()" into rvc-dev am: 18e16e416d am: 143575e128 am: ea0ff4fe06 am: 29d518f316
...
Change-Id: I03849fd21d845881c2e8c4529b81835c3a15c0af
2020-03-02 10:44:30 +00:00
Automerger Merge Worker
b272edb4a1
Merge "Fix for User edit info dialog during rotation" am: c6603dfda8 am: 7cda6b423a am: 454dbfd402 am: 1104b5e6b9 am: 33ae9e0ed1
...
Change-Id: If9bae6eb1c9f924a63d41f7310f0377c4681ce41
2020-03-02 10:44:17 +00:00
Automerger Merge Worker
20f76a8e72
Merge "Fix the button display problem in Dark theme page" into rvc-dev am: 985b1e8ffb am: 5962711f8f am: 8023599c8d
...
Change-Id: I268680230559b0b936839ba6e902c08dbf63d7d4
2020-03-02 10:43:53 +00:00
Automerger Merge Worker
d69164c5a7
Merge "Fix the button display problem in Dark theme page" into rvc-dev am: 985b1e8ffb am: 5962711f8f am: 26953558d9 am: eb6d6edadb
...
Change-Id: I6415793ddc76c9508c18046d80a2e05963740a10
2020-03-02 10:43:50 +00:00
Automerger Merge Worker
f21c44abe8
Merge "Fix the button display problem in Dark theme page" into rvc-dev am: 985b1e8ffb am: 3248e62e0d am: 86513a62cb am: ef73a232b4
...
Change-Id: I20070f776f50c91c17bc9db81b75e0e4cc8c7a5e
2020-03-02 10:43:27 +00:00
Automerger Merge Worker
82782904d6
Merge "Fix MediaSession.Token#equals()" into rvc-dev am: 18e16e416d am: 143575e128 am: 315fb9d172 am: 8e0e86cfb3
...
Change-Id: I57afc4a65dc2793eb45b6152aec2011600dec359
2020-03-02 10:43:17 +00:00
Automerger Merge Worker
48cc5cab8f
Merge "Fix MediaSession.Token#equals()" into rvc-dev am: 18e16e416d am: 572b728a87 am: ae4e86c4db am: 48f99cf65b
...
Change-Id: Id0bd07840102b959e280844fc214a90c43cd8cfd
2020-03-02 10:42:18 +00:00
Automerger Merge Worker
29d518f316
Merge "Fix MediaSession.Token#equals()" into rvc-dev am: 18e16e416d am: 143575e128 am: ea0ff4fe06
...
Change-Id: Ide561c44f6490c5d76a330d86387a59e0021cdeb
2020-03-02 10:42:13 +00:00
Automerger Merge Worker
33ae9e0ed1
Merge "Fix for User edit info dialog during rotation" am: c6603dfda8 am: 7cda6b423a am: 454dbfd402 am: 1104b5e6b9
...
Change-Id: Ie43b9b77791ccd51af73df9b396938512e4933a8
2020-03-02 10:42:01 +00:00
Automerger Merge Worker
1104b5e6b9
Merge "Fix for User edit info dialog during rotation" am: c6603dfda8 am: 7cda6b423a am: 454dbfd402
...
Change-Id: Ib10b10fe8b1199c07bb780fec12be9fa74566e60
2020-03-02 10:33:48 +00:00
Automerger Merge Worker
eb6d6edadb
Merge "Fix the button display problem in Dark theme page" into rvc-dev am: 985b1e8ffb am: 5962711f8f am: 26953558d9
...
Change-Id: I796caa927be4dd29dbb663201fef66a3ed462c19
2020-03-02 10:33:30 +00:00
Automerger Merge Worker
ef73a232b4
Merge "Fix the button display problem in Dark theme page" into rvc-dev am: 985b1e8ffb am: 3248e62e0d am: 86513a62cb
...
Change-Id: I2b948ab21a65058a8e3c5fa042d44bfa0ee1c9e0
2020-03-02 10:33:13 +00:00
Automerger Merge Worker
26953558d9
Merge "Fix the button display problem in Dark theme page" into rvc-dev am: 985b1e8ffb am: 5962711f8f
...
Change-Id: I622b1f56afd574bf3d280299da9cd3c253798c2a
2020-03-02 10:28:39 +00:00
Automerger Merge Worker
454dbfd402
Merge "Fix for User edit info dialog during rotation" am: c6603dfda8 am: 7cda6b423a
...
Change-Id: Ia6a3ca26dd3b2fdfce8df0cb21b24927fcb07bcb
2020-03-02 10:27:50 +00:00
Automerger Merge Worker
86513a62cb
Merge "Fix the button display problem in Dark theme page" into rvc-dev am: 985b1e8ffb am: 3248e62e0d
...
Change-Id: I2ad0df1265c331a9bde63e8db069395f11a42b1e
2020-03-02 10:27:17 +00:00
Automerger Merge Worker
8e0e86cfb3
Merge "Fix MediaSession.Token#equals()" into rvc-dev am: 18e16e416d am: 143575e128 am: 315fb9d172
...
Change-Id: I16b7c483b8266f2aeb28609be48a69055f7b5299
2020-03-02 10:27:05 +00:00
Automerger Merge Worker
8023599c8d
Merge "Fix the button display problem in Dark theme page" into rvc-dev am: 985b1e8ffb am: 5962711f8f
...
Change-Id: Ie0c432a3f5fa44812f90cd21278d4861dadedc0d
2020-03-02 10:26:57 +00:00
Automerger Merge Worker
ea0ff4fe06
Merge "Fix MediaSession.Token#equals()" into rvc-dev am: 18e16e416d am: 143575e128
...
Change-Id: I7b1cb006ec1cad2e5a1e5a315eab8cfe37199827
2020-03-02 10:26:41 +00:00
Automerger Merge Worker
48f99cf65b
Merge "Fix MediaSession.Token#equals()" into rvc-dev am: 18e16e416d am: 572b728a87 am: ae4e86c4db
...
Change-Id: I150aec8290c1e0681b996dc92b38b9169742caad
2020-03-02 10:26:39 +00:00
Automerger Merge Worker
315fb9d172
Merge "Fix MediaSession.Token#equals()" into rvc-dev am: 18e16e416d am: 143575e128
...
Change-Id: Iee2a8a55feea913e0e76bb9057bbcd89fc35e892
2020-03-02 10:26:24 +00:00
Automerger Merge Worker
ae4e86c4db
Merge "Fix MediaSession.Token#equals()" into rvc-dev am: 18e16e416d am: 572b728a87
...
Change-Id: Iec0bc80c3f2bb4a974a394b5cf4dc2ecfadc918f
2020-03-02 10:21:18 +00:00
Automerger Merge Worker
5962711f8f
Merge "Fix the button display problem in Dark theme page" into rvc-dev am: 985b1e8ffb
...
Change-Id: I5c7a85ba47eb9f069341946957cedbcf084457f0
2020-03-02 10:13:13 +00:00
Automerger Merge Worker
3248e62e0d
Merge "Fix the button display problem in Dark theme page" into rvc-dev am: 985b1e8ffb
...
Change-Id: I339fc21bfa9ecf76e5f0088127bad900df3bb76f
2020-03-02 10:12:45 +00:00
Automerger Merge Worker
572b728a87
Merge "Fix MediaSession.Token#equals()" into rvc-dev am: 18e16e416d
...
Change-Id: I12e169a2271b1c9f10b258bf720f23eeeaf968d4
2020-03-02 10:12:02 +00:00
Automerger Merge Worker
bba607b3d2
Merge "[Settings] Remove unused string for erease eSIM" into rvc-dev am: 1f0c0b18e4 am: 3ea368bc36 am: 06f1bd646e am: 6ee2833a49
...
Change-Id: I59a9acd224b98791c4cdcbe71353fa54e16dbe8e
2020-03-02 10:11:58 +00:00
Automerger Merge Worker
143575e128
Merge "Fix MediaSession.Token#equals()" into rvc-dev am: 18e16e416d
...
Change-Id: Ic4fd81e813044d707d1e3067ed6047c03a67b98c
2020-03-02 10:11:55 +00:00
Automerger Merge Worker
b6d058bc34
Merge "[Settings] Remove unused string for erease eSIM" into rvc-dev am: 1f0c0b18e4 am: 4e9ab8a65b am: f3226a5b25 am: 26426c8d14
...
Change-Id: I046fe33452e85e5ca1297e872857838d45eda9d2
2020-03-02 10:11:53 +00:00
Automerger Merge Worker
7cda6b423a
Merge "Fix for User edit info dialog during rotation" am: c6603dfda8
...
Change-Id: I4f5a29975aed084e1080387d6eb4500121c23ee0
2020-03-02 10:11:44 +00:00
Automerger Merge Worker
b25813149a
Merge "[Settings] Remove unused string for erease eSIM" into rvc-dev am: 1f0c0b18e4 am: 3ea368bc36 am: afdfab09f5 am: 0dc3ce9d55
...
Change-Id: I987f41f80fee2b72bd67db9289aeceef7cac32fa
2020-03-02 10:11:44 +00:00
Treehugger Robot
c6603dfda8
Merge "Fix for User edit info dialog during rotation"
2020-03-02 07:45:36 +00:00
