Commit Graph

61954 Commits

Author SHA1 Message Date
Hall Liu
900ccba596 Merge "Rename NotificationChannel#setBlockableSystem" into rvc-dev am: 64e48c2061 am: f0f5796b95 am: a81102b92c am: 30de5f4593
Change-Id: I18ffb79438ebc5cfb22b748953501f6a72ebf107
2020-03-19 21:54:53 +00:00
Peter Wang
cb911db546 Merge "[API Review] APIs in SubscriptionManager" into rvc-dev am: 6c95bb5cf6 am: 13dd87a9b8 am: 9009179333 am: 070cafccf6
Change-Id: Id46893adbcd8f4171d94e38cc745b02987d6a020
2020-03-19 21:35:26 +00:00
Hall Liu
30de5f4593 Merge "Rename NotificationChannel#setBlockableSystem" into rvc-dev am: 64e48c2061 am: f0f5796b95 am: a81102b92c
Change-Id: I6c0a09c6607b3951e602df4c65b84264c80b87af
2020-03-19 21:20:00 +00:00
Hall Liu
a81102b92c Merge "Rename NotificationChannel#setBlockableSystem" into rvc-dev am: 64e48c2061 am: f0f5796b95
Change-Id: Id08966f10e2c84d49b10aafee7d99d35f72c4d24
2020-03-19 21:11:44 +00:00
Hall Liu
f0f5796b95 Merge "Rename NotificationChannel#setBlockableSystem" into rvc-dev am: 64e48c2061
Change-Id: I9224f80e87ab21b00ce78427c093b5b686c9ddea
2020-03-19 21:09:09 +00:00
Peter Wang
070cafccf6 Merge "[API Review] APIs in SubscriptionManager" into rvc-dev am: 6c95bb5cf6 am: 13dd87a9b8 am: 9009179333
Change-Id: Ic6b240fbf50993cb2c6ba7524af41ff0689477ee
2020-03-19 21:08:33 +00:00
Hall Liu
64e48c2061 Merge "Rename NotificationChannel#setBlockableSystem" into rvc-dev 2020-03-19 21:06:54 +00:00
Peter Wang
1e01a47192 Merge "[API Review] APIs in SubscriptionManager" into rvc-dev am: 6c95bb5cf6 am: e85186f38e am: b3bf9454eb am: 0e48aeb71d
Change-Id: Iebd334eab73b33ec6a7b504cb41b357431536722
2020-03-19 20:49:45 +00:00
Peter Wang
9009179333 Merge "[API Review] APIs in SubscriptionManager" into rvc-dev am: 6c95bb5cf6 am: 13dd87a9b8
Change-Id: Ieace1b8da5732c6634e10e1e39f0d959bb81566f
2020-03-19 20:46:10 +00:00
Sarah Chin
241a67cb87 [automerger skipped] Merge "5G meteredness for telephony framework" into qt-qpr1-dev am: bd8bbca27c -s ours am: 13ee012dce -s ours am: 6930e2adc0 -s ours am: 0c6549f991 -s ours am: 5d20e899f8 -s ours am: 2ea07e582f -s ours
am skip reason: Change-Id I0c8e84f74fd1f69ffc7e1046819966fcb04732a6 with SHA-1 20974b6814 is in history

Change-Id: I924e7ef3700452e1339939292e59766a0812ba02
2020-03-19 20:43:20 +00:00
Peter Wang
0e48aeb71d Merge "[API Review] APIs in SubscriptionManager" into rvc-dev am: 6c95bb5cf6 am: e85186f38e am: b3bf9454eb
Change-Id: I3d7b3e535c496673cc63ccc528e6be3bcb308b71
2020-03-19 20:32:09 +00:00
Sarah Chin
2ea07e582f [automerger skipped] Merge "5G meteredness for telephony framework" into qt-qpr1-dev am: bd8bbca27c -s ours am: 13ee012dce -s ours am: 6930e2adc0 -s ours am: 0c6549f991 -s ours am: 5d20e899f8 -s ours
am skip reason: Change-Id I0c8e84f74fd1f69ffc7e1046819966fcb04732a6 with SHA-1 20974b6814 is in history

