Commit Graph

59725 Commits

Author SHA1 Message Date
Automerger Merge Worker
cb4f092b3a Merge "Add slice regist key for dynamic group" into rvc-dev am: 9904275968 am: 74bd004539 am: 2ba30b9e04
Change-Id: I344dc579625e54657baee4cce2ab91af9e7a79ed
2020-03-04 03:13:40 +00:00
Automerger Merge Worker
ff6df6c618 Merge "Add slice for dynamic grouping in output switcher" into rvc-dev am: 09ff25cdf9 am: ddaa0871cb am: 32df3f1e11
Change-Id: If0039b84861e6fff63352d976c9956c146ede7d0
2020-03-04 03:13:38 +00:00
Automerger Merge Worker
b86ad255e7 [automerger skipped] [Wi-Fi] Ignore incorrect user certificates am: 9e46a0bc93 -s ours am: d6f421d593 -s ours am: aa8531e082 -s ours am: 05e452fabf -s ours
am skip reason: Change-Id Iab35ac975933abc54fda83b99a2109d53d6722d4 with SHA-1 9730b5aa86 is in history

Change-Id: I73d00f745ee7c03f74524937abac4dfa710006ae
2020-03-04 03:13:27 +00:00
Automerger Merge Worker
c763503a4f Merge "[Wi-Fi] Apply WifiEntry onUpdate to support refresh WiFi detail page for OpenRoaming feature." into rvc-dev am: e64fb77bc8 am: d105b75046 am: eef2d790d2
Change-Id: Ic54d1bfaf3a5b0d574c059ec0bd5a3600d4c6d3b
2020-03-04 03:13:20 +00:00
Automerger Merge Worker
63ec77bff4 Merge "Add dynamic group panel" into rvc-dev am: 9a1701b42f am: 5c5c13e2a9 am: 5171781e75
Change-Id: I3b24c9c026ed7d611a2bf7ebe26dcec1643fd592
2020-03-04 03:13:12 +00:00
Automerger Merge Worker
1ea9d6a29b Merge "Add slice regist key for dynamic group" into rvc-dev am: 9904275968 am: 01d9e35c58 am: cfbdb03d2d
Change-Id: Ide5f552efdfc48dcee67a2794dd6c633fd933ba4
2020-03-04 03:13:10 +00:00
Automerger Merge Worker
0b02a2334f Merge "Add slice for dynamic grouping in output switcher" into rvc-dev am: 09ff25cdf9 am: bc0d38d1be am: 50aefb75b0
Change-Id: I469c712a49422b62f51b3e752658773ad6bcc3ae
2020-03-04 03:13:09 +00:00
Automerger Merge Worker
6877fa9338 [automerger skipped] [Wi-Fi] Ignore incorrect user certificates am: 9e46a0bc93 -s ours am: d6f421d593 -s ours am: b012406ee6 -s ours am: 8e78fccbab -s ours
am skip reason: Change-Id Iab35ac975933abc54fda83b99a2109d53d6722d4 with SHA-1 9730b5aa86 is in history

Change-Id: I0484f2be3b537e40c67ac050746da89ed41b5a8f
2020-03-04 03:12:58 +00:00
Automerger Merge Worker
40044775d2 Merge "[Wi-Fi] Apply WifiEntry onUpdate to support refresh WiFi detail page for OpenRoaming feature." into rvc-dev am: e64fb77bc8 am: 55fa845f1e am: ec9c799dcc
Change-Id: I3f0202781080639f28f72cd3acf29818cc887b9c
2020-03-04 03:12:32 +00:00
Automerger Merge Worker
2ba30b9e04 Merge "Add slice regist key for dynamic group" into rvc-dev am: 9904275968 am: 74bd004539
Change-Id: I35bc6b0470c37926f0cf7bb7279f09b1f4d5a2b6
2020-03-04 03:07:07 +00:00
Automerger Merge Worker
32df3f1e11 Merge "Add slice for dynamic grouping in output switcher" into rvc-dev am: 09ff25cdf9 am: ddaa0871cb
Change-Id: I48cdae6972a93866e66ab0e09f27009dde190270
2020-03-04 03:07:05 +00:00
Automerger Merge Worker
05e452fabf [automerger skipped] [Wi-Fi] Ignore incorrect user certificates am: 9e46a0bc93 -s ours am: d6f421d593 -s ours am: aa8531e082 -s ours
am skip reason: Change-Id Iab35ac975933abc54fda83b99a2109d53d6722d4 with SHA-1 9730b5aa86 is in history

