Commit Graph

59593 Commits

Author SHA1 Message Date
Automerger Merge Worker
4c5cb9315d Merge "Use AppOpsManager#setUidMode instead of #setMode" into rvc-dev am: 3071821207 am: d5e10793e5 am: c3b12f302b am: 3ce15a6006
Change-Id: Ia7fb199b387289c7612ed83deef7fc17aef76457
2020-02-28 16:24:50 +00:00
Automerger Merge Worker
3ce15a6006 Merge "Use AppOpsManager#setUidMode instead of #setMode" into rvc-dev am: 3071821207 am: d5e10793e5 am: c3b12f302b
Change-Id: If4367dfa3e6f648c5556a3bba21aaaa9f83ecab6
2020-02-28 16:02:49 +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
d5e10793e5 Merge "Use AppOpsManager#setUidMode instead of #setMode" into rvc-dev am: 3071821207
Change-Id: I0f96de0f766c0eccfd55e0b4ed3a5341be8884f9
2020-02-28 15:34:12 +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
d543033483 [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: 20e3b25292 -s ours am: aae2aa3d20 -s ours
am skip reason: Change-Id I0cb1ceda6d89a52224f80ea5ffd1af709a6acace with SHA-1 41661fe69c is in history

Change-Id: I7e1dea23077ccb7d6bdab8dc7daaad12e6f8ebb2
2020-02-28 07:21:50 +00:00
Automerger Merge Worker
2c3c9e17dd [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: 770505603c -s ours am: de42f96212 -s ours
am skip reason: Change-Id I0cb1ceda6d89a52224f80ea5ffd1af709a6acace with SHA-1 41661fe69c is in history

Change-Id: Iefddb73a10cc4b80c5e06784b19328aef50de3cf
2020-02-28 07:21:43 +00:00
Automerger Merge Worker
761ab005d7 [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: c0561a1dba -s ours am: 22913eebea -s ours
am skip reason: Change-Id I0cb1ceda6d89a52224f80ea5ffd1af709a6acace with SHA-1 41661fe69c is in history

Change-Id: I1f6fbbaecf50ea4d63e6e3c362f58bf0170b30f2
2020-02-28 07:21:37 +00:00
Automerger Merge Worker
aae2aa3d20 [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: 20e3b25292 -s ours
am skip reason: Change-Id I0cb1ceda6d89a52224f80ea5ffd1af709a6acace with SHA-1 41661fe69c is in history

Change-Id: Ifaa63a03e588c1d3a50ae380a0f54c36a11bee73
2020-02-28 07:16:16 +00:00
Automerger Merge Worker
de42f96212 [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: 770505603c -s ours
am skip reason: Change-Id I0cb1ceda6d89a52224f80ea5ffd1af709a6acace with SHA-1 41661fe69c is in history

Change-Id: I374c700b3c417e75114b53cc86f375b01a45136a
2020-02-28 07:09:17 +00:00
Automerger Merge Worker
22913eebea [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: c0561a1dba -s ours
am skip reason: Change-Id I0cb1ceda6d89a52224f80ea5ffd1af709a6acace with SHA-1 41661fe69c is in history

Change-Id: I507336c66d59d8694e160c0bc2def52ce6257ab1
2020-02-28 07:09:12 +00:00
Automerger Merge Worker
64e72460dc Skip QQ2A.200113.001 in stage-aosp-master am: 28f9734a4a am: bcd758f57f am: d7b5b5a190 am: 5c5e0c892f
Change-Id: I8a61e88d5c08b4c45a867bc793e8e1aa533b6601
2020-02-28 07:04:08 +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
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
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
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 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
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
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