Commit Graph

129864 Commits

Author SHA1 Message Date
Evan Chen
b2fd3a7029 Make sure work profile app cant enable notification listener services am: 5c6ca7959c am: dab54b5734 am: cdc4580ec5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25008551

Change-Id: I481338eaa8aa7a2b46aa89428216c8abf7c84f2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 21:26:57 +00:00
Evan Chen
cf17056d6d Make sure work profile app cant enable notification listener services am: aa122da7d6 am: 2abb356f2d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007537

Change-Id: Ibb248b6478bc973fedaef8cc628eb6a0c53220f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 21:26:50 +00:00
Evan Chen
1ffcf416b5 Make sure work profile app cant enable notification listener services am: 3465535747 am: 3cd41d5c6f am: 0947ff6b98 am: 91233dd150
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539

Change-Id: Id1c2a4497a32af69f648d9dba7c97fb0c680166a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 21:26:25 +00:00
Evan Chen
e08372af9e Make sure work profile app cant enable notification listener services am: 3465535747 am: d1eadc08dc am: 9b0c7298cc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539

Change-Id: Ic95166f026df396b3f9ddb342ece9ec1b0f0876e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 21:26:15 +00:00
Bill Yi
d333b903dd Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-11-06 21:26:11 +00:00
Evan Chen
91233dd150 Make sure work profile app cant enable notification listener services am: 3465535747 am: 3cd41d5c6f am: 0947ff6b98
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539

Change-Id: I87d7e43b1559424220566fee510023b9fe0831a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 21:24:13 +00:00
Evan Chen
9b0c7298cc Make sure work profile app cant enable notification listener services am: 3465535747 am: d1eadc08dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539

Change-Id: I529ed6c2ed248a52e295ae751cf42be4c5fe199f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 20:58:04 +00:00
Evan Chen
0947ff6b98 Make sure work profile app cant enable notification listener services am: 3465535747 am: 3cd41d5c6f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539

Change-Id: I7d6125bf4eeceb3fb3cad1f495e677694dd9b175
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 20:53:53 +00:00
Evan Chen
dbd608df09 Make sure work profile app cant enable notification listener services am: 5c6ca7959c am: dab54b5734 am: 4a33b437d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25008551

Change-Id: I5ab92642059d4480f49140ad699cc4ddffdf3a08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 20:52:53 +00:00
Evan Chen
221d2eddc9 Make sure work profile app cant enable notification listener services am: aa122da7d6 am: 582edbd719
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007537

Change-Id: I57ed3a2b39c584f05dfdfb47aebfbbac72ba0da3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 20:52:31 +00:00
Evan Chen
d72a0ec505 Merge "Make sure work profile app cant enable notification listener services" into udc-qpr-dev am: 857047f804
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25008425

Change-Id: Ia1193710342c11b9a6809f5379405754fd061859
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 20:18:11 +00:00
Evan Chen
cdc4580ec5 Make sure work profile app cant enable notification listener services am: 5c6ca7959c am: dab54b5734
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25008551

Change-Id: Ie570caebfa07a49f019f45a8c701aea7cf2e1f34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 20:17:21 +00:00
Evan Chen
2abb356f2d Make sure work profile app cant enable notification listener services am: aa122da7d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007537

Change-Id: Id0c70f2fac4631e1dd90070d43db8f735ceb22ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 20:17:02 +00:00
Evan Chen
4a33b437d4 Make sure work profile app cant enable notification listener services am: 5c6ca7959c am: dab54b5734
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25008551

Change-Id: I9a32e9f02c5d14d07085154f2e9d7e1a7fe681b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 20:14:24 +00:00
Evan Chen
582edbd719 Make sure work profile app cant enable notification listener services am: aa122da7d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007537

Change-Id: Ib3ad3f5e10a9cdafa7580b64c67117f1a1f19d19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 20:13:37 +00:00
Evan Chen
3cd41d5c6f Make sure work profile app cant enable notification listener services am: 3465535747
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539

Change-Id: I492643968e65f1c7e7881379914a59bc535e4047
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 20:12:03 +00:00
Evan Chen
d1eadc08dc Make sure work profile app cant enable notification listener services am: 3465535747
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539