Change-Id: Ifecde9540d9093fa033d3522ff02c9d57e48dace
2020-03-04 03:06:59 +00:00
Automerger Merge Worker
a5e4198546 Merge changes I3b1d1c4e,I11bdad27 into rvc-dev am: 5dbf99de82 am: 7d7ddddcda am: cec1f09aaa am: ed46a7d526
Change-Id: I4fb6c1645553dc5fa17becebf219f2e6553ce128
2020-03-04 03:06:54 +00:00
Automerger Merge Worker
eef2d790d2 Merge "[Wi-Fi] Apply WifiEntry onUpdate to support refresh WiFi detail page for OpenRoaming feature." into rvc-dev am: e64fb77bc8 am: d105b75046
Change-Id: I2bcb99373bb7a29529fd93c44ceed0ef68002a3b
2020-03-04 03:06:53 +00:00
Automerger Merge Worker
5171781e75 Merge "Add dynamic group panel" into rvc-dev am: 9a1701b42f am: 5c5c13e2a9
Change-Id: Ib8b8acc72ddbb21bb1bb9e70721e144653401bca
2020-03-04 02:59:35 +00:00
Automerger Merge Worker
cfbdb03d2d Merge "Add slice regist key for dynamic group" into rvc-dev am: 9904275968 am: 01d9e35c58
Change-Id: I80c3e348b4882fb259c72cc1b87f0c89a1d501e9
2020-03-04 02:59:34 +00:00
Automerger Merge Worker
50aefb75b0 Merge "Add slice for dynamic grouping in output switcher" into rvc-dev am: 09ff25cdf9 am: bc0d38d1be
Change-Id: I4c710e3a5ac052232139ab103205efbbbe394ca6
2020-03-04 02:59:33 +00:00
Automerger Merge Worker
8e78fccbab [automerger skipped] [Wi-Fi] Ignore incorrect user certificates am: 9e46a0bc93 -s ours am: d6f421d593 -s ours am: b012406ee6 -s ours
am skip reason: Change-Id Iab35ac975933abc54fda83b99a2109d53d6722d4 with SHA-1 9730b5aa86 is in history

