Commit Graph

61726 Commits

Author SHA1 Message Date
Varun Anand
2e8baa0421 Merge "Fix the availability of UseOpenWifiPreferenceController." into rvc-dev am: 4ebfaec3a3 am: 38fc2238bd am: 49c5126eea
Change-Id: Id2b29127794d108587b329b4d9c92739804f2e23
2020-03-19 22:11:40 +00:00
TreeHugger Robot
7c487d23b3 Merge "Change cross profile settings page title" into rvc-dev am: 691aa7a05e am: a94808e416
Change-Id: Ib606f92ca70fd65a8b90a38bbb518843ed1f8d80
2020-03-19 22:11:34 +00:00
TreeHugger Robot
13b129632a Merge "Change cross profile settings page title" into rvc-dev am: 691aa7a05e
Change-Id: Iee14e77394977a8b2aafc6249a010fa9b820ca96
2020-03-19 22:11:31 +00:00
TreeHugger Robot
a94808e416 Merge "Change cross profile settings page title" into rvc-dev am: 691aa7a05e
Change-Id: I20b328855032254efc862de8b7fe46f2b78e09fb
2020-03-19 22:11:21 +00:00
Michael Groover
64453c54f0 Merge "Add developer option to disable automatic adb grant revocation" into rvc-dev am: 0a189b3abe am: 44c041651b am: 81020f989d
Change-Id: I6b85e508ca42513793257d9f0f6c15b15760869a
2020-03-19 22:11:19 +00:00
Michael Groover
dd1f73de70 Merge "Add developer option to disable automatic adb grant revocation" into rvc-dev am: 0a189b3abe am: 44c041651b am: d8947709a8
Change-Id: I1e5b31b9bc1a56e6c428d9c71021e1619d5ad8c7
2020-03-19 22:11:18 +00:00
TreeHugger Robot
691aa7a05e Merge "Change cross profile settings page title" into rvc-dev 2020-03-19 22:03:22 +00:00
Varun Anand
8b51e34a88 Merge "Fix the availability of UseOpenWifiPreferenceController." into rvc-dev am: 4ebfaec3a3 am: 742cec9ad4 am: b017ddac36
Change-Id: Iff1316effa4f2f68459b60467090a5f854132f72
2020-03-19 21:56:10 +00:00
Hall Liu
52ecdf66df Merge "Rename NotificationChannel#setBlockableSystem" into rvc-dev am: 64e48c2061 am: f5e8d0662a am: 0f8b597b2e am: 311f618c31
Change-Id: Iedd0ac0bb8dbf8731f2e022ff1a5ba8751dbcc42
2020-03-19 21:52:45 +00:00
Michael Groover
835451cb23 Merge "Add developer option to disable automatic adb grant revocation" into rvc-dev am: 0a189b3abe am: 4605509b09
Change-Id: I6c4cec755acfc931ff083d069101205f1caae039
2020-03-19 21:52:31 +00:00
Michael Groover
d8947709a8 Merge "Add developer option to disable automatic adb grant revocation" into rvc-dev am: 0a189b3abe am: 44c041651b
Change-Id: I63bd969e2bc4f22dc4f8c722c9c442b213f11ba9
2020-03-19 21:52:13 +00:00
Varun Anand
b017ddac36 Merge "Fix the availability of UseOpenWifiPreferenceController." into rvc-dev am: 4ebfaec3a3 am: 742cec9ad4
Change-Id: Ibb94c4ac652deedd9901ce577da7cc6775dcd1d7
2020-03-19 21:51:50 +00:00
Varun Anand
49c5126eea Merge "Fix the availability of UseOpenWifiPreferenceController." into rvc-dev am: 4ebfaec3a3 am: 38fc2238bd
Change-Id: Iafa49db88cdf8cce56f036efa4e89fb37e4f2ff2
2020-03-19 21:50:55 +00:00
Michael Groover
81020f989d Merge "Add developer option to disable automatic adb grant revocation" into rvc-dev am: 0a189b3abe am: 44c041651b
Change-Id: I464c0b36d00f725526fad04715497330e9a557e6
2020-03-19 21:50:35 +00:00
Varun Anand
acb2d24b80 Merge "Fix the availability of UseOpenWifiPreferenceController." into rvc-dev am: 4ebfaec3a3 am: 742cec9ad4 am: 5f0937286b
Change-Id: I428b7ec09717defe865fcc654dca604b02f2a466
2020-03-19 21:47:26 +00:00
Varun Anand
5f0937286b Merge "Fix the availability of UseOpenWifiPreferenceController." into rvc-dev am: 4ebfaec3a3 am: 742cec9ad4
Change-Id: I0058545d4d9fa0cd7d524e8790e885e59208216f
2020-03-19 21:46:23 +00:00
Hall Liu
311f618c31 Merge "Rename NotificationChannel#setBlockableSystem" into rvc-dev am: 64e48c2061 am: f5e8d0662a am: 0f8b597b2e
Change-Id: I66e3faffaeac07fb2d5e03d48af3bdb90fe341b1
2020-03-19 21:39:17 +00:00
Michael Groover
4605509b09 Merge "Add developer option to disable automatic adb grant revocation" into rvc-dev am: 0a189b3abe
Change-Id: Iddcb73d6300a4563d6ce146c27446d88638f212b
2020-03-19 21:37:41 +00:00
Michael Groover
44c041651b Merge "Add developer option to disable automatic adb grant revocation" into rvc-dev am: 0a189b3abe
Change-Id: Ic0a0fb5ea9c1e75168bb3ea75d620de2ec1da42f
2020-03-19 21:36:20 +00:00
Varun Anand
742cec9ad4 Merge "Fix the availability of UseOpenWifiPreferenceController." into rvc-dev am: 4ebfaec3a3
Change-Id: I3d474eaef339d445550f6d8a7bf99a01123deba0
2020-03-19 21:36:13 +00:00
Varun Anand
38fc2238bd Merge "Fix the availability of UseOpenWifiPreferenceController." into rvc-dev am: 4ebfaec3a3
Change-Id: Ia42e358a40f86101ab8f104697861b325fbc3293
2020-03-19 21:36:13 +00:00
Peter Wang
6046dbfc6d Merge "[API Review] APIs in SubscriptionManager" into rvc-dev am: 6c95bb5cf6 am: 13dd87a9b8 am: 2e4430f334 am: a8ade48709
Change-Id: I364d6b106d52857efc3218d70f6855b3aa08ee46
2020-03-19 21:36:12 +00:00
Michael Groover
0a189b3abe Merge "Add developer option to disable automatic adb grant revocation" into rvc-dev 2020-03-19 21:31:01 +00:00
Hall Liu
aae46fccf1 Merge "Rename NotificationChannel#setBlockableSystem" into rvc-dev am: 64e48c2061 am: f5e8d0662a am: 988c14607e
Change-Id: I6d35dd8a3ac0b8722f6b6c603f7d8318acd02efc
2020-03-19 21:23:59 +00:00
Varun Anand
4ebfaec3a3 Merge "Fix the availability of UseOpenWifiPreferenceController." into rvc-dev 2020-03-19 21:21:22 +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
988c14607e Merge "Rename NotificationChannel#setBlockableSystem" into rvc-dev am: 64e48c2061 am: f5e8d0662a
Change-Id: Iff9a752ba2693f27e7b43e8b2b7c2a218ef5613c
2020-03-19 21:16:12 +00:00
Hall Liu
0f8b597b2e Merge "Rename NotificationChannel#setBlockableSystem" into rvc-dev am: 64e48c2061 am: f5e8d0662a
Change-Id: I24f8120dec0d8d26efaba5310a6ffd9abe2a1ff3
2020-03-19 21:15:07 +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
Hall Liu
f5e8d0662a Merge "Rename NotificationChannel#setBlockableSystem" into rvc-dev am: 64e48c2061
Change-Id: I5493831165ec966b30221669bd3d154a880271e5
2020-03-19 21:08:47 +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
Peter Wang
a8ade48709 Merge "[API Review] APIs in SubscriptionManager" into rvc-dev am: 6c95bb5cf6 am: 13dd87a9b8 am: 2e4430f334
Change-Id: Ibb67486c5ab4097ac7d18a47fcbddf4ef3bd9bb6
2020-03-19 21:08:15 +00:00
Hall Liu
64e48c2061 Merge "Rename NotificationChannel#setBlockableSystem" into rvc-dev 2020-03-19 21:06:54 +00:00
Peter Wang
2e4430f334 Merge "[API Review] APIs in SubscriptionManager" into rvc-dev am: 6c95bb5cf6 am: 13dd87a9b8
Change-Id: I907904d5119488a8bffafda6be4945e12fda7dbb
2020-03-19 20:46:44 +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
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
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
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
Mady Mellor
1f54e84c3c Settings strings for bubbles
To be used in a follow up..

Test: treehugger
Bug: 151965589
Change-Id: I1a285d0eb827eed33d9dcca2ec6e2be2ef098185
2020-03-19 13:16:36 -07: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
kholoud mohamed
48db1a2b0d Add strings for the install app banner in cross profile settings
Bug: 151920866
Test: N/A
Change-Id: Ib0cf7e437952211ce929c1eba763dc8ed54793e6
2020-03-19 20:04:31 +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