Commit Graph

63043 Commits

Author SHA1 Message Date
Bonian Chen
6106fa1c13 Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" into rvc-dev am: 9a0f633600 am: d2f98e4dad am: 3ffc55f1ce am: 114c70c9dc am: de5f392bb6
Change-Id: I11c4017df3379b6f49779afbbb5dd18a91b422a7
2020-03-24 08:13:39 +00:00
Bonian Chen
de5f392bb6 Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" into rvc-dev am: 9a0f633600 am: d2f98e4dad am: 3ffc55f1ce am: 114c70c9dc
Change-Id: I5365018b659ad6d7d981d085768f622c95fe6c4b
2020-03-24 08:13:24 +00:00
Bonian Chen
cc350611eb Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" into rvc-dev am: 9a0f633600 am: d2f98e4dad am: f9f9cee93e am: 125c517409
Change-Id: If7ffe688d278d030e6eab4c8cdf7184adec5c146
2020-03-24 08:13:18 +00:00
Bonian Chen
77f2788f82 Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" into rvc-dev am: 9a0f633600 am: 0a5211a6d5 am: aec1582388 am: 2a25cd5c22
Change-Id: I3bd85778b588901160779683cb19b5c34c970d21
2020-03-24 08:12:52 +00:00
Automerger Merge Worker
5616f7632b Merge "Merge changes from topic "Fix ignored tests in WifiDetailPreferenceController2Test" into rvc-dev am: e4b0989766 am: f47f38c9a2" into rvc-d1-dev-plus-aosp 2020-03-24 08:08:32 +00:00
Arc Wang
b09f4e3d15 Merge changes from topic "Fix ignored tests in WifiDetailPreferenceController2Test" into rvc-dev am: e4b0989766 am: f47f38c9a2
Change-Id: I8589a73f1896b121ef5800159af5077e907bfa79
2020-03-24 08:08:28 +00:00
Arc Wang
660cacfa0d Merge changes from topic "Fix ignored tests in WifiDetailPreferenceController2Test" into rvc-dev am: e4b0989766 am: e446e42d63
Change-Id: I9382e4559375d0d77ad206e22e11e3803d829891
2020-03-24 08:08:26 +00:00
Arc Wang
6799768b24 Merge changes from topic "Fix ignored tests in WifiDetailPreferenceController2Test" into rvc-dev am: e4b0989766 am: f47f38c9a2
Change-Id: I4a03387c230ee69638088f1158391ad16aea4881
2020-03-24 08:08:21 +00:00
Bonian Chen
125c517409 Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" into rvc-dev am: 9a0f633600 am: d2f98e4dad am: f9f9cee93e
Change-Id: I8d001f725aaf8066505b6ffe2b645f038a9d0d5e
2020-03-24 07:59:17 +00:00
Bonian Chen
2a25cd5c22 Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" into rvc-dev am: 9a0f633600 am: 0a5211a6d5 am: aec1582388
Change-Id: I02b49faa57a8faf8dcf251a6c170a0cb926613d4
2020-03-24 07:58:55 +00:00
Bonian Chen
114c70c9dc Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" into rvc-dev am: 9a0f633600 am: d2f98e4dad am: 3ffc55f1ce
Change-Id: Ieca365bb9558a7ff9f42304237313c2afbc7b0d6
2020-03-24 07:58:38 +00:00
Arc Wang
f47f38c9a2 Merge changes from topic "Fix ignored tests in WifiDetailPreferenceController2Test" into rvc-dev am: e4b0989766
Change-Id: If075945a85a830f214b2d8a33bdba165593f0705
2020-03-24 07:46:28 +00:00
Arc Wang
e446e42d63 Merge changes from topic "Fix ignored tests in WifiDetailPreferenceController2Test" into rvc-dev am: e4b0989766
Change-Id: Ic73404a2c3392f1049786b5601a72316086eb900
2020-03-24 07:46:26 +00:00
Bonian Chen
3ffc55f1ce Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" into rvc-dev am: 9a0f633600 am: d2f98e4dad
Change-Id: Ibf4c8ae584bcd77145df0837a0301e811b95cfe4
2020-03-24 07:38:03 +00:00
Bonian Chen
f9f9cee93e Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" into rvc-dev am: 9a0f633600 am: d2f98e4dad
Change-Id: I77e9cf330a27c5aaa62d0c7d1d5140cc89323490
2020-03-24 07:37:58 +00:00
Bonian Chen
aec1582388 Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" into rvc-dev am: 9a0f633600 am: 0a5211a6d5
Change-Id: I8942fd2fbced1b249cb9efcf9013f00e7e16b976
2020-03-24 07:37:49 +00:00
Arc Wang
e4b0989766 Merge changes from topic "Fix ignored tests in WifiDetailPreferenceController2Test" into rvc-dev
* changes:
  [Wi-Fi] Fix ignored tests in WifiDetailPreferenceController2Test - II
  [Wi-Fi] Fix ignored tests in WifiDetailPreferenceController2Test - I
