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
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
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
Tobias Thierer
a854ddae3d
OWNERS: Remove tobiast.
...
Test: Manual CL review only.
Bug: 152399425
Change-Id: Ifca2d6e8ecd59a924c6e5d8ca60749be5d5c8728
2020-03-26 12:17:00 +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
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
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
Bonian Chen
613e738f98
Merge "[Settings] Change the restart policy for MobileNetworkActivity" into rvc-dev am: fbe5a997d3 am: ada7e519fd am: 10db7d421b am: c28f3e7ac0
...
Change-Id: I2fdda4d4595581467ddd047f1a896e5492553968
2020-03-26 10:36:33 +00:00
Jason Chiu
0edd5b1f4f
Merge "Add metric logs for special cases in Display and Battery page" into rvc-dev am: 1a9e99b2b1 am: 920924f5fe am: defd3892ce am: bdf001ac9c
...
Change-Id: Ibe86e1a89ea48c1672e2d805db7955dcb0abe696
2020-03-26 10:36:20 +00:00
Alex Johnston
3598b50bba
Merge "Fix keyboard overlap in work challenge landscape view" into rvc-dev am: a9bd149983 am: 5ccaa7e741 am: 8f02175692 am: 8d5a0d9e65
...
Change-Id: Ic8c0014e78a43ce7b6f7c557748b0040d49e4d72
2020-03-26 10:36:05 +00:00
Menghan Li
c04b9152f1
Merge "Remove the setSelectable() in ShortcutPrefrence" into rvc-dev am: b751a12a1c am: cfbd58ecc6 am: 6292c9bb58 am: 0793221e42
...
Change-Id: I9edc52f7c7963d4766bd829c7bf374a61bbd2190
2020-03-26 10:35:52 +00:00
Alex Johnston
74260a733f
Retain FRP data when FR is invoked in Settings
...
* If the device is an organization-owned managed
profile device and a FRP policy is set, the
factory reset protection data is no longer
erased from factory reset in Settings.
Bug: 148847767
Test: manual testing
Change-Id: Iebaf2446f23626b24db37f5173dc77f9dee25ba9
2020-03-26 10:29:52 +00:00
Treehugger Robot
533c10f747
Merge "Verify BluetoothDevice is not null before calling BluetoothHearingAid System APIs" am: 1ed4e81385
...
Change-Id: I3ab6b4458babf1bfd43c89fb74ae451cf05f9022
2020-03-26 10:25:32 +00:00
Bonian Chen
4f3b36339e
Merge "[Settings] Change the restart policy for MobileNetworkActivity" into rvc-dev am: fbe5a997d3 am: e8bfc75f22 am: 6e7dcb8d97
...
Change-Id: I385ad45a269cee3614c9ffc4db6527b97a9434d1
2020-03-26 10:25:23 +00:00
Jason Chiu
aa442981c9
Merge "Add metric logs for special cases in Display and Battery page" into rvc-dev am: 1a9e99b2b1 am: 5299084eb6 am: 321061ca3f
...
Change-Id: Ic220c045aad3a7a8948e1a4482e63c7b68a0d9cb
2020-03-26 10:25:14 +00:00
Bonian Chen
6dcef8a4c1
Merge "[Settings] Change the restart policy for MobileNetworkActivity" into rvc-dev am: fbe5a997d3 am: ada7e519fd am: f63423f5da
...
Change-Id: I39722d11f96bd1c66e7f10b5089388e223937147
2020-03-26 10:25:04 +00:00
Automerger Merge Worker
e9e4b63e3b
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
...
Change-Id: I3583bf87c3ba271e4278132c5c9a6484df9eea02
2020-03-26 10:24:52 +00:00
Bonian Chen
c28f3e7ac0
Merge "[Settings] Change the restart policy for MobileNetworkActivity" into rvc-dev am: fbe5a997d3 am: ada7e519fd am: 10db7d421b
...
Change-Id: I93ab595816d0f4ff04da81b3b4563bc92ff71365
2020-03-26 10:24:37 +00:00
Automerger Merge Worker
3773751627
Merge "Merge "Add metric logs for special cases in Display and Battery page" into rvc-dev am: 1a9e99b2b1 am: 920924f5fe" into rvc-d1-dev-plus-aosp am: 6217097f81
...
Change-Id: I71cc4c064e3731e4162855d25ced872b571d2e72
2020-03-26 10:24:35 +00:00
Jason Chiu
bdf001ac9c
Merge "Add metric logs for special cases in Display and Battery page" into rvc-dev am: 1a9e99b2b1 am: 920924f5fe am: defd3892ce
...
Change-Id: Ib6ae8f9e79a709c50748381f4e599328df0de2f2
2020-03-26 10:24:27 +00:00
Automerger Merge Worker
3c1b879907
Merge "Merge "Remove the setSelectable() in ShortcutPrefrence" into rvc-dev am: b751a12a1c am: cabc215a21" into rvc-d1-dev-plus-aosp am: e3d76788f7
...
Change-Id: I8dbdb0ea0b65c3c729b6606171cdf7739697f3df
2020-03-26 10:24:25 +00:00
Alex Johnston
8d5a0d9e65
Merge "Fix keyboard overlap in work challenge landscape view" into rvc-dev am: a9bd149983 am: 5ccaa7e741 am: 8f02175692
...
Change-Id: Iaf224c87649b15d69a88a8f03be3371270d7a67f
2020-03-26 10:24:16 +00:00
Alex Johnston
059dafa336
Merge "Fix keyboard overlap in work challenge landscape view" into rvc-dev am: a9bd149983 am: 5ccaa7e741 am: f44f0fba0e
...
Change-Id: I6d5d22335502c3a7cc310b0c37ac978041d5e1fe
2020-03-26 10:24:13 +00:00
Menghan Li
0793221e42
Merge "Remove the setSelectable() in ShortcutPrefrence" into rvc-dev am: b751a12a1c am: cfbd58ecc6 am: 6292c9bb58
...
Change-Id: Ie873d921878d46933321356d3f83bbb005dac99a
2020-03-26 10:24:03 +00:00
Menghan Li
20d2291582
Merge "Remove the setSelectable() in ShortcutPrefrence" into rvc-dev am: b751a12a1c am: cfbd58ecc6 am: b8d0e246ca
...
Change-Id: I89578950f5bf1f2fc74ebabdaf20eefd9c541028
2020-03-26 10:24:00 +00:00
Treehugger Robot
1ed4e81385
Merge "Verify BluetoothDevice is not null before calling BluetoothHearingAid System APIs"
2020-03-26 10:07:30 +00:00
Bonian Chen
6e7dcb8d97
Merge "[Settings] Change the restart policy for MobileNetworkActivity" into rvc-dev am: fbe5a997d3 am: e8bfc75f22
...
Change-Id: If9a3e39059d46f75d422e98799177c786513e1da
2020-03-26 09:59:29 +00:00
Jason Chiu
321061ca3f
Merge "Add metric logs for special cases in Display and Battery page" into rvc-dev am: 1a9e99b2b1 am: 5299084eb6
...
Change-Id: I5984c063934b324c9096c9774ff333b8000acc74
2020-03-26 09:59:21 +00:00
Bonian Chen
10db7d421b
Merge "[Settings] Change the restart policy for MobileNetworkActivity" into rvc-dev am: fbe5a997d3 am: ada7e519fd
...
Change-Id: I849faf4ef5cc71dafdb04f1c06dac8bd91f33c57
2020-03-26 09:59:17 +00:00
Bonian Chen
f63423f5da
Merge "[Settings] Change the restart policy for MobileNetworkActivity" into rvc-dev am: fbe5a997d3 am: ada7e519fd
...
Change-Id: I5d88ede47c721d2db2521477631ee87ec02922c5
2020-03-26 09:59:10 +00:00
Automerger Merge Worker
7fed1961e4
Merge "Merge "Fix keyboard overlap in work challenge landscape view" into rvc-dev am: a9bd149983 am: 573a22387b" into rvc-d1-dev-plus-aosp
2020-03-26 09:59:08 +00:00
Jason Chiu
defd3892ce
Merge "Add metric logs for special cases in Display and Battery page" into rvc-dev am: 1a9e99b2b1 am: 920924f5fe
...
Change-Id: Ia494aa972af088cc2d77091ace9408e79ac6f1d5
2020-03-26 09:59:08 +00:00
Automerger Merge Worker
6217097f81
Merge "Merge "Add metric logs for special cases in Display and Battery page" into rvc-dev am: 1a9e99b2b1 am: 920924f5fe" into rvc-d1-dev-plus-aosp
2020-03-26 09:59:07 +00:00
Alex Johnston
6fd8b1ee7b
Merge "Fix keyboard overlap in work challenge landscape view" into rvc-dev am: a9bd149983 am: 573a22387b
...
Change-Id: Ie1c74100280e00a7926d963ed84aef8349e70d06
2020-03-26 09:59:04 +00:00
