Commit Graph

59408 Commits

Author SHA1 Message Date
Sarah Chin
4d59bce21b Merge "Rename calls to isGlobalModeEnabled" into rvc-dev 2020-03-02 18:11:23 +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
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
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
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
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
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
143575e128 Merge "Fix MediaSession.Token#equals()" into rvc-dev am: 18e16e416d
Change-Id: Ic4fd81e813044d707d1e3067ed6047c03a67b98c
2020-03-02 10:11:55 +00:00
TreeHugger Robot
985b1e8ffb Merge "Fix the button display problem in Dark theme page" into rvc-dev 2020-03-02 07:42:19 +00:00
Jaewan Kim
18e16e416d Merge "Fix MediaSession.Token#equals()" into rvc-dev 2020-03-02 06:28:20 +00:00
Automerger Merge Worker
06f1bd646e Merge "[Settings] Remove unused string for erease eSIM" into rvc-dev am: 1f0c0b18e4 am: 3ea368bc36
Change-Id: Ib4d88f6b283090b68c26bec80c41d83fb311a669
2020-03-02 05:14:52 +00:00
Automerger Merge Worker
3ea368bc36 Merge "[Settings] Remove unused string for erease eSIM" into rvc-dev am: 1f0c0b18e4
Change-Id: I5ca697af3382e26d3d5e981e972aba269cdad131
2020-03-02 05:04:44 +00:00
Bonian Chen
1f0c0b18e4 Merge "[Settings] Remove unused string for erease eSIM" into rvc-dev 2020-03-02 04:51:05 +00:00
Sunny Shao
1de4c009ea Fix the button display problem in Dark theme page
- Dark theme is disabled when Battery save is on.
- Let dark theme page not be searchable when Battery save is on.

Fixes: 150443799
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.display.darkmode
Change-Id: I2674499dd64333825765f70ed1f31dcb83e1b895
2020-03-02 11:59:28 +08:00
Automerger Merge Worker
1761fa1911 Merge "Append status to title for the disconnected Bluetooth device" into rvc-dev am: d09ecc3e96 am: 6b0088679f
Change-Id: I9e7c4fe582c9b6336610b87b4c7b70d9e84e3a71
2020-03-02 01:49:44 +00:00
Automerger Merge Worker
6b0088679f Merge "Append status to title for the disconnected Bluetooth device" into rvc-dev am: d09ecc3e96
Change-Id: I3cccfeaa5e5e5b1e448764a50e503ba02e094f27
2020-03-02 01:38:51 +00:00
tim peng
d09ecc3e96 Merge "Append status to title for the disconnected Bluetooth device" into rvc-dev 2020-03-02 01:25:09 +00:00
Jaewan Kim
9f9ac53fe6 Fix MediaSession.Token#equals()
This also fixes the Activity#setMediaController() which previously
ignored because the MediaSessionService failed to find session set to
the foreground activity.

Bug: 149006225
Test: Run MediaActivityTest in CtsMediaTestCases
Change-Id: I18d3097f7b20275a20b1de789be6884f843668ae
2020-03-02 02:46:44 +09:00
Automerger Merge Worker
75d5b3d477 Merge "Only show graphics driver option when the apk is available." into rvc-dev am: f302ee2aff am: 2534b7ddf8
Change-Id: If2142da51374e8195863e201d863c4542a75be07
2020-03-01 05:03:57 +00:00
Automerger Merge Worker
2534b7ddf8 Merge "Only show graphics driver option when the apk is available." into rvc-dev am: f302ee2aff
Change-Id: I8ddf41253e9e5b1b2acd3793d1671b18e6074a0f
2020-03-01 04:53:09 +00:00
TreeHugger Robot
f302ee2aff Merge "Only show graphics driver option when the apk is available." into rvc-dev 2020-03-01 04:42:02 +00:00
Automerger Merge Worker
b701190f5f Merge "Change volume panel title from "Volume" to "Sound"" into rvc-dev am: 3248376473 am: c3ab634078
Change-Id: I220ddabc30a23574d294c903922da7c269b1985a
2020-03-01 03:47:11 +00:00
Automerger Merge Worker
c3ab634078 Merge "Change volume panel title from "Volume" to "Sound"" into rvc-dev am: 3248376473
Change-Id: Ic92989a2d2a096c06d59039b6359e869855edf84
2020-03-01 03:34:09 +00:00
tim peng
3248376473 Merge "Change volume panel title from "Volume" to "Sound"" into rvc-dev 2020-03-01 03:22:29 +00:00
Bonian Chen
1b8174689d [Settings] Remove unused string for erease eSIM
Remove strings added by ag/6804404 which are no longer required by b/132114333.