2020-03-24 07:25:17 +00:00
Bonian Chen
0a5211a6d5 Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" into rvc-dev am: 9a0f633600
Change-Id: I42831f5540acd25bc6129ca14ad42b1717cf9e98
2020-03-24 07:15:24 +00:00
Bonian Chen
d2f98e4dad Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" into rvc-dev am: 9a0f633600
Change-Id: Iac958c3fa1bab2de8ea55fe4194590b3275180d5
2020-03-24 07:15:13 +00:00
Bonian Chen
9a0f633600 Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" into rvc-dev 2020-03-24 07:03:52 +00:00
Zhen Zhang
3b53b80715 Fix crash in AllInOneTetherSettings when user is not admin
When user is not admin, we should skip the setup and tear down
procedures in AllInOneTetherSettings' lifecycle. Also, the switch for
"Hotspot & tethering" on "Network & internet" should be disabled in such
case.

Bug: 151648198
Test: Build and flashed to crosshatch device. Using guest user, the
settings won't crash when using AllInOneTetherSetting and the switch is
disabled.

Change-Id: Ibd2f4111c53b8b9fa6a18504a681a27b966a3c46
2020-03-24 06:58:41 +00:00
TreeHugger Robot
4048901bc8 Merge "Update DND people Settings pages" into rvc-dev am: a33c8e8048 am: c21f849fe7 am: 0e2eab994d am: 4a0e23b6b0 am: ba7863dc17
Change-Id: Idfe1b7af6637c5431df14468e0ce14a751ab0d6e
2020-03-24 06:53:56 +00:00
Automerger Merge Worker
f5f0a40c88 Merge "Merge "Update DND people Settings pages" into rvc-dev am: a33c8e8048 am: 437b0b66d4" into rvc-d1-dev-plus-aosp am: 45f1e0230a am: c18184aee9
Change-Id: Id4644f0462eaf65f77dd663215e3eaf2b0b80b5c
2020-03-24 06:53:15 +00:00
TreeHugger Robot
ba7863dc17 Merge "Update DND people Settings pages" into rvc-dev am: a33c8e8048 am: c21f849fe7 am: 0e2eab994d am: 4a0e23b6b0
Change-Id: I26151b4fab716a3ebea89c23762cfae17c8e9cc3
2020-03-24 06:52:51 +00:00
TreeHugger Robot
55fa8229a7 Merge "Update DND people Settings pages" into rvc-dev am: a33c8e8048 am: c21f849fe7 am: f5eac3f0cf am: 95d85c0e34
Change-Id: I7335593a093a8e25c0296434e710f7ccd667d140
2020-03-24 06:52:32 +00:00
Automerger Merge Worker
c18184aee9 Merge "Merge "Update DND people Settings pages" into rvc-dev am: a33c8e8048 am: 437b0b66d4" into rvc-d1-dev-plus-aosp am: 45f1e0230a
Change-Id: Ifc5a7688f035ef1f86184bc07653162bdbfca1c2
2020-03-24 06:39:36 +00:00
TreeHugger Robot
4a0e23b6b0 Merge "Update DND people Settings pages" into rvc-dev am: a33c8e8048 am: c21f849fe7 am: 0e2eab994d
Change-Id: I731f652a3512f951b9553d2b35484ca71e55e624
2020-03-24 06:39:09 +00:00
TreeHugger Robot
95d85c0e34 Merge "Update DND people Settings pages" into rvc-dev am: a33c8e8048 am: c21f849fe7 am: f5eac3f0cf
Change-Id: I7db30868c2560775df97b9c8e4850e58b31ab669
2020-03-24 06:39:06 +00:00
Automerger Merge Worker
45f1e0230a Merge "Merge "Update DND people Settings pages" into rvc-dev am: a33c8e8048 am: 437b0b66d4" into rvc-d1-dev-plus-aosp 2020-03-24 06:31:31 +00:00
TreeHugger Robot
0e2eab994d Merge "Update DND people Settings pages" into rvc-dev am: a33c8e8048 am: c21f849fe7
Change-Id: I8b7b73e65f18c955bd82f38390ec88b5520e62ab
2020-03-24 06:31:23 +00:00
TreeHugger Robot
f5eac3f0cf Merge "Update DND people Settings pages" into rvc-dev am: a33c8e8048 am: c21f849fe7
Change-Id: I2795824b08a4c7943ebb8e19ecbb2cd8cc3cdfa8
2020-03-24 06:31:21 +00:00
TreeHugger Robot
c09d278177 Merge "Update DND people Settings pages" into rvc-dev am: a33c8e8048 am: 437b0b66d4
Change-Id: If46d413f025717fd9775ade524f191b5712d3967
2020-03-24 06:31:15 +00:00
Treehugger Robot
2b8bde162f Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b am: b301288cd7 am: 036496e2d0
Bug: 150258187
Change-Id: I6b363bd609d580d547cb59851f5bfaba57ef7154
(cherry picked from commit 7c62cbd97e)
Merged-In: I6b363bd609d580d547cb59851f5bfaba57ef7154
2020-03-24 06:21:25 +00:00
TreeHugger Robot
437b0b66d4 Merge "Update DND people Settings pages" into rvc-dev am: a33c8e8048
Change-Id: I15d091a2b9354b2f6039abc5d7f8d26befde577a
2020-03-24 06:09:06 +00:00
TreeHugger Robot
c21f849fe7 Merge "Update DND people Settings pages" into rvc-dev am: a33c8e8048
Change-Id: Ie488350d8a6ca7016bbaf7ace6bd7aed70568d49
2020-03-24 06:08:49 +00:00
TreeHugger Robot
a33c8e8048 Merge "Update DND people Settings pages" into rvc-dev 2020-03-24 05:56:29 +00:00
Quang Luong
40c4303fb3 Fix Passpoint network details privacy and ssid
Allow changing the privacy setting for Passpoint networks, which are
considered subscriptions but not saved networks. Also use getSsid() for
the SSID pref.

