PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
125,649 Commits 1 Branch 0 Tags
cadc70a0db2161f46c8dc18d7b65b96409214c33
Commit Graph

125649 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
eb5aef41ff Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-08-16 17:20:12 +00:00
Treehugger Robot
4585b13c9a Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-08-16 16:33:50 +00:00
Treehugger Robot
7de409b834 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-08-16 16:33:50 +00:00
Andreas Miko
05514d0f4d Change nullability of inheriting function of PinPrivacyPreferenceController 
Test: None
Bug: b/292569343
Change-Id: Idbfa244921957be2bba3cd02e5e873e81e8807d8
Merged-In: Idbfa244921957be2bba3cd02e5e873e81e8807d8
(cherry picked from commit a7d7eb9a16)
(cherry picked from commit 4ca80e6013)
 2023-08-16 15:45:00 +00:00
Bill Yi
33cf2a3dd6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I80e4d42c270ba65b724a78e18899c2e12082f1e1
 2023-08-15 11:07:44 -07:00
Bill Yi
863f3e3a35 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6a1b6861b7c389c2c52f63226366510a36ac4987
 2023-08-15 11:06:44 -07:00
Bill Yi
3c382e6941 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I107e068adba06990b1ce150bfcd4b29841220b23
 2023-08-15 11:04:13 -07:00
Bill Yi
55c45ed419 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib12eb53f2344147d55bbd56093f1fa8a945bb1d6
 2023-08-15 11:02:18 -07:00
Bill Yi
cf2c3e9981 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If7e2f5d483c30a6f1e841534bf2fde598ecd4986
 2023-08-15 11:00:29 -07:00
Bill Yi
f67ff302c5 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia7d1f3378e7ac754e78e12a4d7b71c67f0899fe1
 2023-08-15 10:59:35 -07:00
Colin Cross
918e687c93 Fix kotlin nullable errors in Settings am: 753c96133a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24423375

Change-Id: I3b1e2e72e98bf2d0bdaaec2c247d2bd9ddfa872e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-15 03:39:25 +00:00
Colin Cross
753c96133a Fix kotlin nullable errors in Settings 
Fix kotlin nullable errors that were exposed by setting the retention
of android.annotation.NonNull and android.annotation.Nullable to
class retention.

Bug: 294110802
Test: builds
Change-Id: I6aa0516fa4f6443b6d4dff873baf3b08ff9189f0
Merged-In: I6aa0516fa4f6443b6d4dff873baf3b08ff9189f0
 2023-08-14 12:29:53 -07:00
DingFei Song
07f2e22d26 Use ArrayMap to cache active subscriptions 
Because we use ArrayMap to deduplicate active subscriptions.
Caching also needs to use ArrayMap, otherwise it will cause
index inconsistency.

Bug: 295124402

Change-Id: I4fa0efd1d35855d0ea7723ad6134213ab384cd4d
Signed-off-by: DingFei Song <v-dingfeisong@xiaomi.corp-partner.google.com>
 2023-08-11 10:47:48 +08:00
Eric Biggers
99abeaeec1 Merge changes from topic "locksettings-aosp-first" into main am: 137235a27f am: 71814b355c am: fdf07d6c35 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2700640

Change-Id: Ic208bc0ed3d9ff73a77fed35bc4cdc501f41e149
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-11 02:22:36 +00:00
Eric Biggers
47e19db82e Stop calling LockPatternUtils.setVisiblePasswordEnabled() am: 08e6612a3d am: a386c78678 am: ecca6508da 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2700639

Change-Id: I5dbb93387c02bff45b4fc572f8e2a654837a4fe1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-11 02:22:33 +00:00
Eric Biggers
fdf07d6c35 Merge changes from topic "locksettings-aosp-first" into main am: 137235a27f am: 71814b355c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2700640

Change-Id: Ife2292b6bfa6c032701c1f44e4f40e969d83e929
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-11 01:37:55 +00:00
Eric Biggers
ecca6508da Stop calling LockPatternUtils.setVisiblePasswordEnabled() am: 08e6612a3d am: a386c78678 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2700639

Change-Id: I0ee235dd800b5bc7ab5e2ad2b4199500b69ad240
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-11 01:37:49 +00:00
Eric Biggers
71814b355c Merge changes from topic "locksettings-aosp-first" into main am: 137235a27f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2700640