Bug: 133790033
Test: build pass
Change-Id: I3ce375efd04164cf93cff2c89436e222df14bfeb
2020-03-01 01:19:44 +00:00
Automerger Merge Worker
cb914954a7 Merge "Fix notification history crash & layout" into rvc-dev am: 9229504fe2 am: 90551d0a85
Change-Id: I19ab18c1e05dc1f559351de60057e2281aa3f790
2020-02-29 05:52:30 +00:00
Automerger Merge Worker
90551d0a85 Merge "Fix notification history crash & layout" into rvc-dev am: 9229504fe2
Change-Id: Iea24224c2f7137619e7faf123914cb360283da05
2020-02-29 05:38:56 +00:00
TreeHugger Robot
9229504fe2 Merge "Fix notification history crash & layout" into rvc-dev 2020-02-29 05:23:07 +00:00
Julia Reynolds
291ee404c2 Fix notification history crash & layout
- Fix occasional crash on device boot
- No more overlapping text

Test: manual
Fixes: 150326599
Fixes: 149767075
Change-Id: I3032a2913f2ca4ce57af596c180faa819e4c9363
2020-02-28 16:16:44 -05:00
Quang Luong
834b0ade20 [WifiSettings2] Remove redundant save() call for new configs
Removing call to WifiManager#save() when configuring a new network
through tapping it in the wifi picker. Since WifiManager#connect()
already saves the passed in WifiConfiguration, the call to
WifiManager#save() is redundant.

Bug: 149579116
Test: build, manual verification by connecting to a new secure network
Change-Id: I9242e7fd7e9a459e8221b6bb491ab67833970e87
2020-02-28 12:58:36 -08:00
Automerger Merge Worker
bad7d5578b Merge "Optimize NetworkScan for only User-Enabled RANs" into rvc-dev am: f7fe2b0dec am: d858122105
Change-Id: I020c2888494297e7ff381d745a80ff8a452ea801
2020-02-28 17:11:31 +00:00
Automerger Merge Worker
d858122105 Merge "Optimize NetworkScan for only User-Enabled RANs" into rvc-dev am: f7fe2b0dec
Change-Id: I4f4f4356a2b481a18b5aeffdcd72c4f0a23658a2
2020-02-28 16:56:34 +00:00
Sarah Chin
f7fe2b0dec Merge "Optimize NetworkScan for only User-Enabled RANs" into rvc-dev 2020-02-28 16:48:41 +00:00
Automerger Merge Worker
c311369f40 Merge "[Wi-Fi] Ignore incorrect user certificates" into rvc-dev am: fc2939ddd1 am: 54575ffdfa
Change-Id: Id380c299d304da18a1be5678529b62b9fe32f674
2020-02-28 16:34:23 +00:00
Automerger Merge Worker
54575ffdfa Merge "[Wi-Fi] Ignore incorrect user certificates" into rvc-dev am: fc2939ddd1
Change-Id: I689d269de3bbc9e96f6999721d99a1b6986b8dfb
2020-02-28 16:22:28 +00:00
TreeHugger Robot
fc2939ddd1 Merge "[Wi-Fi] Ignore incorrect user certificates" into rvc-dev 2020-02-28 16:14:33 +00:00
Automerger Merge Worker
e86b816046 Merge "[Wi-Fi] Set Wi-Fi Privacy option at the last one position" into rvc-dev am: c2153e244b am: 9f61f4e415
Change-Id: Id80601383e934bc6f8f4ad5991f5272fdf4f65c9
2020-02-28 15:48:24 +00:00
Automerger Merge Worker
c3b12f302b Merge "Use AppOpsManager#setUidMode instead of #setMode" into rvc-dev am: 3071821207 am: d5e10793e5
Change-Id: I37e25bf184114eef9367c1a2844cbf6a7632ef01
2020-02-28 15:48:01 +00:00
Automerger Merge Worker
9f61f4e415 Merge "[Wi-Fi] Set Wi-Fi Privacy option at the last one position" into rvc-dev am: c2153e244b
Change-Id: I6963808bde5c96e4ee93ef72de3135409a7947d2
2020-02-28 15:46:30 +00:00
Automerger Merge Worker
d5e10793e5 Merge "Use AppOpsManager#setUidMode instead of #setMode" into rvc-dev am: 3071821207
Change-Id: I0f96de0f766c0eccfd55e0b4ed3a5341be8884f9
2020-02-28 15:34:12 +00:00
TreeHugger Robot
c2153e244b Merge "[Wi-Fi] Set Wi-Fi Privacy option at the last one position" into rvc-dev 2020-02-28 15:33:44 +00:00
Shafik Nassar
3071821207 Merge "Use AppOpsManager#setUidMode instead of #setMode" into rvc-dev 2020-02-28 15:30:58 +00:00
Automerger Merge Worker
20e3b25292 [automerger skipped] Merge "[Wi-Fi] Force users to select a phase2 authentication for PEAP & TTLS" into qt-qpr1-dev am: 594a5c71f5 -s ours am: fe066eab8d -s ours am: 7c636e673c -s ours
am skip reason: Change-Id I0cb1ceda6d89a52224f80ea5ffd1af709a6acace with SHA-1 41661fe69c is in history

