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
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
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
Automerger Merge Worker
83c6fd40cc
Merge "[Wi-Fi] Fix hint text color contrast problem in 'Add networks'" into rvc-dev am: dc4f004cc9
...
Change-Id: Ia2925a46fb9f077a388b5ffe1e40f199aab3cb5f
2020-02-28 01:35:49 +00:00
Automerger Merge Worker
ed20d772f1
Merge "[Wi-Fi] Fix hint text color contrast problem in 'Add networks'" into rvc-dev am: dc4f004cc9
...
Change-Id: I96b3526fe5e7625c88d2f2d6ba48c9617032fd49
2020-02-28 01:35:36 +00:00
Automerger Merge Worker
47e84d67a9
Merge "[Wi-Fi] Fix data usage screen flash 1~2 times problem" into rvc-dev am: 51b06031e8
...
Change-Id: I7d2a5b99b74784c9464f6722ffd4b023c337b1d8
2020-02-28 01:35:32 +00:00
Automerger Merge Worker
763c41ca36
Merge "[Wi-Fi] Fix data usage screen flash 1~2 times problem" into rvc-dev am: 51b06031e8
...
Change-Id: I06f10f54f84c58071694666a63e3e40dfb8f1ca9
2020-02-28 01:35:30 +00:00
TreeHugger Robot
dc4f004cc9
Merge "[Wi-Fi] Fix hint text color contrast problem in 'Add networks'" into rvc-dev
2020-02-28 01:31:08 +00:00
TreeHugger Robot
51b06031e8
Merge "[Wi-Fi] Fix data usage screen flash 1~2 times problem" into rvc-dev
2020-02-28 01:28:23 +00:00
Automerger Merge Worker
e08c48dc07
Merge "Support updated rendering of conversation icons." into rvc-dev am: c1f6891ef3 am: cafa42b471
...
Change-Id: I44de7c62b4b20437e27c25b9875319790ccebec2
2020-02-28 00:36:07 +00:00
Automerger Merge Worker
7761f504ec
Merge "Support updated rendering of conversation icons." into rvc-dev am: c1f6891ef3 am: eb036399eb
...
Change-Id: I8470280421e805d398236550a668afa5829c18d6
2020-02-28 00:34:28 +00:00
Automerger Merge Worker
cafa42b471
Merge "Support updated rendering of conversation icons." into rvc-dev am: c1f6891ef3
...
Change-Id: Idc5e7757dcfc019be48b268f8730541f9cd8706e
2020-02-28 00:27:15 +00:00
Automerger Merge Worker
eb036399eb
Merge "Support updated rendering of conversation icons." into rvc-dev am: c1f6891ef3
...
Change-Id: I1c94629f0d01ada4c0a6444ab11aa685a7414f4b
2020-02-28 00:26:23 +00:00
Daniel Sandler
c1f6891ef3
Merge "Support updated rendering of conversation icons." into rvc-dev
2020-02-28 00:26:10 +00:00
Nathan Harold
b10babebd0
Optimize NetworkScan for only User-Enabled RANs
...
Network scans comprise multiple different access
technologies, and scanning each of those techs can
be very time consuming. Worse, depending on a user's
settings, the device may only be allowed to connect
to 2G, 2G+3G, or 2G+3G+4G networks. If a scan finds
network types that a user can't connect to, it also
creates a poor user experience if a user tries to
select those network types.
This CL restricts the scans to only find and return
results that a user can select based on the other
user settings.
Bug: 128572818
Test: manual (crosshatch) - set allowed networks to
2G+3G and verify that LTE networks are not returned.
Set allowed networks to 2G+3G+4G and verify that LTE
networks are returned.
Merged-In: Ic855100723b8604c1e872457a70fd8f25d225278
Change-Id: Ic855100723b8604c1e872457a70fd8f25d225278
(cherry picked from commit bda277b3b6 )
2020-02-27 16:10:19 -08:00
Xin Li
28f9734a4a
Skip QQ2A.200113.001 in stage-aosp-master
...
Bug: 146167222
Change-Id: I28eeb421d0e76d44f825436d0e4a61badd7e866d
2020-02-27 15:36:13 -08:00
Automerger Merge Worker
bbab2a3873
Merge "Unhide work profile icon" into rvc-dev am: 7b9101e6a8 am: 52be7605c1
...
Change-Id: I1e26b6f490b721c7f6926cf5a0b3888a38223597
2020-02-27 21:50:12 +00:00
Automerger Merge Worker
32ab3a1853
Merge "Unhide work profile icon" into rvc-dev am: 7b9101e6a8 am: 4d3c4518e0
...
Change-Id: Ib8df9d0b2ed001e302ddd22229f1de0f88ff06eb
2020-02-27 21:47:25 +00:00
Automerger Merge Worker
4d3c4518e0
Merge "Unhide work profile icon" into rvc-dev am: 7b9101e6a8
...
Change-Id: Iebe5c8a425ac02ed99ea8fd468e870cdf6ddac19
2020-02-27 21:34:45 +00:00
Automerger Merge Worker
52be7605c1
Merge "Unhide work profile icon" into rvc-dev am: 7b9101e6a8
...
Change-Id: I76f743fcdd60e45fd5fc8084d86efd8005c33dbc
2020-02-27 21:34:25 +00:00
Julia Reynolds
7b9101e6a8
Merge "Unhide work profile icon" into rvc-dev
2020-02-27 21:27:08 +00:00
Julia Reynolds
323e9315d3
Unhide work profile icon
...
Test: Manual, dismiss work profile notif, look at history
Fixes: 150361222
Change-Id: I7bf17b400f084f5e1a0763c2b6d1ebe69c78b9c2
2020-02-27 11:12:46 -05:00