Change-Id: Iab3c4ee5e7ae6a685f3a5f22308f694a28da5fea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 20:11:51 +00:00
Evan Chen
dab54b5734 Make sure work profile app cant enable notification listener services am: 5c6ca7959c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25008551

Change-Id: Ica7d3101c8f1efbc798654d0492fa87dcfee28fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 20:11:40 +00:00
Evan Chen
857047f804 Merge "Make sure work profile app cant enable notification listener services" into udc-qpr-dev 2023-11-06 19:15:32 +00:00
Bill Yi
0b3105688b Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Id54d10cde6cb789f1917ca9f9b88da286a89e05e
2023-11-03 17:16:20 -07:00
t
784e52c9be Disable factory reset in DSU mode
Bug: 302317901
Test: build
Change-Id: I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe
2023-11-02 08:08:19 +00:00
Mengjun Leng
1871b8155f Fix the burst callback issue on the repository
Prevents the callback when no sub entities changed to reduce
UI jank, besides, makes both variables mAvailableSubInfoEntityList
and mActiveSubInfoEntityList thread-safe.

Test: Manual
Bug: 279387799

Change-Id: I04f2a780de54e7528be6aeaf62bc8162e499aa97
2023-11-02 07:18:54 +05:30
Chaohui Wang
e9502c3cc4 Merge "When device has a call, avoid user inactive/active SIM." into udc-qpr-dev am: aab495929f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25220520

Change-Id: If895e308ce90330c33d6ceaa7551768d0771dce4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-31 22:53:24 +00:00
Chaohui Wang
aab495929f Merge "When device has a call, avoid user inactive/active SIM." into udc-qpr-dev 2023-10-31 22:10:09 +00:00
Roshan Pius
ad01bf88a7 settings(payments): Use newly exposed formal API for CardEmulation.getServices()
Bug: 307352220
Test: Compiles
Merged-In: Iaaa37a8e55d755f8abcbaa26c31bf7962e166e96
Change-Id: Iaaa37a8e55d755f8abcbaa26c31bf7962e166e96
2023-10-31 18:19:37 +00:00
Bill Yi
e50e80846e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e840be4b44 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25226920

Change-Id: I1e9aa0d62cc873d3a42cb7ed320f404c18ac14c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-31 18:09:01 +00:00
tom hsu
61e7550e7e When device has a call, avoid user inactive/active SIM.
Bug: 296314216
Test: atest passed
Change-Id: I1a717d24a87316ccf065a2c02c49dc7e29825905
(cherry picked from commit e7d98dea9d)
Merged-In: I1a717d24a87316ccf065a2c02c49dc7e29825905
2023-10-31 03:08:41 +00:00
Bill Yi
e840be4b44 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I7217a31af0c13778b162fbb834fd5e58ccbe69d6
2023-10-30 19:20:39 -07:00
Treehugger Robot
19f1b7514e [automerger skipped] Merge "settings(nfc): Remove NFC beam settings" into main am: e8df63f148 am: 3510cd0a6e -s ours
am skip reason: Merged-In I40974a26d170cf3eeec18e6a07a21f6c420eca9e with SHA-1 ad565c49dc is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2808364

Change-Id: I8cc0f159c9f47eb96fef3c32d2dc5d66a036c90d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 21:31:35 +00:00
Treehugger Robot
767ff4725e Merge "settings(nfc): Remove NFC beam settings" into main am: e8df63f148 am: ff03ce88ff
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2808364

Change-Id: I981cda69be0ada11eedf478ee4ede362c3858a8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 21:28:55 +00:00
Treehugger Robot
3510cd0a6e Merge "settings(nfc): Remove NFC beam settings" into main am: e8df63f148
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2808364

Change-Id: I259e0d59f346e5e99e34453405fa5c4cc622c92a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 21:04:17 +00:00
Treehugger Robot
ff03ce88ff Merge "settings(nfc): Remove NFC beam settings" into main am: e8df63f148
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2808364

