Bonian Chen
091a0ebc85
Merge "[Settings] Code refactor" into rvc-dev am: 05cb60b258 am: 403c8aa4ee am: 1afdc562db
...
Change-Id: Ic014fedafca2e2f491d2a26a3e2c710a27c241e3
2020-04-08 05:35:26 +00:00
Bonian Chen
2fb82ffac9
[automerger skipped] Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." am: 4e8786c09b am: c034169ccd -s ours am: 8ab7db3359 -s ours am: 7322f57974 -s ours
...
am skip reason: Change-Id I0121f06efb5257dccc05ad06b93a9db263f012b5 with SHA-1 64ac0d4a74
2020-04-08 05:35:20 +00:00
Bonian Chen
e01cebc885
Merge "[Settings] Code refactor" into rvc-dev am: 05cb60b258 am: a93ddbc42f am: b1b0d9981a
...
Change-Id: I11bd7298c1397f00a1ba598fc9637a88b287700b
2020-04-08 05:35:06 +00:00
Bonian Chen
1afdc562db
Merge "[Settings] Code refactor" into rvc-dev am: 05cb60b258 am: 403c8aa4ee
...
Change-Id: I2bfd26b4715b9dc701649e8a86ff3ac7a7f6a36b
2020-04-08 05:23:36 +00:00
Bonian Chen
7322f57974
[automerger skipped] Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." am: 4e8786c09b am: c034169ccd -s ours am: 8ab7db3359 -s ours
...
am skip reason: Change-Id I0121f06efb5257dccc05ad06b93a9db263f012b5 with SHA-1 64ac0d4a74
2020-04-08 05:21:57 +00:00
Bonian Chen
b1b0d9981a
Merge "[Settings] Code refactor" into rvc-dev am: 05cb60b258 am: a93ddbc42f
...
Change-Id: I420e7078ea39f8ea2a110c5156911a5f40497b2d
2020-04-08 05:21:43 +00:00
Bonian Chen
8ab7db3359
[automerger skipped] Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." am: 4e8786c09b am: c034169ccd -s ours
...
am skip reason: Change-Id I0121f06efb5257dccc05ad06b93a9db263f012b5 with SHA-1 64ac0d4a74
2020-04-08 05:21:24 +00:00
Bonian Chen
c034169ccd
Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." am: 4e8786c09b
...
Change-Id: I36f17b8206bd397306dca9d37e2bd3cf48700321
2020-04-08 05:08:49 +00:00
Bonian Chen
a93ddbc42f
Merge "[Settings] Code refactor" into rvc-dev am: 05cb60b258
...
Change-Id: I793ec6eca3bab04122ebcd5e6a957d16fe14f5e0
2020-04-08 05:03:17 +00:00
Bonian Chen
403c8aa4ee
Merge "[Settings] Code refactor" into rvc-dev am: 05cb60b258
...
Change-Id: I59eea93d852d4397306099e14c202c795761a446
2020-04-08 05:03:08 +00:00
Bonian Chen
4e8786c09b
Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option."
2020-04-08 04:57:12 +00:00
Bonian Chen
05cb60b258
Merge "[Settings] Code refactor" into rvc-dev
2020-04-08 04:52:23 +00:00
Bonian Chen
84e2758ac7
Merge "Merge "Catch crash in mobile network ProgressDialog" am: aaee4539c7 am: 840506e88a am: 2d84cdbc3a am: e6c57426cd am: 7300bab2b6" into rvc-dev am: bb9fbb60f0 am: 9140b1d29f am: 03e935f435 am: d9fadefbe3
...
Change-Id: Ia06d7239e0d1068f4009fb89c3f4ee3cc3340e76
2020-04-08 04:25:02 +00:00
tim peng
99aa7b79f4
Merge "Settings crashed by a null worker" into rvc-dev am: e189ac522e am: 3ffe34a48b am: 76b3da3eee am: 21ca7a4348
...
Change-Id: I6b7ff9d0d0e3f33978694e7f1535cfce3ff66fba
2020-04-08 04:24:55 +00:00
tim peng
f0ebb2620b
Merge "Transferring to a cast device should not close the output switcher" into rvc-dev am: f1f7b861d9 am: f8d7c09e36 am: 6e423144e7 am: a789813202
...
Change-Id: I4aba86d198fb763e45187ad978ceaf6afa5f1c88
2020-04-08 04:24:38 +00:00
Bonian Chen
4667eae476
[automerger skipped] Merge "[Settings] Changes for supporting replacing ImsManager" am: 449f76d55c am: b35536dda8 -s ours am: 9be78b056f -s ours am: 27ac6ed0a3 -s ours
...
am skip reason: Change-Id I10aff50b6f3fc50b2f336ee320740f9f4a81e256 with SHA-1 bd03b17a62
2020-04-08 04:23:56 +00:00
Bonian Chen
27ac6ed0a3
[automerger skipped] Merge "[Settings] Changes for supporting replacing ImsManager" am: 449f76d55c am: b35536dda8 -s ours am: 9be78b056f -s ours
...
am skip reason: Change-Id I10aff50b6f3fc50b2f336ee320740f9f4a81e256 with SHA-1 bd03b17a62
2020-04-08 04:12:03 +00:00
Bonian Chen
ec9a21f5a9
Merge "Merge "Catch crash in mobile network ProgressDialog" am: aaee4539c7 am: 840506e88a am: 2d84cdbc3a am: e6c57426cd am: 7300bab2b6" into rvc-dev am: bb9fbb60f0 am: ca4d249fc9 am: d0b5dd2d20
...
Change-Id: Iab9275062f681544418e092939c2d3a75722269b
2020-04-08 04:05:03 +00:00
tim peng
744d1e2b05
Merge "Settings crashed by a null worker" into rvc-dev am: e189ac522e am: fa54aab4d1 am: a9fad2e73d
...
Change-Id: I37becaec8153ed50b33b74487bd4536dafd92728
2020-04-08 04:04:58 +00:00
Automerger Merge Worker
d8414840e4
Merge "Merge "Merge "Catch crash in mobile network ProgressDialog" am: aaee4539c7 am: 840506e88a am: 2d84cdbc3a am: e6c57426cd am: 7300bab2b6" into rvc-dev am: bb9fbb60f0 am: 9140b1d29f" into rvc-d1-dev-plus-aosp am: 4d4ff44795
...
Change-Id: I44203a6cbf4a0d0a9545df58695731b7e6caf090
2020-04-08 04:04:53 +00:00
Automerger Merge Worker
a6d2ffeff1
Merge "Merge "Transferring to a cast device should not close the output switcher" into rvc-dev am: f1f7b861d9 am: 778317679a" into rvc-d1-dev-plus-aosp am: fed400e8bd
...
Change-Id: I8a93427d4fede1bba87d42cadf0167ff5e1016a8
2020-04-08 04:04:44 +00:00
tim peng
100703a82b
Merge "Settings crashed by a null worker" into rvc-dev am: e189ac522e am: 3ffe34a48b am: 91c389b9a2
...
Change-Id: I34c3cc3f30ded70504d1ed3a1f8949deb8917723
2020-04-08 04:04:37 +00:00
Bonian Chen
d9fadefbe3
Merge "Merge "Catch crash in mobile network ProgressDialog" am: aaee4539c7 am: 840506e88a am: 2d84cdbc3a am: e6c57426cd am: 7300bab2b6" into rvc-dev am: bb9fbb60f0 am: 9140b1d29f am: 03e935f435
...
Change-Id: If482e609b9b7d043082af4c06ad0f31b3bbcda2d
2020-04-08 04:04:32 +00:00
tim peng
21ca7a4348
Merge "Settings crashed by a null worker" into rvc-dev am: e189ac522e am: 3ffe34a48b am: 76b3da3eee
...
Change-Id: I6611149863e814988ec4d7f6252517a60f1cf538
2020-04-08 04:04:27 +00:00
tim peng
4aa0d4d13a
Merge "Transferring to a cast device should not close the output switcher" into rvc-dev am: f1f7b861d9 am: f8d7c09e36 am: 38315ae8af
...
Change-Id: I26fcb6afddf154115e5bd5bcd23a3fdb1229ee7e
2020-04-08 04:04:16 +00:00
tim peng
a789813202
Merge "Transferring to a cast device should not close the output switcher" into rvc-dev am: f1f7b861d9 am: f8d7c09e36 am: 6e423144e7
...
Change-Id: I4296dce2d19f8615be409884fc04057d0b7427b2
2020-04-08 04:04:07 +00:00
Bonian Chen
9be78b056f
[automerger skipped] Merge "[Settings] Changes for supporting replacing ImsManager" am: 449f76d55c am: b35536dda8 -s ours
...
am skip reason: Change-Id I10aff50b6f3fc50b2f336ee320740f9f4a81e256 with SHA-1 bd03b17a62
2020-04-08 03:54:23 +00:00
Bonian Chen
03e935f435
Merge "Merge "Catch crash in mobile network ProgressDialog" am: aaee4539c7 am: 840506e88a am: 2d84cdbc3a am: e6c57426cd am: 7300bab2b6" into rvc-dev am: bb9fbb60f0 am: 9140b1d29f
...
Change-Id: Ibc81e28dc1a5c4ae07199c2627035d2e4f6716d3
2020-04-08 03:50:47 +00:00
Bonian Chen
d0b5dd2d20
Merge "Merge "Catch crash in mobile network ProgressDialog" am: aaee4539c7 am: 840506e88a am: 2d84cdbc3a am: e6c57426cd am: 7300bab2b6" into rvc-dev am: bb9fbb60f0 am: ca4d249fc9
...
Change-Id: Ic468123d204ddbc7040611c3bc9f1832fd24ce54
2020-04-08 03:50:44 +00:00
tim peng
76b3da3eee
Merge "Settings crashed by a null worker" into rvc-dev am: e189ac522e am: 3ffe34a48b
...
Change-Id: I98ce7ff3c2375ee69847d772cf3fd8f8710c99c2
2020-04-08 03:50:42 +00:00
tim peng
a9fad2e73d
Merge "Settings crashed by a null worker" into rvc-dev am: e189ac522e am: fa54aab4d1
...
Change-Id: Idfd1aaa2b7743467d5319519584e18641be20726
2020-04-08 03:50:39 +00:00
Automerger Merge Worker
4d4ff44795
Merge "Merge "Merge "Catch crash in mobile network ProgressDialog" am: aaee4539c7 am: 840506e88a am: 2d84cdbc3a am: e6c57426cd am: 7300bab2b6" into rvc-dev am: bb9fbb60f0 am: 9140b1d29f" into rvc-d1-dev-plus-aosp
2020-04-08 03:50:34 +00:00
Automerger Merge Worker
fed400e8bd
Merge "Merge "Transferring to a cast device should not close the output switcher" into rvc-dev am: f1f7b861d9 am: 778317679a" into rvc-d1-dev-plus-aosp
2020-04-08 03:50:32 +00:00
Bonian Chen
501261e7d5
Merge "Merge "Catch crash in mobile network ProgressDialog" am: aaee4539c7 am: 840506e88a am: 2d84cdbc3a am: e6c57426cd am: 7300bab2b6" into rvc-dev am: bb9fbb60f0 am: 9140b1d29f
...
Change-Id: If79b2451b402d526fe66eff2586e55b348e8e9e3
2020-04-08 03:50:32 +00:00
tim peng
6e423144e7
Merge "Transferring to a cast device should not close the output switcher" into rvc-dev am: f1f7b861d9 am: f8d7c09e36
...
Change-Id: Ie0b24981147270289334843c48e22009415d2595
2020-04-08 03:50:30 +00:00
tim peng
7b739830f1
Merge "Transferring to a cast device should not close the output switcher" into rvc-dev am: f1f7b861d9 am: 778317679a
...
Change-Id: I58b14af188521fca8577388f5320c4f2957c884d
2020-04-08 03:50:29 +00:00
tim peng
91c389b9a2
Merge "Settings crashed by a null worker" into rvc-dev am: e189ac522e am: 3ffe34a48b
...
Change-Id: I9dbde9d6bee32a137a41a7b39d16be0218f32df6
2020-04-08 03:50:27 +00:00
tim peng
38315ae8af
Merge "Transferring to a cast device should not close the output switcher" into rvc-dev am: f1f7b861d9 am: f8d7c09e36
...
Change-Id: Ie51e102e2db56157da8723de911d4fc33cac43ef
2020-04-08 03:50:13 +00:00
Bonian Chen
b35536dda8
Merge "[Settings] Changes for supporting replacing ImsManager" am: 449f76d55c
...
Change-Id: I3c8fb5dc82165f42e6bee5742cddc48d934684ed
2020-04-08 03:41:01 +00:00
Bonian Chen
ca4d249fc9
Merge "Merge "Catch crash in mobile network ProgressDialog" am: aaee4539c7 am: 840506e88a am: 2d84cdbc3a am: e6c57426cd am: 7300bab2b6" into rvc-dev am: bb9fbb60f0
...
Change-Id: Id483c51c2eb4589c873a49ab8c77f9f6eaca12f7
2020-04-08 03:36:18 +00:00
tim peng
fa54aab4d1
Merge "Settings crashed by a null worker" into rvc-dev am: e189ac522e
...
Change-Id: Ia747117acf1a8d2e7a77049a013fb777e1ab64b9
2020-04-08 03:36:11 +00:00
Bonian Chen
9140b1d29f
Merge "Merge "Catch crash in mobile network ProgressDialog" am: aaee4539c7 am: 840506e88a am: 2d84cdbc3a am: e6c57426cd am: 7300bab2b6" into rvc-dev am: bb9fbb60f0
...
Change-Id: I15184d9be4569bd195a7416cad256f4943d2ca9b
2020-04-08 03:36:09 +00:00
tim peng
778317679a
Merge "Transferring to a cast device should not close the output switcher" into rvc-dev am: f1f7b861d9
...
Change-Id: I5cd836d2390ad92e2c7a1afb7973186327bfc98b
2020-04-08 03:36:04 +00:00
tim peng
3ffe34a48b
Merge "Settings crashed by a null worker" into rvc-dev am: e189ac522e
...
Change-Id: I4a837f5a6e19c1df63ef45e4579710cc40afda9c
2020-04-08 03:36:02 +00:00
tim peng
f8d7c09e36
Merge "Transferring to a cast device should not close the output switcher" into rvc-dev am: f1f7b861d9
...
Change-Id: Ib06f81892b8176fd9084543d6d970e15a50ac51d
2020-04-08 03:35:54 +00:00
Bonian Chen
bb9fbb60f0
Merge "Merge "Catch crash in mobile network ProgressDialog" am: aaee4539c7 am: 840506e88a am: 2d84cdbc3a am: e6c57426cd am: 7300bab2b6" into rvc-dev
2020-04-08 03:23:09 +00:00
Bonian Chen
449f76d55c
Merge "[Settings] Changes for supporting replacing ImsManager"
2020-04-08 03:20:43 +00:00
tim peng
e189ac522e
Merge "Settings crashed by a null worker" into rvc-dev
2020-04-08 03:18:31 +00:00
tim peng
f1f7b861d9
Merge "Transferring to a cast device should not close the output switcher" into rvc-dev
2020-04-08 03:18:09 +00:00
TreeHugger Robot
1d16220f45
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 5064d96e3a -s ours am: f97c675cde -s ours am: 0da8214ae4 -s ours am: 625cd52625 -s ours am: f790e1a0eb -s ours
...
am skip reason: subject contains skip directive
Change-Id: I9d827c9b946a0724c4e27acd907c71971040dda7
2020-04-08 01:36:41 +00:00
