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
2020-02-28 06:53:52 +00:00
Automerger Merge Worker
5c5e0c892f
Skip QQ2A.200113.001 in stage-aosp-master am: 28f9734a4a am: bcd758f57f am: d7b5b5a190
...
Change-Id: I3ce8894270c86e0133ff5d029096e315a8524380
2020-02-28 06:45:50 +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
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
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
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
06867fc11a
Merge "[Wi-Fi] Fix hint text color contrast problem in 'Add networks'" into rvc-dev am: dc4f004cc9 am: ed20d772f1 am: 3542ce579c am: 05f2b4b1fc
...
Change-Id: Iaba237207334a9898a46c07dcad6f61c0e7626a6
2020-02-28 02:28:25 +00:00
Automerger Merge Worker
be873287e2
Merge "[Wi-Fi] Fix hint text color contrast problem in 'Add networks'" into rvc-dev am: dc4f004cc9 am: 83c6fd40cc am: 7e5ad900da am: 67792e2a8c
...
Change-Id: I464a557f4485f9792b8a80d9c6cfd21796ab6ad4
2020-02-28 02:28:17 +00:00
Automerger Merge Worker
0ed408cb9e
Merge "[Wi-Fi] Fix data usage screen flash 1~2 times problem" into rvc-dev am: 51b06031e8 am: 47e84d67a9 am: 756ccff52e am: 6a2723d3d5
...
Change-Id: Ia2a983fc181de4a42c391405cf85e09ae9052512
2020-02-28 02:28:10 +00:00
Automerger Merge Worker
148bd0df7f
Merge "Merge "[Wi-Fi] Fix data usage screen flash 1~2 times problem" into rvc-dev am: 51b06031e8 am: 763c41ca36 am: 06c880fff2" into rvc-qpr-dev-plus-aosp am: bf5ab39101
...
Change-Id: I8ee468d805f8d8daa7eb554fda2325029312cfad
2020-02-28 02:27:51 +00:00
Automerger Merge Worker
7013c4423d
Merge "[Wi-Fi] Fix hint text color contrast problem in 'Add networks'" into rvc-dev am: dc4f004cc9 am: ed20d772f1 am: 4712b73b69 am: c6df99a6ba
...
Change-Id: I62d4339a0ad20ca0a2dd4571741fee658149b751
2020-02-28 02:27:33 +00:00
Automerger Merge Worker
59b58f6eb4
Merge "[Wi-Fi] Fix data usage screen flash 1~2 times problem" into rvc-dev am: 51b06031e8 am: 763c41ca36 am: d33d2ba23b am: 2e42539fbf
...
Change-Id: I2c936d6ccaa74f848c68395a70ad468b793855e7
2020-02-28 02:27:12 +00:00
Automerger Merge Worker
05f2b4b1fc
Merge "[Wi-Fi] Fix hint text color contrast problem in 'Add networks'" into rvc-dev am: dc4f004cc9 am: ed20d772f1 am: 3542ce579c
...
Change-Id: I1a5ac09c7d053537b66712baf227a889eaa2d9d5
2020-02-28 02:13:06 +00:00
Automerger Merge Worker
67792e2a8c
Merge "[Wi-Fi] Fix hint text color contrast problem in 'Add networks'" into rvc-dev am: dc4f004cc9 am: 83c6fd40cc am: 7e5ad900da
...
Change-Id: Iad7ac1fc9ba5f39a0c6575d971c733e23d417294
2020-02-28 02:12:48 +00:00
Automerger Merge Worker
6a2723d3d5
Merge "[Wi-Fi] Fix data usage screen flash 1~2 times problem" into rvc-dev am: 51b06031e8 am: 47e84d67a9 am: 756ccff52e
...
Change-Id: I5d07fd7f08e9e9801701ce410e7d3ab3139208eb
2020-02-28 02:12:43 +00:00
Automerger Merge Worker
bf5ab39101
Merge "Merge "[Wi-Fi] Fix data usage screen flash 1~2 times problem" into rvc-dev am: 51b06031e8 am: 763c41ca36 am: 06c880fff2" into rvc-qpr-dev-plus-aosp
2020-02-28 02:12:35 +00:00
Automerger Merge Worker
c6df99a6ba
Merge "[Wi-Fi] Fix hint text color contrast problem in 'Add networks'" into rvc-dev am: dc4f004cc9 am: ed20d772f1 am: 4712b73b69
...
Change-Id: Id15fc0d05f2ec14d9e39beedb7f457309127fec4
2020-02-28 02:12:29 +00:00
Automerger Merge Worker
80561dba97
Merge "[Wi-Fi] Fix data usage screen flash 1~2 times problem" into rvc-dev am: 51b06031e8 am: 763c41ca36 am: 06c880fff2
...
Change-Id: Id6776cb2abd233be32f4a45cec534b86d3fd003f
2020-02-28 02:12:26 +00:00
Automerger Merge Worker
2e42539fbf
Merge "[Wi-Fi] Fix data usage screen flash 1~2 times problem" into rvc-dev am: 51b06031e8 am: 763c41ca36 am: d33d2ba23b
...
Change-Id: I880855de41b405107f4991968667ece4ba82023b
2020-02-28 02:12:08 +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
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
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
06c880fff2
Merge "[Wi-Fi] Fix data usage screen flash 1~2 times problem" into rvc-dev am: 51b06031e8 am: 763c41ca36
...
Change-Id: Iaffbda894d1ec07f467cb97d9dee0ccc5f500e10
2020-02-28 01:47:33 +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
Rahul Sabnis
fc8115d91b
Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."
...
Revert submission 10303287-revert-10253996-bt-a2dp-no-null-FQRXACWPIA
Reason for revert: Fixing breakage
Reverted Changes:
I4d9f2f819:Revert "Make sure calls to BluetoothA2dp APIs pass...
I771ca0d57:Revert "Need to now pass in active device instead ...
I76529c7a1:Revert "Pass in active device to all BluetoothA2dp...
I297bda68d:Revert "Require user pass in a non-null BluetoothD...
I525327959:Revert "Pass in active device to all BluetoothA2dp...
I1d8660b11:Revert "Pass in active device to all BluetoothA2dp...
Bug: 147287141
Test: robotests
Change-Id: I5aecfa4b5a8e371b914573ddd080acb98078bfca
2020-02-27 17:00:24 -08:00
Automerger Merge Worker
87c52849ab
Merge "Support updated rendering of conversation icons." into rvc-dev am: c1f6891ef3 am: cafa42b471 am: e08c48dc07 am: bf96e8290f
...
Change-Id: I98c368bf09a864494914852e4c5d225df712ffa9
2020-02-28 00:57:15 +00:00
Automerger Merge Worker
99d42d5276
Merge "Support updated rendering of conversation icons." into rvc-dev am: c1f6891ef3 am: eb036399eb am: 7761f504ec am: c279547e70
...
Change-Id: Id4bd407a2013a9b51910dc31890a0c030c98fb17
2020-02-28 00:56:01 +00:00
Automerger Merge Worker
afc604fa72
Merge "Support updated rendering of conversation icons." into rvc-dev am: c1f6891ef3 am: eb036399eb am: 8715ccf4fb am: fe7b3665f5
...
Change-Id: I16b871fff4c436fa53f777a161cd925210e9661c
2020-02-28 00:53:59 +00:00
Automerger Merge Worker
bf96e8290f
Merge "Support updated rendering of conversation icons." into rvc-dev am: c1f6891ef3 am: cafa42b471 am: e08c48dc07
...
Change-Id: I91b3d5e5b81a48947eb892e4311464e65846ffb5
2020-02-28 00:45:47 +00:00
Automerger Merge Worker
c279547e70
Merge "Support updated rendering of conversation icons." into rvc-dev am: c1f6891ef3 am: eb036399eb am: 7761f504ec
...
Change-Id: I0a741fc6c4766b4d402cb50886a6a45fa6505f21
2020-02-28 00:44:40 +00:00
Automerger Merge Worker
fe7b3665f5
Merge "Support updated rendering of conversation icons." into rvc-dev am: c1f6891ef3 am: eb036399eb am: 8715ccf4fb
...
Change-Id: I716906ac12b07da82783c7f91529bd68c14dc2cd
2020-02-28 00:41:29 +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
8715ccf4fb
Merge "Support updated rendering of conversation icons." into rvc-dev am: c1f6891ef3 am: eb036399eb
...
Change-Id: I4ca5c4f5ada31f40e1efb460366833afd06f97ce
2020-02-28 00:34:30 +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
Sarah Chin
77dea1beb0
Rename calls to isGlobalModeEnabled
...
Test: atest FrameworksTelephonyTests
Bug: 148603998
Change-Id: If302350cfea7b2cd2cd25906dd1dd6a6d192a5d6
2020-02-27 16:00:13 -08:00
Xin Li
9fe7d6c59b
DO NOT MERGE - Skip QQ2A.200305.003 in stage-aosp-master
...
Bug: 150410372
Change-Id: I5a62dae10a3c5d0b6fd38c364cf38a39de021e2d
2020-02-27 15:45:16 -08:00