Bug: 70983952
Test: manual build and visual verification
Change-Id: I8a4309421b28bccaf2bd62a23dca8cef133d5af1
2020-03-23 21:11:41 -07:00
Bonian Chen
073f483d86 [Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API
Replace SubscriptionManager#addOnSubscriptionsChangedListener API in
order to compatible with legacy design.

Bug: 151838951
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=SubscriptionsChangeListenerTest
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=ActiveSubsciptionsListenerTest
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=SimStatusDialogControllerTest
Change-Id: Ib98ce0dcbf18b6f48a6f267dd9e7be017d571157
2020-03-24 11:51:23 +08:00
TreeHugger Robot
131604e5a7 Merge "Add strings for power menu settings" into rvc-dev am: a3fccb9cc0 am: 3052c27768 am: 45df17b1cb am: 4db41f15c7 am: 1a5358eeaa
Change-Id: I9c7e241b96c61b0da756071646ad41f5eb8028b1
2020-03-24 00:56:05 +00:00
TreeHugger Robot
eabfee3a39 Merge "Add strings for power menu settings" into rvc-dev am: a3fccb9cc0 am: 8490a15ad9 am: d50c2c9641 am: 3119536de2
Change-Id: I41b8ef5e327bb84efd83c38476b11687dfd02c95
2020-03-24 00:08:41 +00:00
TreeHugger Robot
ad20ab50e5 Merge "Add strings for power menu settings" into rvc-dev am: a3fccb9cc0 am: 3052c27768 am: 008ce5e6e0 am: c9a3bbea99
Change-Id: I723b4b699fa32dc2c06e873b6fce91fecafa256f
2020-03-23 22:57:28 +00:00
TreeHugger Robot
1a5358eeaa Merge "Add strings for power menu settings" into rvc-dev am: a3fccb9cc0 am: 3052c27768 am: 45df17b1cb am: 4db41f15c7
Change-Id: I2522ddc2d0e6c6a3608617b4940c51b3553498e3
2020-03-23 19:39:23 +00:00
TreeHugger Robot
3119536de2 Merge "Add strings for power menu settings" into rvc-dev am: a3fccb9cc0 am: 8490a15ad9 am: d50c2c9641
Change-Id: Iab1929a3aa22a1fda96e2b32e06aa711535e56ec
2020-03-23 19:29:51 +00:00
TreeHugger Robot
c9a3bbea99 Merge "Add strings for power menu settings" into rvc-dev am: a3fccb9cc0 am: 3052c27768 am: 008ce5e6e0
Change-Id: Idf92fe474895f4db749648f8b4735ab7e4256651
2020-03-23 19:23:16 +00:00
TreeHugger Robot
4db41f15c7 Merge "Add strings for power menu settings" into rvc-dev am: a3fccb9cc0 am: 3052c27768 am: 45df17b1cb
Change-Id: Ib6a27db8af3990b3185c97d30bc336bd99f688cf
2020-03-23 19:04:10 +00:00
TreeHugger Robot
d50c2c9641 Merge "Add strings for power menu settings" into rvc-dev am: a3fccb9cc0 am: 8490a15ad9
Change-Id: I519de6e1605ebe201f3332ca69abceaad5c31689
2020-03-23 18:51:28 +00:00
TreeHugger Robot
45df17b1cb Merge "Add strings for power menu settings" into rvc-dev am: a3fccb9cc0 am: 3052c27768
Change-Id: I408626ea9cc63dcd54c9d2c656148d0a4e101f82
2020-03-23 18:50:07 +00:00
TreeHugger Robot
008ce5e6e0 Merge "Add strings for power menu settings" into rvc-dev am: a3fccb9cc0 am: 3052c27768
Change-Id: I71c82452682f81d44e973c700b54f1b968de375e
2020-03-23 18:49:41 +00:00
TreeHugger Robot
8490a15ad9 Merge "Add strings for power menu settings" into rvc-dev am: a3fccb9cc0
Change-Id: I93891a124e8237dbb5fe51408ef3b4ceae4d1965
2020-03-23 18:35:57 +00:00
TreeHugger Robot
3052c27768 Merge "Add strings for power menu settings" into rvc-dev am: a3fccb9cc0
Change-Id: I852b01136c7313ea2ce274b7508a555b75808a38
2020-03-23 18:35:18 +00:00