Automerger Merge Worker
c75011e715
Merge "Fix exception when filtering the APPs which can CHANGE_WIFI_STATE" into rvc-dev am: d3946b5479 am: a2027e5960 am: f0004bf1dc am: 20f0980dfb
...
Change-Id: Ic9788016428bb6e112fde332561eb9518e8a065b
2020-03-04 12:03:24 +00:00
Automerger Merge Worker
7f4cbf0e59
Merge "Fix exception when filtering the APPs which can CHANGE_WIFI_STATE" into rvc-dev am: d3946b5479 am: 96d04824ed am: 69ff0559c1
...
Change-Id: I4024048f8f691d2271a86f9afef5468560929c57
2020-03-04 11:45:01 +00:00
Automerger Merge Worker
972c2fac45
Merge "Fix exception when filtering the APPs which can CHANGE_WIFI_STATE" into rvc-dev am: d3946b5479 am: a2027e5960 am: b616ab6e6d
...
Change-Id: I91b3d1272ee45a537ed7e72207ba10d2af73f499
2020-03-04 11:43:19 +00:00
Automerger Merge Worker
20f0980dfb
Merge "Fix exception when filtering the APPs which can CHANGE_WIFI_STATE" into rvc-dev am: d3946b5479 am: a2027e5960 am: f0004bf1dc
...
Change-Id: I74e149079c43d7c205363ab57add997138e201f0
2020-03-04 11:41:23 +00:00
Automerger Merge Worker
69ff0559c1
Merge "Fix exception when filtering the APPs which can CHANGE_WIFI_STATE" into rvc-dev am: d3946b5479 am: 96d04824ed
...
Change-Id: I8a17fb537b8e6a71e4505a7198e5c6c0c9c67a9b
2020-03-04 11:15:26 +00:00
Automerger Merge Worker
f0004bf1dc
Merge "Fix exception when filtering the APPs which can CHANGE_WIFI_STATE" into rvc-dev am: d3946b5479 am: a2027e5960
...
Change-Id: Ib3ef974d9da0476b9c97c69ce6c063215a33ea16
2020-03-04 11:15:26 +00:00
Automerger Merge Worker
b616ab6e6d
Merge "Fix exception when filtering the APPs which can CHANGE_WIFI_STATE" into rvc-dev am: d3946b5479 am: a2027e5960
...
Change-Id: I7585337e5cbd967256487dd3b7773157a3acf69b
2020-03-04 11:15:15 +00:00
Automerger Merge Worker
96d04824ed
Merge "Fix exception when filtering the APPs which can CHANGE_WIFI_STATE" into rvc-dev am: d3946b5479
...
Change-Id: I24e5d0d7d90371f0c755045476f8f34436dd7879
2020-03-04 11:00:07 +00:00
Automerger Merge Worker
a2027e5960
Merge "Fix exception when filtering the APPs which can CHANGE_WIFI_STATE" into rvc-dev am: d3946b5479
...
Change-Id: I84cb4504ee074d0ab9bbc4bc2d46f3fa8d2afb02
2020-03-04 10:59:52 +00:00
TreeHugger Robot
d3946b5479
Merge "Fix exception when filtering the APPs which can CHANGE_WIFI_STATE" into rvc-dev
2020-03-04 10:40:39 +00:00
Arc Wang
d5bdbdb345
Fix exception when filtering the APPs which can CHANGE_WIFI_STATE
...
When filtering AppEntry, only allow the extraInfo type of WifiSettingsState.
Bug: 148486719
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AppStateChangeWifiStateBridgeTest
Change-Id: I486e88629aec8cfecf6174de8987d37394043743
2020-03-04 16:09:41 +08:00
Automerger Merge Worker
55beb55222
Merge "Fix double scroller of App info page" into rvc-dev am: 0ab87cce3d am: 85b274b6c9 am: cf6bc20c70 am: 7c59f85d84
...
Change-Id: I6e8fc4bb2578419f85335c8aaa71f3095d5e00a4
2020-03-04 07:56:41 +00:00
Automerger Merge Worker
e2824665f2
Merge "Fix double scroller of App info page" into rvc-dev am: 0ab87cce3d am: b62bdbb1ba am: 5452c86902
...
Change-Id: I381a9823da5d54ffebbd33a2b773c74796bebadd
2020-03-04 07:46:14 +00:00
Automerger Merge Worker
0c601ed9ca
Merge "Fix double scroller of App info page" into rvc-dev am: 0ab87cce3d am: 85b274b6c9 am: c480a5a219
...
Change-Id: Ib562cfc082f5dd8023dcc0f1f37cfc3d1ff7c2ca
2020-03-04 07:45:40 +00:00
Automerger Merge Worker
7c59f85d84
Merge "Fix double scroller of App info page" into rvc-dev am: 0ab87cce3d am: 85b274b6c9 am: cf6bc20c70
...
Change-Id: Ic3b3fc21c1ad2694bb21067d43ba1da533a6bb24
2020-03-04 07:44:45 +00:00
Automerger Merge Worker
cf6bc20c70
Merge "Fix double scroller of App info page" into rvc-dev am: 0ab87cce3d am: 85b274b6c9
...
Change-Id: I0f4a089a31374ccea3fbf8f7b9ffcf1eed50fa1f
2020-03-04 07:25:29 +00:00
Automerger Merge Worker
5452c86902
Merge "Fix double scroller of App info page" into rvc-dev am: 0ab87cce3d am: b62bdbb1ba
...
Change-Id: I5b711a731d988d24ac10ea5eeb1bdfd95a7d7000
2020-03-04 07:25:28 +00:00
Automerger Merge Worker
c480a5a219
Merge "Fix double scroller of App info page" into rvc-dev am: 0ab87cce3d am: 85b274b6c9
...
Change-Id: I1b3249edd8b1c3ceb653c8d82571ddf29032e947
2020-03-04 07:25:13 +00:00
Automerger Merge Worker
b62bdbb1ba
Merge "Fix double scroller of App info page" into rvc-dev am: 0ab87cce3d
...
Change-Id: I5debb5a498a2a898cccf74d61209597295e3bd46
2020-03-04 07:04:26 +00:00
Automerger Merge Worker
85b274b6c9
Merge "Fix double scroller of App info page" into rvc-dev am: 0ab87cce3d
...
Change-Id: I43a6edf20ab7fdaa5323d6b955e3f5408423629e
2020-03-04 07:04:18 +00:00
Yanting Yang
0ab87cce3d
Merge "Fix double scroller of App info page" into rvc-dev
2020-03-04 06:51:19 +00:00
Automerger Merge Worker
0327de2860
Merge "Add dynamic group panel" into rvc-dev am: 9a1701b42f am: 5c5c13e2a9 am: 56f95e94ad am: 85321037af
...
Change-Id: I491a7092dbdfa493a12e22a3bebf085381db30ec
2020-03-04 03:32:40 +00:00
Automerger Merge Worker
ca33958483
Merge "Add slice regist key for dynamic group" into rvc-dev am: 9904275968 am: 01d9e35c58 am: 06ab772ba4 am: 2b9a685801
...
Change-Id: Ia8f771ffab5c2103a631d84cdc007c94e25057c5
2020-03-04 03:32:38 +00:00
Automerger Merge Worker
43f995eab5
Merge "Add slice for dynamic grouping in output switcher" into rvc-dev am: 09ff25cdf9 am: bc0d38d1be am: 513096cded am: 92d19c19a6
...
Change-Id: Icc0b73025b546b70306e4992a44a8c26a95d06ad
2020-03-04 03:32:37 +00:00
Automerger Merge Worker
66e930120e
[automerger skipped] [Wi-Fi] Ignore incorrect user certificates am: 9e46a0bc93 -s ours am: d6f421d593 -s ours am: b012406ee6 -s ours am: b0ed691dd8 -s ours am: 4954088094 -s ours
...
am skip reason: Change-Id Iab35ac975933abc54fda83b99a2109d53d6722d4 with SHA-1 9730b5aa86
2020-03-04 03:32:29 +00:00
Automerger Merge Worker
58b74c724b
Merge "[Wi-Fi] Apply WifiEntry onUpdate to support refresh WiFi detail page for OpenRoaming feature." into rvc-dev am: e64fb77bc8 am: 55fa845f1e am: e8100bb129 am: a3f11009b6
...
Change-Id: I4ac6c75e64f5700142096ac01f2750d8d99d238e
2020-03-04 03:32:22 +00:00
Automerger Merge Worker
0d98e8fa4b
Merge "Add dynamic group panel" into rvc-dev am: 9a1701b42f am: b856ed655c am: b4acbd0cb3
...
Change-Id: I8bd596281aa63caac16530dd5006245fd1173ba7
2020-03-04 03:13:41 +00:00
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
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
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
85321037af
Merge "Add dynamic group panel" into rvc-dev am: 9a1701b42f am: 5c5c13e2a9 am: 56f95e94ad
...
Change-Id: If0c3f08fca6ce78f94a60ded9ff5d28b471427e1
2020-03-04 03:12:30 +00:00
Automerger Merge Worker
2b9a685801
Merge "Add slice regist key for dynamic group" into rvc-dev am: 9904275968 am: 01d9e35c58 am: 06ab772ba4
...
Change-Id: I27831fecf246135f2134621926285152ec664500
2020-03-04 03:12:28 +00:00
Automerger Merge Worker
92d19c19a6
Merge "Add slice for dynamic grouping in output switcher" into rvc-dev am: 09ff25cdf9 am: bc0d38d1be am: 513096cded
...
Change-Id: I2728bbfeba057aed033e8cb0d8b6f5695a205ca8
2020-03-04 03:12:26 +00:00
Automerger Merge Worker
4954088094
[automerger skipped] [Wi-Fi] Ignore incorrect user certificates am: 9e46a0bc93 -s ours am: d6f421d593 -s ours am: b012406ee6 -s ours am: b0ed691dd8 -s ours
...
am skip reason: Change-Id Iab35ac975933abc54fda83b99a2109d53d6722d4 with SHA-1 9730b5aa86
2020-03-04 03:12:19 +00:00
Automerger Merge Worker
a3f11009b6
Merge "[Wi-Fi] Apply WifiEntry onUpdate to support refresh WiFi detail page for OpenRoaming feature." into rvc-dev am: e64fb77bc8 am: 55fa845f1e am: e8100bb129
...
Change-Id: Iedd273ba66dc84ea3af2ffc3aa262a3d0120948c
2020-03-04 03:12:12 +00:00
Automerger Merge Worker
b4acbd0cb3
Merge "Add dynamic group panel" into rvc-dev am: 9a1701b42f am: b856ed655c
...
Change-Id: I38325fe26892d8db1a2b4310479744df5da62822
2020-03-04 03:07:10 +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
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
56f95e94ad
Merge "Add dynamic group panel" into rvc-dev am: 9a1701b42f am: 5c5c13e2a9
...
Change-Id: I712581f8efa089e8c4703ccd5ac8e04f3232a1b2
2020-03-04 02:59:42 +00:00
Automerger Merge Worker
06ab772ba4
Merge "Add slice regist key for dynamic group" into rvc-dev am: 9904275968 am: 01d9e35c58
...
Change-Id: Iab904472b6ef52f3dac3977f39ae8d37ef2a9a18
2020-03-04 02:59:41 +00:00
Automerger Merge Worker
513096cded
Merge "Add slice for dynamic grouping in output switcher" into rvc-dev am: 09ff25cdf9 am: bc0d38d1be
...
Change-Id: I52a1a99ed95b21c8b10c35619f2dcccf2fd689af
2020-03-04 02:59:39 +00:00