Change-Id: Iaff04cb1dc1f69c19c9a490dd3b474babe09fa8a
2020-03-19 20:31:37 +00:00
Peter Wang
13dd87a9b8 Merge "[API Review] APIs in SubscriptionManager" into rvc-dev am: 6c95bb5cf6
Change-Id: Iac656249241c2b5fe3c74f9accfc84b7195cc153
2020-03-19 20:29:16 +00:00
TreeHugger Robot
fe3b130517 Merge "Add Ethernet Tethering settings" into rvc-dev am: 635c0e7f78 am: 866a77ee75 am: e17994f485 am: be79393a24 am: 79a80a7a0a
Change-Id: If74cc996a01bb4f3243eaa3323f185f635de8e9c
2020-03-19 20:24:00 +00:00
Sarah Chin
9aa3016424 [automerger skipped] Merge "5G meteredness for telephony framework" into qt-qpr1-dev am: bd8bbca27c -s ours am: 13ee012dce -s ours am: 6930e2adc0 -s ours am: b556a1c812 -s ours am: b4d64a8c4c -s ours
am skip reason: Change-Id I0c8e84f74fd1f69ffc7e1046819966fcb04732a6 with SHA-1 20974b6814 is in history

Change-Id: I1bdce9ce541361d2ed85e12d242262ba4a51bd3e
2020-03-19 20:23:46 +00:00
Sarah Chin
5a74589923 [automerger skipped] Merge "5G meteredness for telephony framework" into qt-qpr1-dev am: bd8bbca27c -s ours am: 13ee012dce -s ours am: 1a37fd26fa -s ours am: 44fad38f1b -s ours am: 3ce6b8a1a6 -s ours
am skip reason: Change-Id I0c8e84f74fd1f69ffc7e1046819966fcb04732a6 with SHA-1 9ea18281ee is in history

Change-Id: If4ef4b0c5fe27dfc5bcbf95b30f393b1f8fdb436
2020-03-19 20:19:51 +00:00
Sarah Chin
5d20e899f8 [automerger skipped] Merge "5G meteredness for telephony framework" into qt-qpr1-dev am: bd8bbca27c -s ours am: 13ee012dce -s ours am: 6930e2adc0 -s ours am: 0c6549f991 -s ours
am skip reason: Change-Id I0c8e84f74fd1f69ffc7e1046819966fcb04732a6 with SHA-1 9ea18281ee is in history

Change-Id: I5a36d3638d011b4e086efd53e6c5b9fed70dfc9c
2020-03-19 20:19:08 +00:00
TreeHugger Robot
a73d9ebfcc Merge "Add Ethernet Tethering settings" into rvc-dev am: 635c0e7f78 am: 88f17b2ce9 am: 2945c75162 am: 9222eaf474
Change-Id: I4965400239be98bc1d6d2f6599f2ded04bd5b58c
2020-03-19 20:17:36 +00:00
Peter Wang
b3bf9454eb Merge "[API Review] APIs in SubscriptionManager" into rvc-dev am: 6c95bb5cf6 am: e85186f38e
Change-Id: Ic3caa8e7ff348e9a6caf22431d33e92706dfa5e4
2020-03-19 20:17:01 +00:00
TreeHugger Robot
6651b2396d Merge "Add Ethernet Tethering settings" into rvc-dev am: 635c0e7f78 am: 866a77ee75 am: 22aedc6715 am: 62d9ca6725
Change-Id: Ia5fe588128da02667792537b24b6a64150c0e7ef
2020-03-19 20:16:26 +00:00
Peter Wang
e85186f38e Merge "[API Review] APIs in SubscriptionManager" into rvc-dev am: 6c95bb5cf6
Change-Id: I904e10cf91836c1d25d6b318dff364185f5a796f
2020-03-19 20:16:15 +00:00
Peter Wang
6c95bb5cf6 Merge "[API Review] APIs in SubscriptionManager" into rvc-dev 2020-03-19 20:07:39 +00:00
TreeHugger Robot
79a80a7a0a Merge "Add Ethernet Tethering settings" into rvc-dev am: 635c0e7f78 am: 866a77ee75 am: e17994f485 am: be79393a24
Change-Id: I24d1971aea957cff73e9818ecca3523d54add40d
2020-03-19 20:06:45 +00:00
Sarah Chin
b4d64a8c4c [automerger skipped] Merge "5G meteredness for telephony framework" into qt-qpr1-dev am: bd8bbca27c -s ours am: 13ee012dce -s ours am: 6930e2adc0 -s ours am: b556a1c812 -s ours
am skip reason: Change-Id I0c8e84f74fd1f69ffc7e1046819966fcb04732a6 with SHA-1 20974b6814 is in history

