Automerger Merge Worker
987441d843
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 am: 3773751627
...
Change-Id: If7607352a3d7441d357e8fc6b457f1546c16bd04
2020-03-26 10:41:03 +00:00
Automerger Merge Worker
1cd3b12406
Merge "Merge "Remove the setSelectable() in ShortcutPrefrence" into rvc-dev am: b751a12a1c am: cabc215a21" into rvc-d1-dev-plus-aosp am: e3d76788f7 am: 3c1b879907
...
Change-Id: Icdce6f19dfe71d7c90b2b6b565b3675251e69688
2020-03-26 10:40:53 +00:00
Alex Johnston
99a1185744
Merge "Fix keyboard overlap in work challenge landscape view" into rvc-dev am: a9bd149983 am: 5ccaa7e741 am: f44f0fba0e am: 059dafa336
...
Change-Id: I31fc4c669470053b55f9023d40ffdf02545f5180
2020-03-26 10:40:42 +00:00
Menghan Li
8242c7da1b
Merge "Remove the setSelectable() in ShortcutPrefrence" into rvc-dev am: b751a12a1c am: cfbd58ecc6 am: b8d0e246ca am: 20d2291582
...
Change-Id: I3debee9ffcc63e197b0b564df9aac31d584e160a
2020-03-26 10:40:36 +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
Alex Johnston
8f02175692
Merge "Fix keyboard overlap in work challenge landscape view" into rvc-dev am: a9bd149983 am: 5ccaa7e741
...
Change-Id: I52dbe23cbaf8f9b854e16f0e0b540eb8bb193987
2020-03-26 09:59:03 +00:00
Jason Chiu
436fd363a2
Merge "Add metric logs for special cases in Display and Battery page" into rvc-dev am: 1a9e99b2b1 am: 920924f5fe
...
Change-Id: Id7aeee1a04db2574632d676bcbba972734ca4cb2
2020-03-26 09:59:00 +00:00
Automerger Merge Worker
e3d76788f7
Merge "Merge "Remove the setSelectable() in ShortcutPrefrence" into rvc-dev am: b751a12a1c am: cabc215a21" into rvc-d1-dev-plus-aosp
2020-03-26 09:58:59 +00:00
Menghan Li
6292c9bb58
Merge "Remove the setSelectable() in ShortcutPrefrence" into rvc-dev am: b751a12a1c am: cfbd58ecc6
...
Change-Id: Id412d26d34fa35efea678ab1d7b89c18c4fe770b
2020-03-26 09:58:57 +00:00
Menghan Li
1c33b0298e
Merge "Remove the setSelectable() in ShortcutPrefrence" into rvc-dev am: b751a12a1c am: cabc215a21
...
Change-Id: Ia26e16bbe00299699a71ad1a7876205f743d8313
2020-03-26 09:58:57 +00:00
Alex Johnston
f44f0fba0e
Merge "Fix keyboard overlap in work challenge landscape view" into rvc-dev am: a9bd149983 am: 5ccaa7e741
...
Change-Id: If4b06927cdf811b370ed50159578c1c243339042
2020-03-26 09:58:53 +00:00
Menghan Li
b8d0e246ca
Merge "Remove the setSelectable() in ShortcutPrefrence" into rvc-dev am: b751a12a1c am: cfbd58ecc6
...
Change-Id: If08f487a59f18220deedbb2b6433e9580c444850
2020-03-26 09:58:43 +00:00
Bonian Chen
e8bfc75f22
Merge "[Settings] Change the restart policy for MobileNetworkActivity" into rvc-dev am: fbe5a997d3
...
Change-Id: Ie50623f8d49b5acd37b872f65033f34376125a69
2020-03-26 09:53:59 +00:00
Jason Chiu
5299084eb6
Merge "Add metric logs for special cases in Display and Battery page" into rvc-dev am: 1a9e99b2b1
...
Change-Id: I4b61b4e0ff2f1bbc4bc99597e099cf254f16cb88
2020-03-26 09:53:51 +00:00
Bonian Chen
ada7e519fd
Merge "[Settings] Change the restart policy for MobileNetworkActivity" into rvc-dev am: fbe5a997d3
...
Change-Id: Ibb1ccf9625f7aa7d644bd5f4071068af007507ec
2020-03-26 09:53:41 +00:00
Jason Chiu
920924f5fe
Merge "Add metric logs for special cases in Display and Battery page" into rvc-dev am: 1a9e99b2b1
...
Change-Id: Ib03b1c15256365b1b18f3d0b76e4d567fb3880d0
2020-03-26 09:53:28 +00:00
Bonian Chen
fbe5a997d3
Merge "[Settings] Change the restart policy for MobileNetworkActivity" into rvc-dev
2020-03-26 09:47:54 +00:00
Jason Chiu
1a9e99b2b1
Merge "Add metric logs for special cases in Display and Battery page" into rvc-dev
2020-03-26 09:47:18 +00:00
Bonian Chen
d412e06c39
[Settings] Change the restart policy for MobileNetworkActivity
...
Prevent recreating the fragment in MobileNetworkActivity when the
subId is the same.
Bug: 141833767
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=MobileNetworkActivityTest
Change-Id: I8167781fb462efa310a5d6bac76d880dbc9b6bfc
2020-03-26 17:44:17 +08:00
Alex Johnston
573a22387b
Merge "Fix keyboard overlap in work challenge landscape view" into rvc-dev am: a9bd149983
...
Change-Id: I007ef55417cf0e0bb6ec95a1fc67beb4afc2ad78
2020-03-26 09:42:20 +00:00
Menghan Li
cabc215a21
Merge "Remove the setSelectable() in ShortcutPrefrence" into rvc-dev am: b751a12a1c
...
Change-Id: Ia62fdeb9f02129c3f22c0e4be581ce46e1bf6ff4
2020-03-26 09:42:11 +00:00
Alex Johnston
5ccaa7e741
Merge "Fix keyboard overlap in work challenge landscape view" into rvc-dev am: a9bd149983
...
Change-Id: Ieeff9f5cd40716539fc9d13fb81701d1bcd7b3d9
2020-03-26 09:42:05 +00:00
Menghan Li
cfbd58ecc6
Merge "Remove the setSelectable() in ShortcutPrefrence" into rvc-dev am: b751a12a1c
...
Change-Id: I7656da884d4d656b7d4cba9b12bcf017b3e5edcb
2020-03-26 09:41:57 +00:00
Alex Johnston
a9bd149983
Merge "Fix keyboard overlap in work challenge landscape view" into rvc-dev
2020-03-26 09:40:20 +00:00