Change-Id: I0937aa22f16d1356f89ca1f2b2d3d54d250da594
2020-02-28 06:54:10 +00:00
Automerger Merge Worker
7c636e673c [automerger skipped] Merge "[Wi-Fi] Force users to select a phase2 authentication for PEAP & TTLS" into qt-qpr1-dev am: 594a5c71f5 -s ours am: fe066eab8d -s ours
am skip reason: Change-Id I0cb1ceda6d89a52224f80ea5ffd1af709a6acace with SHA-1 41661fe69c is in history

Change-Id: I9496cc3e9dcf882a3f24dea801163e81a7100f9b
2020-02-28 06:28:16 +00:00
Automerger Merge Worker
fe066eab8d [automerger skipped] Merge "[Wi-Fi] Force users to select a phase2 authentication for PEAP & TTLS" into qt-qpr1-dev am: 594a5c71f5 -s ours
am skip reason: Change-Id I0cb1ceda6d89a52224f80ea5ffd1af709a6acace with SHA-1 41661fe69c is in history

Change-Id: Ie5c75f89bb59471650fbc4dbabfc85cf8f64b45e
2020-02-28 06:16:47 +00:00
TreeHugger Robot
594a5c71f5 Merge "[Wi-Fi] Force users to select a phase2 authentication for PEAP & TTLS" into qt-qpr1-dev 2020-02-28 06:04:46 +00:00
Peiyong Lin
fc4155a02c Only show graphics driver option when the apk is available.
Previously we always show all options, this patch makes the dashboard
only shows the option when the driver apk is available.

Bug: b/148626177
Test: make RunSettingsRoboTests ROBOTEST_FILTER=GraphicsDriver
Change-Id: Ifde5929d826d5ab542e855aa334546dd744b138b
2020-02-28 03:34:02 +00:00
Automerger Merge Worker
3542ce579c Merge "[Wi-Fi] Fix hint text color contrast problem in 'Add networks'" into rvc-dev am: dc4f004cc9 am: ed20d772f1
Change-Id: I12634ec0b9ef0bce1b4491820b9f6c3ffaa2648e
2020-02-28 01:47:40 +00:00