Automerger Merge Worker
b9e66db60f
Merge "Merge "[Wi-Fi] Refactor AddAppNetworksFragment to use WifiEntry but not AccessPoint." into rvc-dev am: 6f16992d3c am: 6b37d4d4f1" into rvc-d1-dev-plus-aosp am: ea7b3d94a8 am: cde2d3981b
...
Change-Id: I008270b3396c1db0a461ac62016fc59ff5e5366e
2020-03-26 16:03:02 +00:00
TreeHugger Robot
70d4ea36b6
Merge "[Wi-Fi] Refactor AddAppNetworksFragment to use WifiEntry but not AccessPoint." into rvc-dev am: 6f16992d3c am: a3368c723d am: 71791d7e02 am: d0ff75aefa
...
Change-Id: Iff645fdb71c160abb7d38f4fcc56076fc10addc5
2020-03-26 16:02:43 +00:00
Automerger Merge Worker
cde2d3981b
Merge "Merge "[Wi-Fi] Refactor AddAppNetworksFragment to use WifiEntry but not AccessPoint." into rvc-dev am: 6f16992d3c am: 6b37d4d4f1" into rvc-d1-dev-plus-aosp am: ea7b3d94a8
...
Change-Id: Ibeba7ab5d24d4c88bee7fc2e5415c0c0f0ae1887
2020-03-26 15:47:39 +00:00
TreeHugger Robot
d0ff75aefa
Merge "[Wi-Fi] Refactor AddAppNetworksFragment to use WifiEntry but not AccessPoint." into rvc-dev am: 6f16992d3c am: a3368c723d am: 71791d7e02
...
Change-Id: I6c1483bd9f3c28c67f71ccf3365def35b11d10fb
2020-03-26 15:47:27 +00:00
Automerger Merge Worker
ea7b3d94a8
Merge "Merge "[Wi-Fi] Refactor AddAppNetworksFragment to use WifiEntry but not AccessPoint." into rvc-dev am: 6f16992d3c am: 6b37d4d4f1" into rvc-d1-dev-plus-aosp
2020-03-26 15:28:58 +00:00
TreeHugger Robot
3421f934c8
Merge "[Wi-Fi] Refactor AddAppNetworksFragment to use WifiEntry but not AccessPoint." into rvc-dev am: 6f16992d3c am: 6b37d4d4f1
...
Change-Id: Ie02d655b3334da8e169a017f638f3c38bba034a3
2020-03-26 15:28:47 +00:00
TreeHugger Robot
71791d7e02
Merge "[Wi-Fi] Refactor AddAppNetworksFragment to use WifiEntry but not AccessPoint." into rvc-dev am: 6f16992d3c am: a3368c723d
...
Change-Id: I550cc778b65683cbf2aed3441db7270d00021213
2020-03-26 15:28:26 +00:00
TreeHugger Robot
6b37d4d4f1
Merge "[Wi-Fi] Refactor AddAppNetworksFragment to use WifiEntry but not AccessPoint." into rvc-dev am: 6f16992d3c
...
Change-Id: I8e2d6cf302840e650f19caf6290f49542bcdd5f0
2020-03-26 15:05:36 +00:00
TreeHugger Robot
a3368c723d
Merge "[Wi-Fi] Refactor AddAppNetworksFragment to use WifiEntry but not AccessPoint." into rvc-dev am: 6f16992d3c
...
Change-Id: I7fd91faca77022aa748fbfbc41a645260f31aedf
2020-03-26 15:05:35 +00:00
TreeHugger Robot
6f16992d3c
Merge "[Wi-Fi] Refactor AddAppNetworksFragment to use WifiEntry but not AccessPoint." into rvc-dev
2020-03-26 14:57:44 +00:00
Alex Johnston
9bd2f5b736
Merge "Retain FRP data when FR is invoked in Settings" into rvc-dev am: 7bc50ac2ef am: bbd65ff983 am: 1f95535ead am: eb0d29514c am: 1b20885f5b
...
Change-Id: Icf545616e6e7d2184c5e0ea366523536f9479a1d
2020-03-26 14:12:24 +00:00
Automerger Merge Worker
ed64fbf53a
Merge "Merge "Retain FRP data when FR is invoked in Settings" into rvc-dev am: 7bc50ac2ef am: 47415a0a45" into rvc-d1-dev-plus-aosp am: 04be843ab3 am: 90da510597
...
Change-Id: Id137c8c1654873601b5ceddb5883e03fd3cb13e9
2020-03-26 14:11:03 +00:00
Alex Johnston
1b20885f5b
Merge "Retain FRP data when FR is invoked in Settings" into rvc-dev am: 7bc50ac2ef am: bbd65ff983 am: 1f95535ead am: eb0d29514c
...
Change-Id: Iffb8b725b14e404c3a62ad58d17af075ac1289d5
2020-03-26 14:10:48 +00:00
Alex Johnston
40417d3efe
Merge "Retain FRP data when FR is invoked in Settings" into rvc-dev am: 7bc50ac2ef am: bbd65ff983 am: cf38af6de6 am: bd706ef24f
...
Change-Id: If66284619518916e18d867a10cbc42a635d69317
2020-03-26 14:10:31 +00:00
Automerger Merge Worker
90da510597
Merge "Merge "Retain FRP data when FR is invoked in Settings" into rvc-dev am: 7bc50ac2ef am: 47415a0a45" into rvc-d1-dev-plus-aosp am: 04be843ab3
...
Change-Id: I984611ffa131e55ed89c6ac5d17c203417b4ad79
2020-03-26 13:52:23 +00:00
Alex Johnston
bd706ef24f
Merge "Retain FRP data when FR is invoked in Settings" into rvc-dev am: 7bc50ac2ef am: bbd65ff983 am: cf38af6de6
...
Change-Id: I76b103fa54c7e357e3fc941b704b0d6ed010f2e7
2020-03-26 13:52:06 +00:00
Alex Johnston
eb0d29514c
Merge "Retain FRP data when FR is invoked in Settings" into rvc-dev am: 7bc50ac2ef am: bbd65ff983 am: 1f95535ead
...
Change-Id: I2cdc37710191188b232439acfb38bf7a7afb8327
2020-03-26 13:51:57 +00:00
Automerger Merge Worker
04be843ab3
Merge "Merge "Retain FRP data when FR is invoked in Settings" into rvc-dev am: 7bc50ac2ef am: 47415a0a45" into rvc-d1-dev-plus-aosp
2020-03-26 13:39:05 +00:00
Alex Johnston
ff02f246c9
Merge "Retain FRP data when FR is invoked in Settings" into rvc-dev am: 7bc50ac2ef am: 47415a0a45
...
Change-Id: I7ad8727e62802411caea66fab8e81decd6878abb
2020-03-26 13:39:00 +00:00
Alex Johnston
1f95535ead
Merge "Retain FRP data when FR is invoked in Settings" into rvc-dev am: 7bc50ac2ef am: bbd65ff983
...
Change-Id: I9345f04b8ca27b370abd74e460e8f63b04b11888
2020-03-26 13:38:56 +00:00
Alex Johnston
cf38af6de6
Merge "Retain FRP data when FR is invoked in Settings" into rvc-dev am: 7bc50ac2ef am: bbd65ff983
...
Change-Id: Ic438fc8b8ba8a62cb718f18a5edb83066f132efe
2020-03-26 13:38:54 +00:00
Alex Johnston
bbd65ff983
Merge "Retain FRP data when FR is invoked in Settings" into rvc-dev am: 7bc50ac2ef
...
Change-Id: I259abdec68097485aa875e802a3e39b6098fba9c
2020-03-26 13:19:57 +00:00
Alex Johnston
47415a0a45
Merge "Retain FRP data when FR is invoked in Settings" into rvc-dev am: 7bc50ac2ef
...
Change-Id: Ib57653e7b2937b6375b2aa287622a900083e723c
2020-03-26 13:19:43 +00:00
Alex Johnston
7bc50ac2ef
Merge "Retain FRP data when FR is invoked in Settings" into rvc-dev
2020-03-26 12:58:49 +00:00
TreeHugger Robot
e5ad60c411
Merge "Add unit tests for policy transparency on Fact Auth settings" into rvc-dev am: cb90ffafbb am: 706a7f19c2 am: 0a6e14020a am: b3721664fb am: d3ce7d66c9
...
Change-Id: Ib99c28d4e8f46b31212e643eb9d3e7eb16e66a8a
2020-03-26 12:41:58 +00:00
TreeHugger Robot
d3ce7d66c9
Merge "Add unit tests for policy transparency on Fact Auth settings" into rvc-dev am: cb90ffafbb am: 706a7f19c2 am: 0a6e14020a am: b3721664fb
...
Change-Id: Id6847d9bf7064f43a323f60720c44f193c8962bb
2020-03-26 12:35:35 +00:00
TreeHugger Robot
2e5279048d
Merge "Add unit tests for policy transparency on Fact Auth settings" into rvc-dev am: cb90ffafbb am: 6b754f1582 am: 52c1c77d93 am: b64699a400
...
Change-Id: I862b8b9adc8852968067786f085afcb65f1c5a3f
2020-03-26 12:35:26 +00:00
TreeHugger Robot
4b341e15ce
Merge "Add unit tests for policy transparency on Fact Auth settings" into rvc-dev am: cb90ffafbb am: 706a7f19c2 am: c228661d69 am: 4fdff5e5a4
...
Change-Id: I35263c6eb6521805c542c83664596cc3502fdbea
2020-03-26 12:35:18 +00:00
TreeHugger Robot
b64699a400
Merge "Add unit tests for policy transparency on Fact Auth settings" into rvc-dev am: cb90ffafbb am: 6b754f1582 am: 52c1c77d93
...
Change-Id: I3e32425a71ed7ddefd3ceaec3bd6d977d5635581
2020-03-26 12:20:44 +00:00
TreeHugger Robot
b3721664fb
Merge "Add unit tests for policy transparency on Fact Auth settings" into rvc-dev am: cb90ffafbb am: 706a7f19c2 am: 0a6e14020a
...
Change-Id: If511a167927c7fd19e7a6bd282b5c3c01b813177
2020-03-26 12:20:39 +00:00
TreeHugger Robot
4fdff5e5a4
Merge "Add unit tests for policy transparency on Fact Auth settings" into rvc-dev am: cb90ffafbb am: 706a7f19c2 am: c228661d69
...
Change-Id: Icc675a8ccff6b3c7b63d8f15d913dc11e58afd95
2020-03-26 12:20:38 +00:00
TreeHugger Robot
0a6e14020a
Merge "Add unit tests for policy transparency on Fact Auth settings" into rvc-dev am: cb90ffafbb am: 706a7f19c2
...
Change-Id: Iee2744338f3f022e8c56a1e548443bd6f055e136
2020-03-26 12:13:28 +00:00
TreeHugger Robot
52c1c77d93
Merge "Add unit tests for policy transparency on Fact Auth settings" into rvc-dev am: cb90ffafbb am: 6b754f1582
...
Change-Id: I99769d190e98a66a89c6716191384e4ae0fb4a6e
2020-03-26 12:13:27 +00:00
TreeHugger Robot
c228661d69
Merge "Add unit tests for policy transparency on Fact Auth settings" into rvc-dev am: cb90ffafbb am: 706a7f19c2
...
Change-Id: Ieb74e58728260f1b4e0a0d064e4d2e6062cd6c52
2020-03-26 12:13:17 +00:00
TreeHugger Robot
6b754f1582
Merge "Add unit tests for policy transparency on Fact Auth settings" into rvc-dev am: cb90ffafbb
...
Change-Id: Iab2416e3b76b379674fc9e834a192ecf42521f0d
2020-03-26 12:01:04 +00:00
TreeHugger Robot
706a7f19c2
Merge "Add unit tests for policy transparency on Fact Auth settings" into rvc-dev am: cb90ffafbb
...
Change-Id: I42908a919e7d1e5cf3730a3be9ed5005f3dc29a8
2020-03-26 12:00:53 +00:00
govenliu
0fc956bc57
[Wi-Fi] Refactor AddAppNetworksFragment to use WifiEntry but not AccessPoint.
...
Because WifiTracker2 refactoring in framework side is done, Settings App need to refactor AddAppNetworksFragment to use WifiEntry but not AccessPoint.
Bug: 152454787
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AddAppNetworksFragmentTest
Change-Id: Ica2fb7e7fcac112140e5d64f3e4193222c974352
2020-03-26 19:48:51 +08:00
TreeHugger Robot
cb90ffafbb
Merge "Add unit tests for policy transparency on Fact Auth settings" into rvc-dev
2020-03-26 11:47:07 +00:00
Treehugger Robot
1113b90992
[automerger skipped] Merge "Verify BluetoothDevice is not null before calling BluetoothHearingAid System APIs" am: 1ed4e81385 am: 533c10f747 -s ours am: 818a2050f5 -s ours am: 4f6b63056c -s ours am: 07cb597568 -s ours
...
am skip reason: Change-Id Ic6de2ccd81dc66ce79afcd91f18e92e959c8b12b with SHA-1 5bce75f0fb
2020-03-26 11:27:01 +00:00
Treehugger Robot
07cb597568
[automerger skipped] Merge "Verify BluetoothDevice is not null before calling BluetoothHearingAid System APIs" am: 1ed4e81385 am: 533c10f747 -s ours am: 818a2050f5 -s ours am: 4f6b63056c -s ours
...
am skip reason: Change-Id Ic6de2ccd81dc66ce79afcd91f18e92e959c8b12b with SHA-1 5bce75f0fb
2020-03-26 11:14:21 +00:00
Treehugger Robot
4f6b63056c
[automerger skipped] Merge "Verify BluetoothDevice is not null before calling BluetoothHearingAid System APIs" am: 1ed4e81385 am: 533c10f747 -s ours am: 818a2050f5 -s ours
...
am skip reason: Change-Id Ic6de2ccd81dc66ce79afcd91f18e92e959c8b12b with SHA-1 5bce75f0fb
2020-03-26 10:55:21 +00:00
Bonian Chen
a38fac48ed
Merge "[Settings] Change the restart policy for MobileNetworkActivity" into rvc-dev am: fbe5a997d3 am: ada7e519fd am: 10db7d421b am: c28f3e7ac0 am: 613e738f98
...
Change-Id: Iba8daab9f7e0402043d7796cb32fbfec6e44769b
2020-03-26 10:42:35 +00:00
Jason Chiu
23560a03bb
Merge "Add metric logs for special cases in Display and Battery page" into rvc-dev am: 1a9e99b2b1 am: 920924f5fe am: defd3892ce am: bdf001ac9c am: 0edd5b1f4f
...
Change-Id: I1bc5f089ec5ae55ecfda412c75212cb2394364ba
2020-03-26 10:42:27 +00:00
Alex Johnston
a86f5a75a9
Merge "Fix keyboard overlap in work challenge landscape view" into rvc-dev am: a9bd149983 am: 5ccaa7e741 am: 8f02175692 am: 8d5a0d9e65 am: 3598b50bba
...
Change-Id: Icc5abf33e53b3bd522775e759705a5b1ee9535b2
2020-03-26 10:42:16 +00:00
Menghan Li
b09552376d
Merge "Remove the setSelectable() in ShortcutPrefrence" into rvc-dev am: b751a12a1c am: cfbd58ecc6 am: 6292c9bb58 am: 0793221e42 am: c04b9152f1
...
Change-Id: I1f73547bd95df00e364d3f637802762ec4a17a6d
2020-03-26 10:42:10 +00:00
Bonian Chen
f8d75a59cf
Merge "[Settings] Change the restart policy for MobileNetworkActivity" into rvc-dev am: fbe5a997d3 am: e8bfc75f22 am: 6e7dcb8d97 am: 4f3b36339e
...
Change-Id: Id627cded3b68bc0d152b44c9c74c11562826e5d2
2020-03-26 10:41:55 +00:00
Jason Chiu
94f51f944d
Merge "Add metric logs for special cases in Display and Battery page" into rvc-dev am: 1a9e99b2b1 am: 5299084eb6 am: 321061ca3f am: aa442981c9
...
Change-Id: I9963e847e7f34eba9eebfa7b81b6fe9ee7a635c5
2020-03-26 10:41:42 +00:00
Bonian Chen
56b3b877b2
Merge "[Settings] Change the restart policy for MobileNetworkActivity" into rvc-dev am: fbe5a997d3 am: ada7e519fd am: f63423f5da am: 6dcef8a4c1
...
Change-Id: I6f963850a9e59e7eb6341c882e1d2e7438df8802
2020-03-26 10:41:32 +00:00
Automerger Merge Worker
08e5e4bec6
Merge "Merge "Fix keyboard overlap in work challenge landscape view" into rvc-dev am: a9bd149983 am: 573a22387b" into rvc-d1-dev-plus-aosp am: 7fed1961e4 am: e9e4b63e3b
...
Change-Id: I585a8076ed7be44f34019f13d15323eaebd490df
2020-03-26 10:41:21 +00:00
Treehugger Robot
818a2050f5
[automerger skipped] Merge "Verify BluetoothDevice is not null before calling BluetoothHearingAid System APIs" am: 1ed4e81385 am: 533c10f747 -s ours
...
am skip reason: Change-Id Ic6de2ccd81dc66ce79afcd91f18e92e959c8b12b with SHA-1 5bce75f0fb
2020-03-26 10:41:05 +00:00
