YK Hung
f7b7c13c1b
[automerger skipped] Merge "Fix errorprone warnings that should be errors" am: 3836a8a8de
-s ours am: ab48f9ba47
-s ours am: 7336fbfcc8
-s ours
...
am skip reason: Merged-In I21aa58ebc02327849ed2161dbbafcdc806c007f2 with SHA-1 ac7318419a
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2308772
Change-Id: I58a96df6c470fe6a0b6d35b1ad975c4f0cd49ae4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-23 03:36:20 +00:00
Cole Faust
40da8ff233
[automerger skipped] Fix errorprone warnings that should be errors am: 37cfdc7536
-s ours am: a0dd446e61
-s ours am: a5572aff15
-s ours
...
am skip reason: Merged-In I21aa58ebc02327849ed2161dbbafcdc806c007f2 with SHA-1 ac7318419a
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2308772
Change-Id: I9c0a4b8a817eda318e5e66bc62c0671d9a9b40bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-23 03:36:16 +00:00
YK Hung
7336fbfcc8
[automerger skipped] Merge "Fix errorprone warnings that should be errors" am: 3836a8a8de
-s ours am: ab48f9ba47
-s ours
...
am skip reason: Merged-In I21aa58ebc02327849ed2161dbbafcdc806c007f2 with SHA-1 ac7318419a
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2308772
Change-Id: I0b3a6d8f77a24cc8536503e1f1bedbb35ad54130
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-23 03:00:26 +00:00
Cole Faust
a5572aff15
[automerger skipped] Fix errorprone warnings that should be errors am: 37cfdc7536
-s ours am: a0dd446e61
-s ours
...
am skip reason: Merged-In I21aa58ebc02327849ed2161dbbafcdc806c007f2 with SHA-1 ac7318419a
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2308772
Change-Id: Ie609432ec4075f105f4a89b0702d03d78ef9db17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-23 03:00:18 +00:00
YK Hung
ab48f9ba47
[automerger skipped] Merge "Fix errorprone warnings that should be errors" am: 3836a8a8de
-s ours
...
am skip reason: Merged-In I21aa58ebc02327849ed2161dbbafcdc806c007f2 with SHA-1 ac7318419a
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2308772
Change-Id: I1c3342037844ada6a10e6b822940d0541ec4ce19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-23 02:32:00 +00:00
Cole Faust
a0dd446e61
[automerger skipped] Fix errorprone warnings that should be errors am: 37cfdc7536
-s ours
...
am skip reason: Merged-In I21aa58ebc02327849ed2161dbbafcdc806c007f2 with SHA-1 ac7318419a
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2308772
Change-Id: I8b1ab784d4aca65eec06c6bf80817c9d043f0acd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-23 02:31:59 +00:00
YK Hung
3836a8a8de
Merge "Fix errorprone warnings that should be errors"
2022-11-23 02:07:10 +00:00
Milton Wu
34c2d48973
Merge "Fix FingerprintEnrollmentActivity rotaiton crash"
2022-11-23 02:05:24 +00:00
Steve Elliott
66284b5528
Merge "Revert^2 "Add configuration for defaulting notification behavior"" into tm-qpr-dev am: fece948623
am: 81fc1b0b4d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20530303
Change-Id: I510fcf15b561e4f89df2b1b69ad74ca0350c1426
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 23:40:10 +00:00
Steve Elliott
81fc1b0b4d
Merge "Revert^2 "Add configuration for defaulting notification behavior"" into tm-qpr-dev am: fece948623
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20530303
Change-Id: I9cd33ea6d02cf1243034a399162dfffcd0fd8f65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 23:05:49 +00:00
Steve Elliott
fece948623
Merge "Revert^2 "Add configuration for defaulting notification behavior"" into tm-qpr-dev
2022-11-22 22:50:10 +00:00
Hao Dong
b9dc6dedfd
[automerger skipped] Merge "Use the internal max faces number to check enrolled." into tm-qpr-dev am: a01a1857ec
am: a538195c3c
-s ours
...
am skip reason: Merged-In I193c7b7c49f884541bd5d8282d15bf69e46f3392 with SHA-1 b4000fb226
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20518779
Change-Id: I6c27aea363c926b9769fbe6495a3eaeddd0c63d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 18:20:39 +00:00
Florian Mayer
1dedb09404
Merge "Remove periods from description strings"
2022-11-22 18:04:53 +00:00
Hao Dong
a538195c3c
Merge "Use the internal max faces number to check enrolled." into tm-qpr-dev am: a01a1857ec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20518779
Change-Id: Id63f4f017a8e2af8ceb03dfbb2f662026839b9eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 17:46:29 +00:00
Hao Dong
a01a1857ec
Merge "Use the internal max faces number to check enrolled." into tm-qpr-dev
2022-11-22 17:10:49 +00:00
TreeHugger Robot
9ac0969e1f
Merge "Fix duplicated SettingsEnums.TRUSTED_CREDENTIALS"
2022-11-22 16:37:37 +00:00
TreeHugger Robot
30a5eaaf3b
Merge "Update page id for modify system settings page"
2022-11-22 16:21:01 +00:00
Bonian Chen
9684a0cb9b
[automerger skipped] Merge changes from topic "revert-2299468-settings_without_siminfo-PZBVIDHEPA" am: 5125477d7b
am: d33fbde071
am: 8f936c0bdb
-s ours
...
am skip reason: Merged-In I1cb83787dc1ac1d61bb6bed6aa9c5e7a3ad6e69b with SHA-1 2f07595eb0
is already in history. Merged-In was found from reverted change.
Reverted change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299465
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2310159
Change-Id: I0d3293a381a05d54abdb7fac0081ed7cd714f28a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 15:01:08 +00:00
Bonian Chen
008915fdaa
[automerger skipped] Revert "[Settings] configuration for hidding SIM settings UI" am: 8e98f5a852
am: e4fbf9d941
am: 4e1a1e65b9
-s ours
...
am skip reason: Merged-In If1df99a79e51125d03f534cdfc9408b01c61024f with SHA-1 5bcfa284a9
is already in history. Merged-In was found from reverted change.
Reverted change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299468
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2310157
Change-Id: Ib0ab4ea58e29162ed1af0a67bff20725cde3e970
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 15:01:05 +00:00
Bonian Chen
5225ce9be9
[automerger skipped] Revert "[Settings] configuration for hidding SIM lock UI" am: ead8a35720
am: 2decf2ae45
am: 52bae42964
-s ours
...
am skip reason: Merged-In I870c0b53112db56b7bc80bfd585f6f7b3cf82737 with SHA-1 7c3f04aa11
is already in history. Merged-In was found from reverted change.
Reverted change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299463
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2310156
Change-Id: I0e4421e7756b659f0453f0342fc5b8b158c630af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 15:01:03 +00:00
Bonian Chen
4da1d87a20
[automerger skipped] Revert "[Settings] configuration for hidding SIM notification UI" am: 26aa2414a0
-s ours am: a4c9dbd3db
-s ours am: 9ee0d947ea
-s ours
...
am skip reason: Merged-In I0a7e0e9826a301f2aa0ca34f40b5570f0e384b4f with SHA-1 188ccde75b
is already in history. Merged-In was found from reverted change.
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2310155
Change-Id: I7bc8c88f3edaba0f165fc0b01c4883c58331326a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 15:00:55 +00:00
Bonian Chen
8f936c0bdb
Merge changes from topic "revert-2299468-settings_without_siminfo-PZBVIDHEPA" am: 5125477d7b
am: d33fbde071
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2310159
Change-Id: Idc1ee6fcf8fc403ed9592adf34417ebe2b15b7da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 14:28:07 +00:00
Bonian Chen
4e1a1e65b9
Revert "[Settings] configuration for hidding SIM settings UI" am: 8e98f5a852
am: e4fbf9d941
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2310157
Change-Id: I1bcbe2f57013ace3641937897ae2d0d8b64e2f76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 14:28:05 +00:00
Bonian Chen
52bae42964
Revert "[Settings] configuration for hidding SIM lock UI" am: ead8a35720
am: 2decf2ae45
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2310156
Change-Id: I57d2afd3af39506a35ea369ab561d02d039884ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 14:28:03 +00:00
Bonian Chen
9ee0d947ea
[automerger skipped] Revert "[Settings] configuration for hidding SIM notification UI" am: 26aa2414a0
-s ours am: a4c9dbd3db
-s ours
...
am skip reason: Merged-In I0a7e0e9826a301f2aa0ca34f40b5570f0e384b4f with SHA-1 188ccde75b
is already in history. Merged-In was found from reverted change.
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2310155
Change-Id: I68206f2dce0bd4b5bee117ad4f056dd1d9d05e17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 14:27:56 +00:00
Bonian Chen
d33fbde071
Merge changes from topic "revert-2299468-settings_without_siminfo-PZBVIDHEPA" am: 5125477d7b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2310159
Change-Id: Ic919498fda4172ede68fcd431b8bdd18056fada6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 14:08:33 +00:00
Bonian Chen
e4fbf9d941
Revert "[Settings] configuration for hidding SIM settings UI" am: 8e98f5a852
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2310157
Change-Id: I76eae77bcd825e7fa5fbc12b46eb72a7f9ddfd02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 14:08:31 +00:00
Bonian Chen
2decf2ae45
Revert "[Settings] configuration for hidding SIM lock UI" am: ead8a35720
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2310156
Change-Id: I91a72f38cc22583202c9c707463735d3f436aac0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 14:08:29 +00:00
Bonian Chen
a4c9dbd3db
[automerger skipped] Revert "[Settings] configuration for hidding SIM notification UI" am: 26aa2414a0
-s ours
...
am skip reason: Merged-In I0a7e0e9826a301f2aa0ca34f40b5570f0e384b4f with SHA-1 188ccde75b
is already in history. Merged-In was found from reverted change.
Reverted change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299466
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2310155
Change-Id: I31ef77d9a714c6ff87b3bd07b91e11cd050e6270
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 14:08:25 +00:00
Chaohui Wang
8ac4bd98d2
Merge "Reduce flaky of SettingsSpaUnitTests"
2022-11-22 13:57:06 +00:00
Zhenwei Chen
5281b5e770
Merge "Clean up useless defender dialog code"
2022-11-22 13:32:12 +00:00
Bonian Chen
5125477d7b
Merge changes from topic "revert-2299468-settings_without_siminfo-PZBVIDHEPA"
...
* changes:
Revert "[Settings] configuration for hidding SIM provider UI"
Revert "[Settings] configuration for hidding SIM remove UI"
Revert "[Settings] configuration for hidding SIM settings UI"
Revert "[Settings] configuration for hidding SIM lock UI"
Revert "[Settings] configuration for hidding SIM notification UI"
Revert "[Settings] configuration for hidding SIM related UI"
2022-11-22 13:15:49 +00:00
Bonian Chen
a1c1bd0f81
Revert "[Settings] configuration for hidding SIM provider UI"
...
Revert submission 2299468-settings_without_siminfo
Reason for revert: Fix build breakage
Reverted Changes:
I3d6ecec14:[Settings] configuration for hidding SIM settings ...
I8f0c1d53c:[Settings] configuration for hidding SIM remove UI...
I1b88f0f70:[Settings] configuration for hidding SIM notificat...
Ibe22c3ba3:[Settings] configuration for hidding SIM provider ...
Id5ea14ca8:[Settings] configuration for hidding SIM related U...
I70be07dbc:[Settings] configuration for hidding SIM lock UI
Log of breakage:
https://android-build.googleplex.com/builds/submitted/9318826/full-eng/latest/view/logs/build_error.log
Bug: 260055628
Merged-In: I1cb83787dc1ac1d61bb6bed6aa9c5e7a3ad6e69b
Change-Id: If1951dde860bb49e3ea4cd5603ed92ef18bd1f0d
2022-11-22 11:59:26 +00:00
Bonian Chen
3b7d0d2e17
Revert "[Settings] configuration for hidding SIM remove UI"
...
Revert submission 2299468-settings_without_siminfo
Reason for revert: Fix build breakage
Reverted Changes:
I3d6ecec14:[Settings] configuration for hidding SIM settings ...
I8f0c1d53c:[Settings] configuration for hidding SIM remove UI...
I1b88f0f70:[Settings] configuration for hidding SIM notificat...
Ibe22c3ba3:[Settings] configuration for hidding SIM provider ...
Id5ea14ca8:[Settings] configuration for hidding SIM related U...
I70be07dbc:[Settings] configuration for hidding SIM lock UI
Log of breakage:
https://android-build.googleplex.com/builds/submitted/9318826/full-eng/latest/view/logs/build_error.log
Bug: 260055628
Merged-In: Iea40b89733cc75a41f960fecb2ac24177a4cbd3d
Change-Id: I5c52b841955f5be41ce861aca740147061fc7d3f
2022-11-22 11:59:15 +00:00
Bonian Chen
8e98f5a852
Revert "[Settings] configuration for hidding SIM settings UI"
...
Revert submission 2299468-settings_without_siminfo
Reason for revert: Fix build breakage
Reverted Changes:
I3d6ecec14:[Settings] configuration for hidding SIM settings ...
I8f0c1d53c:[Settings] configuration for hidding SIM remove UI...
I1b88f0f70:[Settings] configuration for hidding SIM notificat...
Ibe22c3ba3:[Settings] configuration for hidding SIM provider ...
Id5ea14ca8:[Settings] configuration for hidding SIM related U...
I70be07dbc:[Settings] configuration for hidding SIM lock UI
Log of breakage:
https://android-build.googleplex.com/builds/submitted/9318826/full-eng/latest/view/logs/build_error.log
Bug: 260055628
Merged-In: If1df99a79e51125d03f534cdfc9408b01c61024f
Change-Id: I646d664b83d3db12cca81f53f7f5cd82a38e34d0
2022-11-22 11:59:02 +00:00
Bonian Chen
ead8a35720
Revert "[Settings] configuration for hidding SIM lock UI"
...
Revert submission 2299468-settings_without_siminfo
Reason for revert: Fix build breakage
Reverted Changes:
I3d6ecec14:[Settings] configuration for hidding SIM settings ...
I8f0c1d53c:[Settings] configuration for hidding SIM remove UI...
I1b88f0f70:[Settings] configuration for hidding SIM notificat...
Ibe22c3ba3:[Settings] configuration for hidding SIM provider ...
Id5ea14ca8:[Settings] configuration for hidding SIM related U...
I70be07dbc:[Settings] configuration for hidding SIM lock UI
Log of breakage:
https://android-build.googleplex.com/builds/submitted/9318826/full-eng/latest/view/logs/build_error.log
Bug: 260055628
Merged-In: I870c0b53112db56b7bc80bfd585f6f7b3cf82737
Change-Id: Ie157c9d85b5cea9ded8c4b7928a10e7ae401ab09
2022-11-22 11:58:48 +00:00
Bonian Chen
26aa2414a0
Revert "[Settings] configuration for hidding SIM notification UI"
...
Revert submission 2299468-settings_without_siminfo
Reason for revert: Fix build breakage
Reverted Changes:
I3d6ecec14:[Settings] configuration for hidding SIM settings ...
I8f0c1d53c:[Settings] configuration for hidding SIM remove UI...
I1b88f0f70:[Settings] configuration for hidding SIM notificat...
Ibe22c3ba3:[Settings] configuration for hidding SIM provider ...
Id5ea14ca8:[Settings] configuration for hidding SIM related U...
I70be07dbc:[Settings] configuration for hidding SIM lock UI
Log of breakage:
https://android-build.googleplex.com/builds/submitted/9318826/full-eng/latest/view/logs/build_error.log
Bug: 260055628
Merged-In: I07d9ddeb96ca590decf28126ce97fba4c1783304
Merged-In: I7a912a3393694155d29614d325796e08598985bf
Merged-In: I0a7e0e9826a301f2aa0ca34f40b5570f0e384b4f
Change-Id: Ib366c3fca7433e58d1925f27af11a794afb3ca00
2022-11-22 11:57:34 +00:00
Bonian Chen
0a4295d688
Revert "[Settings] configuration for hidding SIM related UI"
...
Revert submission 2299468-settings_without_siminfo
Reason for revert: Fix build breakage
Reverted Changes:
I3d6ecec14:[Settings] configuration for hidding SIM settings ...
I8f0c1d53c:[Settings] configuration for hidding SIM remove UI...
I1b88f0f70:[Settings] configuration for hidding SIM notificat...
Ibe22c3ba3:[Settings] configuration for hidding SIM provider ...
Id5ea14ca8:[Settings] configuration for hidding SIM related U...
I70be07dbc:[Settings] configuration for hidding SIM lock UI
Log of breakage:
https://android-build.googleplex.com/builds/submitted/9318826/full-eng/latest/view/logs/build_error.log
Bug: 260055628
Merged-In: I03d17beac0fb85a3d17acd7d0d581feb35e9582b
Merged-In: I8d7ddd18861a696830da39f040dfb14b9ed46726
Merged-In: I45b7898da440c36045aec64a0a86fb804116cd9d
Merged-In: Ie00bdce2fad429f2ed343e1d7aea4967bcaddf5a
Change-Id: Idb765be594a55e9f26bf378656d6b18c8f3e37c0
2022-11-22 11:52:05 +00:00
Mill Chen
8ed5b17724
Update page id for modify system settings page
...
Modify system settings page is using the page id of display over other
apps. Each page should have its own page id, so creating another one for
modify system settings page.
Bug: 260056090
Test: manual test
Change-Id: I4e25734c551f166a0c080eb534d22aea881242d9
2022-11-22 18:31:02 +08:00
Milton Wu
5174310392
Fix FingerprintEnrollmentActivity rotaiton crash
...
1. When FragmentActivity rotated, FragmentManager will call default
fragment constructor w/o parameters. Remove parameters of
FingerprintEnrollIntroFragment constructor. And also remove
BiometricsFragmentFactory because of useless now.
2. Remove some LiveData inside AutoCredentialViewModel because it causes
jitter on activity transition.
3. Save and restore data inside AutoCredentialViewModel for handling
activity recreation during rotation.
4. clear FingerprintEnrollIntroViewModel.mActionLiveData to prevent
that activity gets previous action after recreate
5. Fix launching wrong activity during setupwizard
Bug: 259626932
Test: atest AutoCredentialViewModelTest CredentialModelTest
FingerprintEnrollIntroViewModelTest
Change-Id: Ia26c86dc99ad91dbddef90538d9f5e5583585063
2022-11-22 18:18:44 +08:00
Bonian Chen
3165056c63
[automerger skipped] Merge "[Settings] configuration for hidding SIM settings UI" am: 769d773997
am: 0a733a9ed9
am: 135392ec6d
-s ours
...
am skip reason: Merged-In If1df99a79e51125d03f534cdfc9408b01c61024f with SHA-1 5bcfa284a9
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299468
Change-Id: I8f47d9e605f255d978c3afab3e8ce753bb957554
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 10:17:38 +00:00
Bonian Chen
f63489eb13
[automerger skipped] Merge "[Settings] configuration for hidding SIM remove UI" am: 889c81f77a
am: 68a039754a
am: e71a029160
-s ours
...
am skip reason: Merged-In Iea40b89733cc75a41f960fecb2ac24177a4cbd3d with SHA-1 69f6e76f2c
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299467
Change-Id: I82cc3bccadb68aece589a3efde3f4f434c07f35d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 10:17:37 +00:00
Bonian Chen
8f97723204
[automerger skipped] Merge "[Settings] configuration for hidding SIM notification UI" am: 56ff3fd99a
-s ours am: e1d5ccf789
-s ours am: 255d36821b
-s ours
...
am skip reason: Merged-In I0a7e0e9826a301f2aa0ca34f40b5570f0e384b4f with SHA-1 188ccde75b
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299466
Change-Id: Ia0a514c951e270cf158dd24a863fc42b911f752b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 10:17:35 +00:00
Bonian Chen
acca0d2e75
[automerger skipped] [Settings] configuration for hidding SIM notification UI am: 5c595b3789
-s ours am: 933dbbd5a4
-s ours am: 62360d4f2e
-s ours
...
am skip reason: Merged-In I0a7e0e9826a301f2aa0ca34f40b5570f0e384b4f with SHA-1 188ccde75b
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299466
Change-Id: Iab91d0436d4da075c28282121ad68a2b1f25c31d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 10:17:33 +00:00
Bonian Chen
37148a0ca1
[automerger skipped] Merge "[Settings] configuration for hidding SIM provider UI" am: f7ec7e66c4
am: f901e617c1
am: 3150fa819d
-s ours
...
am skip reason: Merged-In I1cb83787dc1ac1d61bb6bed6aa9c5e7a3ad6e69b with SHA-1 2f07595eb0
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299465
Change-Id: I27f1ee6be1c18490d07bdfe76a60e5bf2514ecdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 10:17:32 +00:00
Bonian Chen
f7d2fc878c
[automerger skipped] Merge "[Settings] configuration for hidding SIM related UI" am: d40fd7c597
-s ours am: 5104a1bee0
-s ours am: 6242806577
-s ours
...
am skip reason: Merged-In I45b7898da440c36045aec64a0a86fb804116cd9d with SHA-1 ed95f35423
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299464
Change-Id: Ie63f2f0662a777f17041cbdac733f2c87e271931
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 10:17:30 +00:00
Bonian Chen
d3294b194b
[automerger skipped] [Settings] configuration for hidding SIM related UI am: 7dc161dcc8
-s ours am: 5b9e71b0c5
-s ours am: 32b9504f73
-s ours
...
am skip reason: Merged-In I45b7898da440c36045aec64a0a86fb804116cd9d with SHA-1 ed95f35423
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299464
Change-Id: I749f7dea32c3e7c8cb2cc4a022772c88e5f77568
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 10:17:29 +00:00
Bonian Chen
3b3dab8a1f
[automerger skipped] Merge "[Settings] configuration for hidding SIM lock UI" am: 1ab73b934b
am: 2a98e2a4fe
am: aa7fcd1c05
-s ours
...
am skip reason: Merged-In I870c0b53112db56b7bc80bfd585f6f7b3cf82737 with SHA-1 7c3f04aa11
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299463
Change-Id: I0b1e90cfb696fcc9a4559e54bd38d6bea948ba88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 10:17:26 +00:00
Bonian Chen
135392ec6d
Merge "[Settings] configuration for hidding SIM settings UI" am: 769d773997
am: 0a733a9ed9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299468
Change-Id: I0ed0a83df84bdc76991778f8d37f69ee49872b94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 09:43:39 +00:00
Bonian Chen
e71a029160
Merge "[Settings] configuration for hidding SIM remove UI" am: 889c81f77a
am: 68a039754a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299467
Change-Id: Ie6a0f43399c016fadc058e2d161f1046b8721058
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 09:43:37 +00:00