Change-Id: If333151ac53f2b506c8deaf6a9bc4c34781e6b15
2020-03-04 02:59:26 +00:00
Automerger Merge Worker
ec9c799dcc Merge "[Wi-Fi] Apply WifiEntry onUpdate to support refresh WiFi detail page for OpenRoaming feature." into rvc-dev am: e64fb77bc8 am: 55fa845f1e
Change-Id: If0e7aad1904e70cf550bcb8143d22962086ed65c
2020-03-04 02:59:21 +00:00
Automerger Merge Worker
b9c8eacd9f Merge changes I3b1d1c4e,I11bdad27 into rvc-dev am: 5dbf99de82 am: 7d7ddddcda am: ad3edcf79c
Change-Id: Iddac896cb27c0e55de51b6ade83df99ac2172286
2020-03-04 02:46:41 +00:00
Automerger Merge Worker
ed46a7d526 Merge changes I3b1d1c4e,I11bdad27 into rvc-dev am: 5dbf99de82 am: 7d7ddddcda am: cec1f09aaa
Change-Id: If21fed883602541ab3566a1ba9b70f2d92032976
2020-03-04 02:45:35 +00:00
Automerger Merge Worker
e30f24d763 Merge changes I3b1d1c4e,I11bdad27 into rvc-dev am: 5dbf99de82 am: b3ff936644 am: 99cb10c954
Change-Id: I3e35f7482df28b9c391f32becbbb6fb364bf4e7f
2020-03-04 02:45:14 +00:00
Automerger Merge Worker
74bd004539 Merge "Add slice regist key for dynamic group" into rvc-dev am: 9904275968
Change-Id: Icbe88e520ce7c8c7489fc6f4e19f6e5abaf87e32
2020-03-04 02:39:00 +00:00
Automerger Merge Worker
ddaa0871cb Merge "Add slice for dynamic grouping in output switcher" into rvc-dev am: 09ff25cdf9
Change-Id: I167d365acf558341669ce71413bb260acca43fe6
2020-03-04 02:38:59 +00:00
Automerger Merge Worker
5c5c13e2a9 Merge "Add dynamic group panel" into rvc-dev am: 9a1701b42f
Change-Id: I2455802d495dc2331b72fe7de02f5de4dbae289f
2020-03-04 02:38:57 +00:00
Automerger Merge Worker
01d9e35c58 Merge "Add slice regist key for dynamic group" into rvc-dev am: 9904275968
Change-Id: I4cb461f0395e948cc5b0ccf24474978984c4d50d
2020-03-04 02:38:55 +00:00
Automerger Merge Worker
bc0d38d1be Merge "Add slice for dynamic grouping in output switcher" into rvc-dev am: 09ff25cdf9
Change-Id: Id1ca213df71e06a33d89b7d1e510b75b74ace8c6
2020-03-04 02:38:54 +00:00
Automerger Merge Worker
aa8531e082 [automerger skipped] [Wi-Fi] Ignore incorrect user certificates am: 9e46a0bc93 -s ours am: d6f421d593 -s ours
am skip reason: Change-Id Iab35ac975933abc54fda83b99a2109d53d6722d4 with SHA-1 9730b5aa86 is in history

Change-Id: I006489e23cf726ccb9df0336d6b6cd282c5c6ecf
2020-03-04 02:38:50 +00:00
Automerger Merge Worker
b012406ee6 [automerger skipped] [Wi-Fi] Ignore incorrect user certificates am: 9e46a0bc93 -s ours am: d6f421d593 -s ours
am skip reason: Change-Id Iab35ac975933abc54fda83b99a2109d53d6722d4 with SHA-1 9730b5aa86 is in history

Change-Id: I9b319237feb46c080fdfebc8d0ca4106b52834fc
2020-03-04 02:38:45 +00:00
Automerger Merge Worker
d105b75046 Merge "[Wi-Fi] Apply WifiEntry onUpdate to support refresh WiFi detail page for OpenRoaming feature." into rvc-dev am: e64fb77bc8
Change-Id: I26b62e17a8182371b63b70542adcd2b390a77a18
2020-03-04 02:38:40 +00:00
Automerger Merge Worker
55fa845f1e Merge "[Wi-Fi] Apply WifiEntry onUpdate to support refresh WiFi detail page for OpenRoaming feature." into rvc-dev am: e64fb77bc8
Change-Id: I84001a5c44becfe7d8590e8097dbf99f6aed2eb9
2020-03-04 02:38:35 +00:00
tim peng
9904275968 Merge "Add slice regist key for dynamic group" into rvc-dev 2020-03-04 02:35:35 +00:00
tim peng
09ff25cdf9 Merge "Add slice for dynamic grouping in output switcher" into rvc-dev 2020-03-04 02:35:35 +00:00
tim peng
9a1701b42f Merge "Add dynamic group panel" into rvc-dev 2020-03-04 02:35:35 +00:00
Automerger Merge Worker
ad3edcf79c Merge changes I3b1d1c4e,I11bdad27 into rvc-dev am: 5dbf99de82 am: 7d7ddddcda
Change-Id: I07b6bd9ff2ab5ee82c116c83a2d4f1ea8fe69f27
2020-03-04 02:32:59 +00:00
Automerger Merge Worker
cec1f09aaa Merge changes I3b1d1c4e,I11bdad27 into rvc-dev am: 5dbf99de82 am: 7d7ddddcda
Change-Id: Ia8b5455a7856747dda56a94dea22c0f6a1d38eec
2020-03-04 02:32:59 +00:00
Automerger Merge Worker
99cb10c954 Merge changes I3b1d1c4e,I11bdad27 into rvc-dev am: 5dbf99de82 am: b3ff936644
Change-Id: I5638d4c12907aea63a9f61b0c0dc3cea4d8115a0
2020-03-04 02:32:42 +00:00
Automerger Merge Worker
d6f421d593 [automerger skipped] [Wi-Fi] Ignore incorrect user certificates am: 9e46a0bc93 -s ours
am skip reason: Change-Id Iab35ac975933abc54fda83b99a2109d53d6722d4 with SHA-1 9730b5aa86 is in history