Change-Id: I3c291c9975a697364570204c642c42dc5a391f6d
2020-03-19 19:45:47 +00:00
Sarah Chin
3ce6b8a1a6 [automerger skipped] Merge "5G meteredness for telephony framework" into qt-qpr1-dev am: bd8bbca27c -s ours am: 13ee012dce -s ours am: 1a37fd26fa -s ours am: 44fad38f1b -s ours
am skip reason: Change-Id I0c8e84f74fd1f69ffc7e1046819966fcb04732a6 with SHA-1 9ea18281ee is in history

Change-Id: I540a2768284d2cce781d6509cce0765e22e3835a
2020-03-19 19:43:59 +00:00
Sarah Chin
0c6549f991 [automerger skipped] Merge "5G meteredness for telephony framework" into qt-qpr1-dev am: bd8bbca27c -s ours am: 13ee012dce -s ours am: 6930e2adc0 -s ours
am skip reason: Change-Id I0c8e84f74fd1f69ffc7e1046819966fcb04732a6 with SHA-1 9ea18281ee is in history

Change-Id: I93e8796977d1e92ca187925c6c0befaa55cd1d47
2020-03-19 19:43:39 +00:00
Sarah Chin
b556a1c812 [automerger skipped] Merge "5G meteredness for telephony framework" into qt-qpr1-dev am: bd8bbca27c -s ours am: 13ee012dce -s ours am: 6930e2adc0 -s ours
am skip reason: Change-Id I0c8e84f74fd1f69ffc7e1046819966fcb04732a6 with SHA-1 20974b6814 is in history

Change-Id: I69c26ed50fa24369c146a6f382fa9ff9c5996ff6
2020-03-19 19:43:17 +00:00
TreeHugger Robot
9222eaf474 Merge "Add Ethernet Tethering settings" into rvc-dev am: 635c0e7f78 am: 88f17b2ce9 am: 2945c75162
Change-Id: I456c8cf0f98958dd312d922127f5bf44caa25cac
2020-03-19 19:42:23 +00:00
TreeHugger Robot
62d9ca6725 Merge "Add Ethernet Tethering settings" into rvc-dev am: 635c0e7f78 am: 866a77ee75 am: 22aedc6715
Change-Id: I317db351c17917832b360770f74b1cf4a5a98451
2020-03-19 19:41:13 +00:00
TreeHugger Robot
be79393a24 Merge "Add Ethernet Tethering settings" into rvc-dev am: 635c0e7f78 am: 866a77ee75 am: e17994f485
Change-Id: I3b57dfa0096382e060d120c3b7694ba2e12c101d
2020-03-19 19:41:04 +00:00
Sarah Chin
44fad38f1b [automerger skipped] Merge "5G meteredness for telephony framework" into qt-qpr1-dev am: bd8bbca27c -s ours am: 13ee012dce -s ours am: 1a37fd26fa -s ours
am skip reason: Change-Id I0c8e84f74fd1f69ffc7e1046819966fcb04732a6 with SHA-1 9ea18281ee is in history

Change-Id: Ic80faddb5bfb1beaf7ee505f9fa98ce2c2740897
2020-03-19 19:36:49 +00:00
Sarah Chin
6930e2adc0 [automerger skipped] Merge "5G meteredness for telephony framework" into qt-qpr1-dev am: bd8bbca27c -s ours am: 13ee012dce -s ours
am skip reason: Change-Id I0c8e84f74fd1f69ffc7e1046819966fcb04732a6 with SHA-1 9ea18281ee is in history

Change-Id: Idb067bc391a46440b1cbd2ae3662a1f41cb8270c
2020-03-19 19:27:51 +00:00
Sarah Chin
1a37fd26fa [automerger skipped] Merge "5G meteredness for telephony framework" into qt-qpr1-dev am: bd8bbca27c -s ours am: 13ee012dce -s ours
am skip reason: Change-Id I0c8e84f74fd1f69ffc7e1046819966fcb04732a6 with SHA-1 9ea18281ee is in history

Change-Id: I7f1af1f1a2c55c7014bf0ef0400feae78bf1d399
2020-03-19 19:27:28 +00:00
TreeHugger Robot
2945c75162 Merge "Add Ethernet Tethering settings" into rvc-dev am: 635c0e7f78 am: 88f17b2ce9
Change-Id: If3ff9412fe9126aeeb04a7aedec62f03417c58a8
2020-03-19 19:25:11 +00:00
Sarah Chin
13ee012dce [automerger skipped] Merge "5G meteredness for telephony framework" into qt-qpr1-dev am: bd8bbca27c -s ours
am skip reason: Change-Id I0c8e84f74fd1f69ffc7e1046819966fcb04732a6 with SHA-1 9ea18281ee is in history