Change-Id: I3e589ba397243133a203ab3147bffea11f7158bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-11 00:38:25 +00:00
Eric Biggers
a386c78678 Stop calling LockPatternUtils.setVisiblePasswordEnabled() am: 08e6612a3d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2700639

Change-Id: I8881a8521ca9e9748bb827b7d37a1dbabff1329e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-11 00:38:18 +00:00
Eric Biggers
137235a27f Merge changes from topic "locksettings-aosp-first" into main 
* changes:
  ChooseLockPattern: remove redundant setting of visible pattern default
  Stop calling LockPatternUtils.setVisiblePasswordEnabled()
 2023-08-10 23:52:32 +00:00
Bill Yi
38a0dbf56e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 735a75da63 -s ours am: 6cb3c567da -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I35f0cefb18df5b77e3b80df34237c6aef76e2570
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-09 19:43:54 +00:00
Bill Yi
6672750bc5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 735a75da63 -s ours am: 5ba6d8c939 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1dff64c0aa9aba357dc489d82ffce984d7e861b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-09 19:43:02 +00:00
Bill Yi
6cb3c567da [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 735a75da63 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id21824686a3e59ad6ee5bb57b5ff33f30b5e5593
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-09 18:56:54 +00:00
Bill Yi
5ba6d8c939 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 735a75da63 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I359371221dc01d908c2acae69c2665acdf6d060c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-09 18:52:49 +00:00
Bill Yi
735a75da63 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import

BUG:291030186

Change-Id: Ibf93c473acbb5f6060ec039a8a1b5ec824d638f6
 2023-08-09 17:24:49 +00:00
Eric Biggers
6cb2d5a795 ChooseLockPattern: remove redundant setting of visible pattern default 
Remove the code that set LOCK_PATTERN_VISIBLE to true the first time a
pattern was set, since LOCK_PATTERN_VISIBLE now defaults to true when
unset (ag/22912136).  The explicit defaulting to true was only needed
before because the low-level default value was wrong.

Bug: 270013005
Test: Set a pattern.  Verified that Keyguard uses visible pattern.
      Disabled the "Make pattern visible" option in Settings.  Verified
      that Keyguard doesn't use visible pattern.
Change-Id: I63f29c68f9a508fee0ee2f03f2cca33317fb8a32
Merged-In: I63f29c68f9a508fee0ee2f03f2cca33317fb8a32
(cherry picked from commit 6c3de30086)
 2023-08-09 04:03:18 +00:00
Eric Biggers
08e6612a3d Stop calling LockPatternUtils.setVisiblePasswordEnabled() 
Since the removal of support for Full Disk Encryption (FDE) in favor of
File Based Encryption (FBE), this method has been a no-op.

Bug: 208476087
Test: atest ShowPasswordPreferenceControllerTest.  Note,
      isAvailable_whenNotVisible_isFalse fails both before and after.
Change-Id: Ifb8fc93757366240cf37e4b9a600c2034302919e
Merged-In: Ifb8fc93757366240cf37e4b9a600c2034302919e
(cherry picked from commit bcee8ce1af)
 2023-08-09 04:02:54 +00:00
Eric Biggers
6cc1240b9d [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 5f07aba150 -s ours am: 733d83d27b -s ours am: aa93927b87 -s ours am: 80ef1e0ff5 -s ours am: 7f97ac5ea7 -s ours am: 4643015447 -s ours am: f050fc11ca -s ours am: a78f35b23d -s ours am: 1679e7f685 -s ours am: 4471257a0b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5c5459eb4f7a87813a6699c351ad8ec5f445caec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 06:51:03 +00:00
Eric Biggers
95ee7cd219 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: b30cf4e8cb -s ours am: d1a31c8619 -s ours am: bf4f533ea6 -s ours am: d890d1b428 -s ours am: 8b995bbc72 -s ours am: 6ad8bea7c9 -s ours am: 618272911a -s ours am: 179b563079 -s ours am: ea68785152 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4081a4ba126788855e11176c4c28eea9a050aa5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 06:49:31 +00:00
Eric Biggers
de352f9e1e [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 5f07aba150 -s ours am: 733d83d27b -s ours am: aa93927b87 -s ours am: 80ef1e0ff5 -s ours am: 7f97ac5ea7 -s ours am: 4643015447 -s ours am: f050fc11ca -s ours am: a78f35b23d -s ours am: 1679e7f685 -s ours am: 02bbe6b4a5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iad995c4debee136ff3fc809b2b83bfe19ebd8f37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 06:48:34 +00:00
Automerger Merge Worker
01567c311e Merge "[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 50cb0a35c9 -s ours am: 67c4be1e52 -s ours am: 57c5a92514 -s ours am: 3a9f8d7b32 -s ours am: c598a4cf48 -s ours am: 92939c1eb3 -s ours am: 64f3b181ab -s ours am: 503317bba1 -s ours" into udc-d1-dev-plus-aosp 2023-08-08 06:48:18 +00:00
Eric Biggers
3c604afa64 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: b30cf4e8cb -s ours am: d1a31c8619 -s ours am: bf4f533ea6 -s ours am: d890d1b428 -s ours am: 8b995bbc72 -s ours am: 6ad8bea7c9 -s ours am: 618272911a -s ours am: 179b563079 -s ours am: e43fc9f13b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7a002b8c660503593143b00f0614946d2d62ca3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 06:47:45 +00:00
Eric Biggers
aa5fe9724c [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 50cb0a35c9 -s ours am: 67c4be1e52 -s ours am: 57c5a92514 -s ours am: 3a9f8d7b32 -s ours am: c598a4cf48 -s ours am: 92939c1eb3 -s ours am: 64f3b181ab -s ours am: 783e16cb2c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib620f06268481d17c91fc66c50bd45a7e3776745
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 06:46:56 +00:00
Eric Biggers
984e4fc571 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 50cb0a35c9 -s ours am: 67c4be1e52 -s ours am: 57c5a92514 -s ours am: 3a9f8d7b32 -s ours am: c598a4cf48 -s ours am: 92939c1eb3 -s ours am: 64f3b181ab -s ours am: 503317bba1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I55091d2824dbb35fb252f15dc0d19bc225a12d0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 06:46:32 +00:00
Eric Biggers
02bbe6b4a5 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 5f07aba150 -s ours am: 733d83d27b -s ours am: aa93927b87 -s ours am: 80ef1e0ff5 -s ours am: 7f97ac5ea7 -s ours am: 4643015447 -s ours am: f050fc11ca -s ours am: a78f35b23d -s ours am: 1679e7f685 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iab5ec310d1ae852a5dcc86a166ab8f6f7b415f9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 06:08:22 +00:00
Eric Biggers
e43fc9f13b [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: b30cf4e8cb -s ours am: d1a31c8619 -s ours am: bf4f533ea6 -s ours am: d890d1b428 -s ours am: 8b995bbc72 -s ours am: 6ad8bea7c9 -s ours am: 618272911a -s ours am: 179b563079 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaa2b8e3ff5691b6d46ff50fc66095bfe35214b50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 06:06:54 +00:00
Eric Biggers
783e16cb2c [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 50cb0a35c9 -s ours am: 67c4be1e52 -s ours am: 57c5a92514 -s ours am: 3a9f8d7b32 -s ours am: c598a4cf48 -s ours am: 92939c1eb3 -s ours am: 64f3b181ab -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9c200d1674c16370e2f6bfc1fdd9acfcbe4389f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 06:04:57 +00:00
Eric Biggers
4471257a0b [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 5f07aba150 -s ours am: 733d83d27b -s ours am: aa93927b87 -s ours am: 80ef1e0ff5 -s ours am: 7f97ac5ea7 -s ours am: 4643015447 -s ours am: f050fc11ca -s ours am: a78f35b23d -s ours am: 1679e7f685 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2351d4856d7365cf6e748a3a29c560b4b9ec5fef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 06:02:57 +00:00
Eric Biggers
ea68785152 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: b30cf4e8cb -s ours am: d1a31c8619 -s ours am: bf4f533ea6 -s ours am: d890d1b428 -s ours am: 8b995bbc72 -s ours am: 6ad8bea7c9 -s ours am: 618272911a -s ours am: 179b563079 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic40a63a2013d67d961e553d65e8bffe10f8ec00c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 06:02:13 +00:00
Eric Biggers
503317bba1 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 50cb0a35c9 -s ours am: 67c4be1e52 -s ours am: 57c5a92514 -s ours am: 3a9f8d7b32 -s ours am: c598a4cf48 -s ours am: 92939c1eb3 -s ours am: 64f3b181ab -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4c2220f0eaa954039c28c64e27e9a399810aa179
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 06:00:55 +00:00
Eric Biggers
3e42e78caa [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 5f07aba150 -s ours am: 733d83d27b -s ours am: aa93927b87 -s ours am: 80ef1e0ff5 -s ours am: 7f97ac5ea7 -s ours am: 4643015447 -s ours am: 35e6c7b3dd -s ours am: d220b79a3f -s ours am: d01ae4c976 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1e78f3cf601ad5f2dc1629add5c4553e39d3107a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 05:25:19 +00:00
Automerger Merge Worker
3b26ca583d Merge "[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: b30cf4e8cb -s ours am: d1a31c8619 -s ours am: bf4f533ea6 -s ours am: d890d1b428 -s ours am: 8b995bbc72 -s ours am: 936bf45faa -s ours am: 965d046088 -s ours am: 2b385e7da2 -s ours" into udc-d1-dev-plus-aosp 2023-08-08 05:24:40 +00:00
Eric Biggers
61785ffddd [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 5f07aba150 -s ours am: 733d83d27b -s ours am: aa93927b87 -s ours am: 80ef1e0ff5 -s ours am: 7f97ac5ea7 -s ours am: 4643015447 -s ours am: 35e6c7b3dd -s ours am: d220b79a3f -s ours am: 4241da06f6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I85f8476bab209983e7bb80de4b2fc9bb38aa678c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 05:24:11 +00:00
Automerger Merge Worker
1eb56a1e47 Merge "[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: b30cf4e8cb -s ours am: d1a31c8619 -s ours am: bf4f533ea6 -s ours am: d890d1b428 -s ours am: 8b995bbc72 -s ours am: 936bf45faa -s ours am: 965d046088 -s ours am: d60572e3ed -s ours" into udc-d1-dev-plus-aosp 2023-08-08 05:23:50 +00:00
Eric Biggers
8a0045b284 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: b30cf4e8cb -s ours am: d1a31c8619 -s ours am: bf4f533ea6 -s ours am: d890d1b428 -s ours am: 8b995bbc72 -s ours am: 936bf45faa -s ours am: 965d046088 -s ours am: 2b385e7da2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie49decd79bd3094747991ed216dcb532959ce601
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 05:23:45 +00:00
Eric Biggers
5621f2a1fd [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: b30cf4e8cb -s ours am: d1a31c8619 -s ours am: bf4f533ea6 -s ours am: d890d1b428 -s ours am: 8b995bbc72 -s ours am: 936bf45faa -s ours am: 965d046088 -s ours am: d60572e3ed -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I494185b050e33a4282a9ab6bd72e51819c884aaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 05:22:56 +00:00
Eric Biggers
a837b676c9 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 50cb0a35c9 -s ours am: 67c4be1e52 -s ours am: 57c5a92514 -s ours am: 3a9f8d7b32 -s ours am: 95a303ce6d -s ours am: 45e6fbbb81 -s ours am: 32ba927770 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idad037463ce0087bc646cfd1997b3af3b5630698
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 05:22:37 +00:00
Automerger Merge Worker
2df94229d9 Merge "[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 50cb0a35c9 -s ours am: 67c4be1e52 -s ours am: 57c5a92514 -s ours am: 3a9f8d7b32 -s ours am: 95a303ce6d -s ours am: 45e6fbbb81 -s ours am: 57e52a7da8 -s ours" into udc-d1-dev-plus-aosp 2023-08-08 05:22:35 +00:00
Eric Biggers
c37e45ba7e [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 50cb0a35c9 -s ours am: 67c4be1e52 -s ours am: 57c5a92514 -s ours am: 3a9f8d7b32 -s ours am: 95a303ce6d -s ours am: 45e6fbbb81 -s ours am: 57e52a7da8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9675a2c3c0a0df9233904b85d4edc040b7546b38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 05:21:43 +00:00
Eric Biggers
a2712b2b5e [automerger skipped] Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into udc-dev am: dee47fbf68 -s ours am: 2e92835b46 -s ours 
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 99be30f895 is already in history

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

Change-Id: Icd13605e35d704f2312c9143ba315e95a2bc5cfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 05:21:19 +00:00