Change-Id: Ic8c0f7ceec443aca5172cd38ede765781640dc0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 21:03:30 +00:00
Treehugger Robot
e8df63f148 Merge "settings(nfc): Remove NFC beam settings" into main 2023-10-30 20:26:18 +00:00
Roshan Pius
ad565c49dc settings(nfc): Remove NFC beam settings
This API was already deprecated and not supported for a few years. The
API was completely removed in Android U (see b/236980291).

Bug: 307352220
Test: Verified NFC settings works correctly
Merged-In: I40974a26d170cf3eeec18e6a07a21f6c420eca9e
Change-Id: I40974a26d170cf3eeec18e6a07a21f6c420eca9e
2023-10-30 19:42:47 +00:00
Bill Yi
cccaf5a711 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 639cfd9c3f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25126854

Change-Id: Id72c67f45850ce7ee070bf953337451d901da59c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-23 19:36:53 +00:00
Bill Yi
7093b062bb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a3d94436f2 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25126854

Change-Id: I67aa0cb798b4efb40a90935455b7cf0797ab956c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-23 19:36:49 +00:00
Bill Yi
00f546568c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: ff0925c00f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25126852

Change-Id: I621a669257f47089b2ca8ee08063f321d55d23d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-23 19:36:40 +00:00
Bill Yi
0bf6e27ecc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5f6854e60a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25126852

Change-Id: I2256098a5f45dd8844461368ec6cb9824ae4143c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-23 19:36:18 +00:00
Bill Yi
639cfd9c3f Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-10-23 19:16:21 +00:00
Bill Yi
ff0925c00f Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-10-23 19:16:21 +00:00
Cassie Wang
f582544551 Merge "Add a config to show the Vpn options menu." into main am: 5abd3420c4 am: ccdd06e496
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2685406

Change-Id: Ib3b89b09bc61d2bc780a6863ce4b202ff56a041c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-23 06:32:36 +00:00
Cassie Wang
16677a5492 Merge "Add a config to show the Vpn options menu." into main am: 5abd3420c4 am: 16e99c187f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2685406

Change-Id: I25a47d376b7fa31a144cdc74bee6c9a99a6b2525
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-23 06:31:50 +00:00
Cassie Wang
ccdd06e496 Merge "Add a config to show the Vpn options menu." into main am: 5abd3420c4
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2685406

Change-Id: Ie98613fd98bfac9f620dd6755e5a118a3433c171
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-23 06:15:05 +00:00
Cassie Wang
16e99c187f Merge "Add a config to show the Vpn options menu." into main am: 5abd3420c4
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2685406

Change-Id: Ib8a236bd666204b48faac0189fbcc1acfcb3e8ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-23 06:13:58 +00:00
Cassie Wang
5abd3420c4 Merge "Add a config to show the Vpn options menu." into main 2023-10-23 05:53:32 +00:00
Anthony Zhang
8155c507f2 Merge "Add pace for UdfpsEnrollHelper" into udc-qpr-dev am: c9606ad732
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24755290

Change-Id: I5d7c5820749057aeecee9c21eb62f8c6d480ce5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 20:59:55 +00:00
Anthony Zhang
c9606ad732 Merge "Add pace for UdfpsEnrollHelper" into udc-qpr-dev 2023-10-20 20:40:59 +00:00
Treehugger Robot
549ca35ebb Merge "Only allow clearing of Euicc Data by owner or demo user" into main am: f1cbe74e08 am: ce0d7e1c61
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2264402

Change-Id: I8d0bbf66beaaa568e4ee7aaa4bce2409a6a06e9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 09:48:43 +00:00
Treehugger Robot
c200d097e9 Merge "Only allow clearing of Euicc Data by owner or demo user" into main am: f1cbe74e08 am: ad49e33f01
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2264402

Change-Id: I46d8bdaac17ed33fffedeefbfbfc01e1aa1b145c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 09:47:35 +00:00
Treehugger Robot
ce0d7e1c61 Merge "Only allow clearing of Euicc Data by owner or demo user" into main am: f1cbe74e08
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2264402

Change-Id: I696de52a418fd1f02291d9ef811d989f5b4e25a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 09:10:21 +00:00