SongFerng Wang
bc4909cafd
Merge "Fix the burst callback issue on the repository" into main am: a23320eedd am: 4362f09737
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2780887
Change-Id: I69a30d3d6af7b75177cee4c259786b7acbfdd5cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-07 10:11:00 +00:00
SongFerng Wang
5ec0fa333c
Merge "Fix the burst callback issue on the repository" into main am: a23320eedd
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2780887
Change-Id: I5d83bd6ea2f3f44aa961c0a77aa64c1275f4b268
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-07 09:43:39 +00:00
SongFerng Wang
4362f09737
Merge "Fix the burst callback issue on the repository" into main am: a23320eedd
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2780887
Change-Id: Ia0f4f76a704973e123cfe5e4c2d571bbea0c861f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-07 09:41:19 +00:00
SongFerng Wang
a23320eedd
Merge "Fix the burst callback issue on the repository" into main
2023-11-07 09:11:06 +00:00
Treehugger Robot
20ceda45d4
[automerger skipped] Merge "settings(payments): Use newly exposed formal API for CardEmulation.getServices()" into main am: 85ca373e75 am: f19320aca6 -s ours
...
am skip reason: Merged-In Iaaa37a8e55d755f8abcbaa26c31bf7962e166e96 with SHA-1 ad01bf88a7 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2810325
Change-Id: Idaaf14e0a312aaa1a9dc51c91273ad9fa9423faf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-07 05:21:11 +00:00
Treehugger Robot
e79bdaef63
Merge "settings(payments): Use newly exposed formal API for CardEmulation.getServices()" into main am: 85ca373e75 am: 3521df9dca
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2810325
Change-Id: Ic739f9650dcfe638521dc0488c397ef9b8fa5ea7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-07 05:18:50 +00:00
Treehugger Robot
f19320aca6
Merge "settings(payments): Use newly exposed formal API for CardEmulation.getServices()" into main am: 85ca373e75
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2810325
Change-Id: I71614129cf95ac29f845dadf479135dcb3a5a48c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-07 04:52:27 +00:00
Treehugger Robot
3521df9dca
Merge "settings(payments): Use newly exposed formal API for CardEmulation.getServices()" into main am: 85ca373e75
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2810325
Change-Id: I0ac76dbfb034e1a9856b231aa59b3ec0197914d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-07 04:48:36 +00:00
Treehugger Robot
85ca373e75
Merge "settings(payments): Use newly exposed formal API for CardEmulation.getServices()" into main
2023-11-07 04:08:35 +00:00
Evan Chen
20349c8e5a
Make sure work profile app cant enable notification listener services am: 3465535747 am: 3cd41d5c6f am: 0947ff6b98 am: 91233dd150 am: 0ff2532331 am: b375697a26
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539
Change-Id: I765b1bcb6779b2db7f88063d36d1a036d0981577
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 22:15:43 +00:00
Evan Chen
813729892a
Make sure work profile app cant enable notification listener services am: 3465535747 am: d1eadc08dc am: 9b0c7298cc am: aed207ff31 am: 3511d5be34
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539
Change-Id: I7174453e4b835ad995290b73b67e285dd99c64b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 22:15:34 +00:00
Evan Chen
985f2d27f9
Make sure work profile app cant enable notification listener services am: 5c6ca7959c am: dab54b5734 am: cdc4580ec5 am: b2fd3a7029
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25008551
Change-Id: I0e5bdc29fb9e02b9a608b0e0fa789551d72e1bf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 22:15:25 +00:00
Evan Chen
858221156a
Make sure work profile app cant enable notification listener services am: aa122da7d6 am: 2abb356f2d am: cf17056d6d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007537
Change-Id: Id35b32e71b13e2afc54c619b390ce4c2d2700b6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 22:15:15 +00:00
Bill Yi
ecd4ffaf4a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: d333b903dd -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25276605
Change-Id: I0e8abfd0dd5b99781ac3c5ab68722ac3069e4fc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 22:12:19 +00:00
Bill Yi
12fc0e97ca
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0b3105688b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25276605
Change-Id: I6dec091708ec663571c45b6e919ca5bcaf3a701b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 22:12:02 +00:00
Evan Chen
f610f59272
Make sure work profile app cant enable notification listener services am: 3465535747 am: 3cd41d5c6f am: 0947ff6b98 am: 91233dd150 am: 1ffcf416b5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539
Change-Id: I46debae6fb053a7c17ea9ef608de114002250c99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 22:05:57 +00:00
Evan Chen
073f7c37fa
Make sure work profile app cant enable notification listener services am: 3465535747 am: d1eadc08dc am: 9b0c7298cc am: e08372af9e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539
Change-Id: I1189d41247c5716d408024cd21ddcff18410f545
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 22:05:48 +00:00
Evan Chen
b375697a26
Make sure work profile app cant enable notification listener services am: 3465535747 am: 3cd41d5c6f am: 0947ff6b98 am: 91233dd150 am: 0ff2532331
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539
Change-Id: I460ee08df5313e35aec873719688ea19df568774
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 22:04:15 +00:00
Evan Chen
3511d5be34
Make sure work profile app cant enable notification listener services am: 3465535747 am: d1eadc08dc am: 9b0c7298cc am: aed207ff31
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539
Change-Id: I01bf49740321a66ebb0c20dd68e06e2baad9916e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 22:03:58 +00:00
Evan Chen
0ff2532331
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: I94766bf9a74894c16f60258e68fccd2f5ad1a0f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 21:29:48 +00:00
Evan Chen
aed207ff31
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: Ia69b3586114ad332f8c50214d42f436ea7966909
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 21:29:34 +00:00
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
Eric Biggers
8f363f7290
Use isCeStorageUnlocked() in storage wizards
...
isUserKeyUnlocked() is being renamed to isCeStorageUnlocked() to make it
clear what it does (considering that there are many types of user keys).
Temporarily, the method exists under both names. Change
StorageWizardMigrateConfirm and StorageWizardMoveConfirm to use the new
name. No change in behavior.
Bug: 306204742
Flag: exempt, mechanical refactoring
Test: presubmit
Change-Id: I5ffdd8ce048b1bc9e6161bf4fb546796765e5842
2023-10-31 21:59:31 +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