Change-Id: Ia2bbed0f22a29e50bc6d4523bf5ec4b75ee1a981
2020-03-04 02:32:26 +00:00
Arc Wang
e64fb77bc8 Merge "[Wi-Fi] Apply WifiEntry onUpdate to support refresh WiFi detail page for OpenRoaming feature." into rvc-dev 2020-03-04 02:25:38 +00:00
Automerger Merge Worker
b3ff936644 Merge changes I3b1d1c4e,I11bdad27 into rvc-dev am: 5dbf99de82
Change-Id: I8fc697e7682b9da3243b2050820d1b0ba59efebb
2020-03-04 02:04:23 +00:00
Automerger Merge Worker
7d7ddddcda Merge changes I3b1d1c4e,I11bdad27 into rvc-dev am: 5dbf99de82
Change-Id: I925eec066c43a8befeef41d40cad7ecfb2b6fb86
2020-03-04 02:04:18 +00:00
Automerger Merge Worker
969e0fddc6 Merge "Add string for output switcher transferring error" into rvc-dev am: 8c07f06cd5 am: 9aebc16b6a am: eb31d86af9 am: 9ad579bfe6
Change-Id: I1a8d2a648ae152542968de06e5c1a368cc9cad4b
2020-03-04 01:55:45 +00:00
Zhen Zhang
5dbf99de82 Merge changes I3b1d1c4e,I11bdad27 into rvc-dev
* changes:
  Let tether preference controllers extend TogglePreferenceController
  Make tether option preferences listen to own SharedPreferences change
2020-03-04 01:53:07 +00:00
Automerger Merge Worker
8029e937dd Merge "Add string for output switcher transferring error" into rvc-dev am: 8c07f06cd5 am: 61c7581322 am: 0b924d6cad
Change-Id: I54c0103e8b490a0423d968a1a2193243582929aa
2020-03-04 01:42:48 +00:00
Automerger Merge Worker
9ad579bfe6 Merge "Add string for output switcher transferring error" into rvc-dev am: 8c07f06cd5 am: 9aebc16b6a am: eb31d86af9
Change-Id: I2cb340913046145917130697dcf188fa372c0e86
2020-03-04 01:40:49 +00:00
Automerger Merge Worker
8ae78e19a9 Merge "Add string for output switcher transferring error" into rvc-dev am: 8c07f06cd5 am: 9aebc16b6a am: 0d7209e303
Change-Id: Ia3d5e817750c398575c1116072a5b179e00702bf
2020-03-04 01:40:08 +00:00
Automerger Merge Worker
0b924d6cad Merge "Add string for output switcher transferring error" into rvc-dev am: 8c07f06cd5 am: 61c7581322
Change-Id: I58d050e865f53aef709be9b27d3865e3307b8729
2020-03-04 01:26:45 +00:00
Automerger Merge Worker
eb31d86af9 Merge "Add string for output switcher transferring error" into rvc-dev am: 8c07f06cd5 am: 9aebc16b6a
Change-Id: I131d6f9021fe9840b9617af4dfe5d6265371831e
2020-03-04 01:26:42 +00:00
Automerger Merge Worker
0d7209e303 Merge "Add string for output switcher transferring error" into rvc-dev am: 8c07f06cd5 am: 9aebc16b6a
Change-Id: I34ef1774e79d6b280d34fb2298f316c15ea1480e
2020-03-04 01:26:24 +00:00
Automerger Merge Worker
61c7581322 Merge "Add string for output switcher transferring error" into rvc-dev am: 8c07f06cd5
Change-Id: I65ba4dcd05836f14b94da7811fc37ba92521efaf
2020-03-04 01:13:19 +00:00