Change-Id: Id17d3ac372de1dd6385a674a8e72cf935a531696
2020-03-19 19:24:55 +00:00
TreeHugger Robot
22aedc6715 Merge "Add Ethernet Tethering settings" into rvc-dev am: 635c0e7f78 am: 866a77ee75
Change-Id: I839715e256ea325108a0d0d56ac08eacb9acb1a1
2020-03-19 19:24:49 +00:00
TreeHugger Robot
e17994f485 Merge "Add Ethernet Tethering settings" into rvc-dev am: 635c0e7f78 am: 866a77ee75
Change-Id: Ida4237187bddeb61321bca0b49b1f525667cc80d
2020-03-19 19:24:42 +00:00
Sarah Chin
bd8bbca27c Merge "5G meteredness for telephony framework" into qt-qpr1-dev 2020-03-19 19:11:00 +00:00
TreeHugger Robot
866a77ee75 Merge "Add Ethernet Tethering settings" into rvc-dev am: 635c0e7f78
Change-Id: I65b7710a4b1d71ac9cd9571f57ea7a1992160716
2020-03-19 19:09:00 +00:00
TreeHugger Robot
88f17b2ce9 Merge "Add Ethernet Tethering settings" into rvc-dev am: 635c0e7f78
Change-Id: I455f43c98d738412ba87a67193189827f851dff7
2020-03-19 19:08:47 +00:00
TreeHugger Robot
635c0e7f78 Merge "Add Ethernet Tethering settings" into rvc-dev 2020-03-19 18:54:12 +00:00
Anna Trostanetski
55cf490efa [automerger skipped] Merge "Show only listUIChanges instead of all" am: c305df9450 am: 983158e9ab -s ours am: 73fdbebfcc -s ours am: 801123eb47 -s ours am: e9a35623f5 -s ours
am skip reason: Change-Id I5b461b33484a38d0c6a5b7bf7e928231dd662668 with SHA-1 74117346a6 is in history

Change-Id: I133e17930506805acba2a0fe7b1ad5e35d41f43b
2020-03-19 18:46:30 +00:00
Anna Trostanetski
e9a35623f5 [automerger skipped] Merge "Show only listUIChanges instead of all" am: c305df9450 am: 983158e9ab -s ours am: 73fdbebfcc -s ours am: 801123eb47 -s ours
am skip reason: Change-Id I5b461b33484a38d0c6a5b7bf7e928231dd662668 with SHA-1 74117346a6 is in history

Change-Id: I131f3a157bcf3b1520f445c99a807513a1ebdda7
2020-03-19 18:25:35 +00:00
Anna Trostanetski
801123eb47 [automerger skipped] Merge "Show only listUIChanges instead of all" am: c305df9450 am: 983158e9ab -s ours am: 73fdbebfcc -s ours
am skip reason: Change-Id I5b461b33484a38d0c6a5b7bf7e928231dd662668 with SHA-1 74117346a6 is in history

Change-Id: I2927f47712ee615fc80a469da09048bb98956510
2020-03-19 18:09:07 +00:00
Bonian Chen
77e36cb72f Merge "[Settings] Refactor of ApnSettings" am: afbbde35b6 am: 43d3caa835 am: 4fb049537d am: 486be49fc3 am: 7f01616e35
Change-Id: Ibe5e493d431bb37bb442ecda75f843d265f8a1b4
2020-03-19 18:05:59 +00:00
Anna Trostanetski
73fdbebfcc [automerger skipped] Merge "Show only listUIChanges instead of all" am: c305df9450 am: 983158e9ab -s ours
am skip reason: Change-Id I5b461b33484a38d0c6a5b7bf7e928231dd662668 with SHA-1 74117346a6 is in history

Change-Id: I07e913d115710757c59c5fd7ab2a7ee7f59790e9
2020-03-19 18:00:03 +00:00
Anna Trostanetski
983158e9ab Merge "Show only listUIChanges instead of all" am: c305df9450
Change-Id: Ic3c11a30e28d91aebd5b15d6b601f12294a13a8b
2020-03-19 17:51:32 +00:00
Bonian Chen
7f01616e35 Merge "[Settings] Refactor of ApnSettings" am: afbbde35b6 am: 43d3caa835 am: 4fb049537d am: 486be49fc3
Change-Id: Ia9f4ae7508027feb1a772877d986b4268ce6090f
2020-03-19 17:50:40 +00:00
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
Anna Trostanetski
c305df9450 Merge "Show only listUIChanges instead of all" 2020-03-19 17:34:45 +00:00