Bonian Chen
486be49fc3
Merge "[Settings] Refactor of ApnSettings" am: afbbde35b6
am: 43d3caa835
am: 4fb049537d
...
Change-Id: I135efabfc47f2bfa800b6b3cb8b9c158a0f62de9
2020-03-19 17:35:58 +00:00
Bonian Chen
4fb049537d
Merge "[Settings] Refactor of ApnSettings" am: afbbde35b6
am: 43d3caa835
...
Change-Id: I5f31cd12c3819768452c417e062219937a269e8e
2020-03-19 17:24:10 +00:00
Bonian Chen
43d3caa835
Merge "[Settings] Refactor of ApnSettings" am: afbbde35b6
...
Change-Id: I17c240896ef2d462e938fea88e981e73a4a05db4
2020-03-19 17:06:58 +00:00
Bonian Chen
afbbde35b6
Merge "[Settings] Refactor of ApnSettings"
2020-03-19 16:54:42 +00:00
Anna Trostanetski
40462528f3
Merge "Show only listUIChanges instead of all" into rvc-dev am: 550a0459f2
am: fed5fd2ff3
...
Change-Id: I9f86532aed25539a87671dcf171f05616825a87d
2020-03-19 15:02:26 +00:00
Anna Trostanetski
8d3e10a881
Merge "Show only listUIChanges instead of all" into rvc-dev am: 550a0459f2
am: ad2cfe0576
...
Change-Id: I3aedd6e5e94cab50253a30563894b2c7ff618d4d
2020-03-19 15:01:24 +00:00
Anna Trostanetski
fed5fd2ff3
Merge "Show only listUIChanges instead of all" into rvc-dev am: 550a0459f2
...
Change-Id: Ia2349493f4cdaa63ba85ea336ef670bf68d1e7fd
2020-03-19 15:00:23 +00:00
Anna Trostanetski
ad2cfe0576
Merge "Show only listUIChanges instead of all" into rvc-dev am: 550a0459f2
...
Change-Id: I7aee0a9989d928d787288603abe5bcc043c648ad
2020-03-19 14:53:50 +00:00
Anna Trostanetski
550a0459f2
Merge "Show only listUIChanges instead of all" into rvc-dev
2020-03-19 14:52:19 +00:00
TreeHugger Robot
a16ba78bf5
Merge "[5G settings UI] add String for the 5G limited VoLTE dialog" into rvc-dev am: 856079384a
am: f5af9891bd
...
Change-Id: Ida82ba9ef0670079348cb0f78ba75a7eec16e80a
2020-03-19 10:09:34 +00:00
TreeHugger Robot
3d414fb9d4
Merge "[5G settings UI] add String for the 5G limited VoLTE dialog" into rvc-dev am: 856079384a
am: 8bc2aced91
...
Change-Id: Iee7bb4d277f606962def4382beed3cb873886b94
2020-03-19 10:09:16 +00:00
TreeHugger Robot
f5af9891bd
Merge "[5G settings UI] add String for the 5G limited VoLTE dialog" into rvc-dev am: 856079384a
...
Change-Id: I168ecbd9eea24b556dca1d8fa708631831cc0bab
2020-03-19 09:58:48 +00:00
TreeHugger Robot
8bc2aced91
Merge "[5G settings UI] add String for the 5G limited VoLTE dialog" into rvc-dev am: 856079384a
...
Change-Id: I18216a296b2b65bd445a0bfdc6b98f13f2276d9c
2020-03-19 09:58:38 +00:00
TreeHugger Robot
856079384a
Merge "[5G settings UI] add String for the 5G limited VoLTE dialog" into rvc-dev
2020-03-19 09:43:40 +00:00
atrost
74117346a6
Show only listUIChanges instead of all
...
Use the new method that filters out changes that shouldn't be in the
developer UI.
Exempt-From-Owner-Approval: Roll forward of unchanged reverted change previously approved.
Test: make RunSettingsRoboTests ROBOTEST_FILTER=PlatformCompatDashboardTest
Bug: 151299145
Change-Id: I5b461b33484a38d0c6a5b7bf7e928231dd662668
2020-03-19 09:30:15 +00:00
Lee Chou
a223f0db18
Merge "Adds logging to confirm esim deletion feature" into rvc-dev am: fbde0b3b39
am: 7bb14b02f1
...
Change-Id: I3ab6aeadabadac7153ae39d53e4ba77f69d2aee4
2020-03-19 08:08:43 +00:00
TreeHugger Robot
48b624f397
Merge "Tweak string for Display over other apps" into rvc-dev am: f210cf3c44
am: a69c3d9c41
...
Change-Id: I75219618e2e5366366b3841172e97d5fbb1eeda0
2020-03-19 08:08:16 +00:00
Lee Chou
70eb62ac49
Merge "Adds logging to confirm esim deletion feature" into rvc-dev am: fbde0b3b39
am: 01ea52c474
...
Change-Id: I6e2cb5666fd786755c94d8f398649bab083b2293
2020-03-19 08:05:41 +00:00
TreeHugger Robot
33b978d2e7
Merge "Tweak string for Display over other apps" into rvc-dev am: f210cf3c44
am: 4731f3c571
...
Change-Id: I50ef65372f59877593ea4d5d10c26b4db715867f
2020-03-19 08:05:27 +00:00
Lee Chou
7bb14b02f1
Merge "Adds logging to confirm esim deletion feature" into rvc-dev am: fbde0b3b39
...
Change-Id: I33ded07c61539326cd78839c2006a12bb4fe017e
2020-03-19 07:46:31 +00:00
Lee Chou
01ea52c474
Merge "Adds logging to confirm esim deletion feature" into rvc-dev am: fbde0b3b39
...
Change-Id: I963339e5cb2615d54e23929fdf97ce837f18495f
2020-03-19 07:46:18 +00:00
TreeHugger Robot
a69c3d9c41
Merge "Tweak string for Display over other apps" into rvc-dev am: f210cf3c44
...
Change-Id: I562abe2b66d199babf205497158a13ae935f7b06
2020-03-19 07:45:59 +00:00
TreeHugger Robot
4731f3c571
Merge "Tweak string for Display over other apps" into rvc-dev am: f210cf3c44
...
Change-Id: If8a9610b3d12eeff785d09b17731bb114c85cd68
2020-03-19 07:45:46 +00:00
Lee Chou
fbde0b3b39
Merge "Adds logging to confirm esim deletion feature" into rvc-dev
2020-03-19 07:44:20 +00:00
TreeHugger Robot
f210cf3c44
Merge "Tweak string for Display over other apps" into rvc-dev
2020-03-19 07:26:03 +00:00
tim peng
1531ccc5a2
Merge "Close panel when media stop" into rvc-dev am: 91ad46fa60
am: 8e8ac25c41
...
Change-Id: Ib67b9ebcf09e87fb53eee0f3b267ed7d79395036
2020-03-19 06:41:06 +00:00
tim peng
65c0fd1747
Merge "Close panel when media stop" into rvc-dev am: 91ad46fa60
am: 01d3b13273
...
Change-Id: Ie9461236f3f801f1eaa6c07420829f51d680fc72
2020-03-19 06:40:38 +00:00
tim peng
8e8ac25c41
Merge "Close panel when media stop" into rvc-dev am: 91ad46fa60
...
Change-Id: I0015e42b8a6e1bf4fd0c96807e2465a12af84df9
2020-03-19 06:26:54 +00:00
tim peng
01d3b13273
Merge "Close panel when media stop" into rvc-dev am: 91ad46fa60
...
Change-Id: Icbd0a3472d2a4cdb2c7b5cd4c8fef0464c736e87
2020-03-19 06:26:50 +00:00
tim peng
91ad46fa60
Merge "Close panel when media stop" into rvc-dev
2020-03-19 06:08:05 +00:00
Treehugger Robot
0ab49a04ac
[automerger skipped] Merge "Fix sim pin lock preference disappear in dual sim." am: 2dd19966b7
am: 51c080aaf9
-s ours am: 3896ca809a
-s ours
...
am skip reason: Change-Id I91b551bc363b8ecb0a4b6b40e9de79c74ccd76fd with SHA-1 3d54554521
is in history
Change-Id: I0fab0c9e248dc48e69dcb45f2e7e0dd3db9c7905
2020-03-19 05:49:50 +00:00
Treehugger Robot
3896ca809a
[automerger skipped] Merge "Fix sim pin lock preference disappear in dual sim." am: 2dd19966b7
am: 51c080aaf9
-s ours
...
am skip reason: Change-Id I91b551bc363b8ecb0a4b6b40e9de79c74ccd76fd with SHA-1 3d54554521
is in history
Change-Id: I4cb5b55932b67330e1d167c80525172f4f86217b
2020-03-19 05:35:12 +00:00
Treehugger Robot
51c080aaf9
Merge "Fix sim pin lock preference disappear in dual sim." am: 2dd19966b7
...
Change-Id: I11c1999d2ad4502366acf8b29946d4412ed393c2
2020-03-19 05:12:32 +00:00
Bonian Chen
5cb2d1e00a
Merge "[Settings] Replace ImsManager#getImsServiceState()" into rvc-dev am: c073abaf2e
am: 7083092623
...
Change-Id: Ide9f91e52c4d5da97f4825a67414425c75b06f90
2020-03-19 05:12:00 +00:00
Bonian Chen
0013a04115
Merge "[Settings] Replace ImsManager#getImsServiceState()" into rvc-dev am: c073abaf2e
am: a65de8cd51
...
Change-Id: I11aa6f9d0cb3fa1a76a9f0d0e503f0883bc15cec
2020-03-19 05:04:56 +00:00
Tsung-Mao Fang
6f6e6810ae
Tweak string for Display over other apps
...
Fix: 144901996
Test: Visual
Change-Id: I5dacf8146130431624300d04421351a87ebd4d23
2020-03-19 05:04:53 +00:00
Betty Chang
e997d9850c
[automerger skipped] Merge "[Mainline] Use public method in SubscriptionManager for mainline" am: e5f9bde2fd
am: f695abfc29
-s ours am: 74304904c7
-s ours
...
am skip reason: Change-Id I4d6113561906af5c9e4ac7737aefac17c926059a with SHA-1 db816c9dad
is in history
Change-Id: Ia7f6d8c97eb96ad8188df5740d1769e574f7e313
2020-03-19 05:04:45 +00:00
Treehugger Robot
2dd19966b7
Merge "Fix sim pin lock preference disappear in dual sim."
2020-03-19 04:57:26 +00:00
Bonian Chen
a65de8cd51
Merge "[Settings] Replace ImsManager#getImsServiceState()" into rvc-dev am: c073abaf2e
...
Change-Id: Id53c6a31d6c3dcf61482f1d3fcff13bb17a6ffa3
2020-03-19 04:48:29 +00:00
Bonian Chen
7083092623
Merge "[Settings] Replace ImsManager#getImsServiceState()" into rvc-dev am: c073abaf2e
...
Change-Id: I74165063a6b4924529cb4e25652756fa713b5048
2020-03-19 04:48:18 +00:00
Betty Chang
74304904c7
[automerger skipped] Merge "[Mainline] Use public method in SubscriptionManager for mainline" am: e5f9bde2fd
am: f695abfc29
-s ours
...
am skip reason: Change-Id I4d6113561906af5c9e4ac7737aefac17c926059a with SHA-1 db816c9dad
is in history
Change-Id: I3e3d9481426bbb02dc7be34dfabd95a35731cda2
2020-03-19 04:42:42 +00:00
Bonian Chen
c073abaf2e
Merge "[Settings] Replace ImsManager#getImsServiceState()" into rvc-dev
2020-03-19 04:35:39 +00:00
Betty Chang
f695abfc29
Merge "[Mainline] Use public method in SubscriptionManager for mainline" am: e5f9bde2fd
...
Change-Id: I3a4b569e11a2c8235ce9adfa051cd6f795a02678
2020-03-19 04:29:29 +00:00
SongFerngWang
6c9ce4d892
Fix sim pin lock preference disappear in dual sim.
...
If one sim hide the preference and another one show the preference,
the preference always hide. The root cause is config value is wrong.
It should get config with subid.
Bug: 149800931
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SimLockPreferenceControllerTest
Change-Id: I91b551bc363b8ecb0a4b6b40e9de79c74ccd76fd
Merged-In: I91b551bc363b8ecb0a4b6b40e9de79c74ccd76fd
2020-03-19 12:13:37 +08:00
Betty Chang
e5f9bde2fd
Merge "[Mainline] Use public method in SubscriptionManager for mainline"
2020-03-19 04:09:34 +00:00
Lee Chou
443cfd2ef4
Adds logging to confirm esim deletion feature
...
Bug: 138861284
Test: make SettingsGoogle and manual testing
Change-Id: Ie5f6f6a31003733ae7abd9c04e9b3c371d5051c4
2020-03-19 12:07:01 +08:00
SongFerngWang
4f0d7b3781
[5G settings UI] add String for the 5G limited VoLTE dialog
...
while User disable VoLTE, UE show warning Dialog for 5G disable
add String for it.
Bug: 151313654
Test: build pass.
Change-Id: I2246664f1acbd2489dc3540486a7e1fa08d66656
2020-03-19 11:17:45 +08:00
TreeHugger Robot
09ed274f05
[automerger skipped] Merge "Rename "Tap & pay" to "Contactless payments"" into rvc-dev am: c114c5b59d
am: 97cc247663
-s ours
...
am skip reason: Change-Id I412c5b5681a85d482541ae30faa13e904942b612 with SHA-1 7f11d3f74a
is in history
Change-Id: I95b0e51c6cf838c395fa330e14561e45fa535739
2020-03-19 03:12:49 +00:00
TreeHugger Robot
9e94fc6afa
Merge "Rename "Tap & pay" to "Contactless payments"" into rvc-dev am: c114c5b59d
am: dde6e031f7
...
Change-Id: Id7287ffa053c08817c3c4f5ba71dea3ab649a21f
2020-03-19 03:12:28 +00:00
TreeHugger Robot
97cc247663
Merge "Rename "Tap & pay" to "Contactless payments"" into rvc-dev am: c114c5b59d
...
Change-Id: Icad20acd12a7bf4e2ee9f95c389c590e3d458071
2020-03-19 02:52:30 +00:00