Automerger Merge Worker
d9a9b26030
Merge "Change volume panel title from "Volume" to "Sound"" into rvc-dev am: 3248376473
am: 88416ffaf6
...
Change-Id: I1069a7a2e62c78b98c50f9e6b8eda5dca301b635
2020-03-01 03:47:12 +00:00
Automerger Merge Worker
0c31cb3f6d
Merge "Change volume panel title from "Volume" to "Sound"" into rvc-dev am: 3248376473
am: c3ab634078
...
Change-Id: Ic82d692d4cd8ba491d04e1857705f990e512adc5
2020-03-01 03:47:08 +00:00
Automerger Merge Worker
88416ffaf6
Merge "Change volume panel title from "Volume" to "Sound"" into rvc-dev am: 3248376473
...
Change-Id: Ie864fbbc9631721b9f9fe4259cb13651dd135926
2020-03-01 03:34:25 +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
Bonian Chen
2de00e766d
[Settings] NullPointerException when disable eSIM/Fi
...
When disabling eSIM/Fi, CarrierConfig retrieved on that subscription
becomes null and need to perform null pointer checking when accessing
it.
Bug: 149484288
Test: manual
Change-Id: If8a206788407a65c2cb9e5bafe3bc89b93cf63fe
2020-03-01 01:15:06 +00:00
Automerger Merge Worker
9a3a819ec5
Merge "Fix notification history crash & layout" into rvc-dev am: 9229504fe2
am: 91f7309d5d
...
Change-Id: I07df3083ac3d41892219c3aedfdc361ecff4be0b
2020-02-29 05:52:31 +00:00
Automerger Merge Worker
93ae61af3e
Merge "Fix notification history crash & layout" into rvc-dev am: 9229504fe2
am: 90551d0a85
...
Change-Id: I22933fd2237bd866d8960c75b2a874401b71ffd2
2020-02-29 05:52:23 +00:00
Automerger Merge Worker
91f7309d5d
Merge "Fix notification history crash & layout" into rvc-dev am: 9229504fe2
...
Change-Id: I7da82152579dd6934937881fecb28ea056fd5937
2020-02-29 05:39:01 +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
Automerger Merge Worker
72fb16ae89
[automerger skipped] DO NOT MERGE - Skip QQ2A.200305.003 in stage-aosp-master am: 9fe7d6c59b
-s ours am: bf69895603
...
Change-Id: I3eb7c7c5d4dd76991fdc8a098ae441b69b30f3b3
2020-02-29 04:35:48 +00:00
Automerger Merge Worker
bf69895603
[automerger skipped] DO NOT MERGE - Skip QQ2A.200305.003 in stage-aosp-master am: 9fe7d6c59b
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I5c3fb50f656ded58064ae0e18424ea9f9b0ba429
2020-02-29 04:20:58 +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
b60e1c38fe
[automerger skipped] Merge "Optimize NetworkScan for only User-Enabled RANs" into rvc-dev am: f7fe2b0dec
am: 47efc875da
-s ours
...
am skip reason: Change-Id Ic855100723b8604c1e872457a70fd8f25d225278 with SHA-1 b10babebd0
is in history
Change-Id: I60cc7ebaa0aeb133bc5d6d0c2f5d492f2b4efed7
2020-02-28 17:11:52 +00:00
Automerger Merge Worker
857753c2bc
Merge "Optimize NetworkScan for only User-Enabled RANs" into rvc-dev am: f7fe2b0dec
am: d858122105
...
Change-Id: Ida95e5c4508b65ad2dee5478c5be4902024c9e0a
2020-02-28 17:11:24 +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
Automerger Merge Worker
47efc875da
Merge "Optimize NetworkScan for only User-Enabled RANs" into rvc-dev am: f7fe2b0dec
...
Change-Id: Iead26d883a75dc45269a9f060ea74a6b8aae3084
2020-02-28 16:55:59 +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
4b2be4b738
Merge "[Wi-Fi] Ignore incorrect user certificates" into rvc-dev am: fc2939ddd1
am: 31899646f8
...
Change-Id: I6b4e151327f47c1330ca07661d3916b5dd7c3ed2
2020-02-28 16:34:11 +00:00
Automerger Merge Worker
6550b96794
Merge "[Wi-Fi] Ignore incorrect user certificates" into rvc-dev am: fc2939ddd1
am: 54575ffdfa
...
Change-Id: I2ca3f522a7db1bdd7fd8dab74c378123b8d9a2a3
2020-02-28 16:33:47 +00:00
Automerger Merge Worker
31899646f8
Merge "[Wi-Fi] Ignore incorrect user certificates" into rvc-dev am: fc2939ddd1
...
Change-Id: Ia318c314d726f84aea16427b50ffb2f569ad44ef
2020-02-28 16:22:49 +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
4f17dfd7fe
Merge "[Wi-Fi] Set Wi-Fi Privacy option at the last one position" into rvc-dev am: c2153e244b
am: 767b00a6e8
...
Change-Id: I650958bec0356363f924a14f6737ed4f7ca17a3a
2020-02-28 15:48:22 +00:00
Automerger Merge Worker
e467048b39
Merge "[Wi-Fi] Set Wi-Fi Privacy option at the last one position" into rvc-dev am: c2153e244b
am: 9f61f4e415
...
Change-Id: I6e26ff60aab87f0a485658ffd4dac09031c4b290
2020-02-28 15:47:43 +00:00
Automerger Merge Worker
5889d406c6
Merge "Merge "Use AppOpsManager#setUidMode instead of #setMode" into rvc-dev am: 3071821207
am: 48823ea702" into rvc-d1-dev-plus-aosp
2020-02-28 15:47:34 +00:00
Automerger Merge Worker
051020fc6a
Merge "Use AppOpsManager#setUidMode instead of #setMode" into rvc-dev am: 3071821207
am: d5e10793e5
...
Change-Id: I5572ed5f43e0e57fae7ba03694c149ca11a1669d
2020-02-28 15:47:29 +00:00
Automerger Merge Worker
537cc9305a
Merge "Use AppOpsManager#setUidMode instead of #setMode" into rvc-dev am: 3071821207
am: 48823ea702
...
Change-Id: Ief44a3be5a082f5a22db39549770a436e50a25f2
2020-02-28 15:47:29 +00:00
Automerger Merge Worker
767b00a6e8
Merge "[Wi-Fi] Set Wi-Fi Privacy option at the last one position" into rvc-dev am: c2153e244b
...
Change-Id: Ie36ad2199d53acaf7beb9ccbfdee374c1676c391
2020-02-28 15:46:31 +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
48823ea702
Merge "Use AppOpsManager#setUidMode instead of #setMode" into rvc-dev am: 3071821207
...
Change-Id: Ie244a4c73d7724acb84f6e77f6609d2d9f2d665f
2020-02-28 15:34:24 +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
770505603c
[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: 50637d69b9
-s ours
...
am skip reason: Change-Id I0cb1ceda6d89a52224f80ea5ffd1af709a6acace with SHA-1 41661fe69c
is in history
Change-Id: I72a83cfed306af7a342cd973655c78e3936a2ad1
2020-02-28 06:54:13 +00:00
Automerger Merge Worker
c0561a1dba
[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: I184ba667190e3e053315097daf56abd61f529dde
2020-02-28 06:53:52 +00:00
Automerger Merge Worker
50637d69b9
[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: I0e6d4e125ff32fc9afb1fb46ee279a5aee7a3ce2
2020-02-28 06:28:30 +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
d7b5b5a190
Skip QQ2A.200113.001 in stage-aosp-master am: 28f9734a4a
am: bcd758f57f
...
Change-Id: I6e12f7e8e954b54b328dd2eb20a989ea690154a6
2020-02-28 06:23:00 +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
Automerger Merge Worker
bcd758f57f
Skip QQ2A.200113.001 in stage-aosp-master am: 28f9734a4a
...
Change-Id: Icd30b28c72ab2495737ecd91373ed4b25f1a63aa
2020-02-28 06:10:26 +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
7e5ad900da
Merge "[Wi-Fi] Fix hint text color contrast problem in 'Add networks'" into rvc-dev am: dc4f004cc9
am: 83c6fd40cc
...
Change-Id: I6b19425c69aa6c6939328b8f8386cb8bde0b6bd9
2020-02-28 01:47:45 +00:00
Automerger Merge Worker
756ccff52e
Merge "[Wi-Fi] Fix data usage screen flash 1~2 times problem" into rvc-dev am: 51b06031e8
am: 47e84d67a9
...
Change-Id: I44bdc18cb1dd71215d3ab113d8afb3a23ad9c066
2020-02-28 01:47:37 +00:00
Automerger Merge Worker
4712b73b69
Merge "[Wi-Fi] Fix hint text color contrast problem in 'Add networks'" into rvc-dev am: dc4f004cc9
am: ed20d772f1
...
Change-Id: I115c5148550cea56557affe0a1635f8dd58e203d
2020-02-28 01:47:22 +00:00
Automerger Merge Worker
d33d2ba23b
Merge "[Wi-Fi] Fix data usage screen flash 1~2 times problem" into rvc-dev am: 51b06031e8
am: 763c41ca36
...
Change-Id: I3b87dd47f3ed334bb03b06221c8128d015180d15
2020-02-28 01:47:14 +00:00