PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
106,717 Commits 1 Branch 0 Tags
1d2787d61bc27b5a5f837354f42524dac7fd693c
Commit Graph

106717 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
228439e046 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 059271dcc4 -s ours am: 789c7d4d0d -s ours am: 95858898f3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I925964cece5726614d3a2476902f1cb95de8bfdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 20:40:45 +00:00
Bill Yi
802ea812c2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 71660567f7 -s ours am: cf50c84e8d -s ours am: 9c85ce5af4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I189a48689626420f36b37cdf1df20cb954c32798
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 20:40:35 +00:00
TreeHugger Robot
0df7bb86dd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 95b4c4798d -s ours am: c64edf7b3d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie9b19eeaafd87b91c269a6971667967aa8d31874
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 19:56:43 +00:00
Bill Yi
250e236ed6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88b4a11c90 -s ours am: 070b5431bb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic69bb16d8a8560d1b50f3e62ffce201ce311ecd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 19:56:36 +00:00
TreeHugger Robot
95858898f3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 059271dcc4 -s ours am: 789c7d4d0d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I56f8438b2be6fd45cdfc2a4b9b1d697b9bf88ad2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 19:56:23 +00:00
Bill Yi
9c85ce5af4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 71660567f7 -s ours am: cf50c84e8d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id6e9d243f3ff38028d364726b7da9d18acbba38c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 19:56:13 +00:00
TreeHugger Robot
c64edf7b3d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 95b4c4798d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3441f146bc9070e8ab71cfb205edaa8363c9c903
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 19:44:49 +00:00
Bill Yi
070b5431bb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88b4a11c90 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5f0eb3e6195e1f40169fa3f1d36c1fc6963867bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 19:44:31 +00:00
TreeHugger Robot
789c7d4d0d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 059271dcc4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9d87a4e080463d2d70798e1a67c0d023bd9b31e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 19:44:23 +00:00
Bill Yi
cf50c84e8d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 71660567f7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I92013752f94269892d8c0bd1c38746c1f6a8a3fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 19:44:05 +00:00
Weng Su
a09c33f49c Restrict guest user to configure WiFi access points 
- If the user is not allowed to configure Wi-Fi access points, close WifiDialogActivity.

Bug: 226133034
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiDialogActivityTest

Change-Id: I32d0c5beceb8a140a98636a5a0af97790495620d
 2022-06-07 03:30:01 +08:00
Treehugger Robot
110c20fff0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: fe38e396b2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I219fdf84a32d625cc1db2a8cad3f0e2fad99a630
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 19:20:01 +00:00
Bill Yi
30d09d7e03 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 908d98e833 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id6cb0c78ac4a1fff67ad24036e65b670f5a8429c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 19:19:37 +00:00
Treehugger Robot
75cadf738b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: c2d1ef5127 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I457f144c16992753458de5d48f16ec254f9a336a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 19:19:19 +00:00
Bill Yi
910530931f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 36ddfc8853 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I44cb030d201c6df90d090ff8234522498911a1f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 19:19:06 +00:00
TreeHugger Robot
f4288c7bc0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 18675f81a0 -s ours am: 2487eb86dd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I17c80070819440b9ad25fdcba9b921b3775a44f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 19:10:44 +00:00
Bill Yi
b492868af3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: aa1b476569 -s ours am: 42929a4e42 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie6fae5022c89916490c9e9d648a5610344089975
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 19:10:28 +00:00
TreeHugger Robot
e0e11d4790 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 3837351d59 -s ours am: c24151d95a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8d7e079c030b296655de2442ea723f0146dc552e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 19:10:12 +00:00
Bill Yi
f0cdb1b3e0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2b6409fe37 -s ours am: 74ada3e8a7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie0e89e2e4cb8eedffb98b004ce559e71ca62254a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 19:09:59 +00:00
TreeHugger Robot
dd65914b73 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 18675f81a0 -s ours am: 4c17586a46 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If8aa471cf7f454df242286d8e4951bf1aeef3d39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 19:07:18 +00:00
Bill Yi
7bf3121862 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: aa1b476569 -s ours am: 3b0f1d48a9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I12ac289a86f364c0a0c81ad2a7368f27181951ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 19:07:09 +00:00
TreeHugger Robot
8357bf020d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 3837351d59 -s ours am: f1ba850f94 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3ff0f520b95598a91c593ea340fa459982142169
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 19:06:56 +00:00
Bill Yi
5781185cfd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2b6409fe37 -s ours am: 9b2202a558 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9b08ec24c9cc2e96b7cf3dd218696bf0766d5dc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 19:06:37 +00:00
TreeHugger Robot
6d4e54d3b2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: cad01723c0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0da07d3cf715a574292eb582d7e64babc4206057
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 19:04:23 +00:00
Bill Yi
5999b8aadd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4889e1a48d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic99276591169529894b2562e6c5a53f64fe67de5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 19:04:06 +00:00
TreeHugger Robot
c854e66b44 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b40d530a27 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib97e03b299b921936e53c85c7d1b4ea73e448933
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 19:03:51 +00:00
Bill Yi
a39b3afeff [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 84bcd60145 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I898d56c89d898594a63dd4d3dc8cd2e824fe29df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 19:03:37 +00:00
TreeHugger Robot
2487eb86dd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 18675f81a0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If711a5ba7c805cb898ff025288141359d44b3642
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 18:55:14 +00:00
Bill Yi
42929a4e42 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: aa1b476569 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id2483a5f93be4f0f55cdaeacfa635ed20a5b245a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 18:55:04 +00:00
TreeHugger Robot
4c17586a46 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 18675f81a0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I088df48f402c1217ccfc1b619d3e76038fb353a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 18:54:53 +00:00
TreeHugger Robot
c24151d95a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 3837351d59 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I82543e4ca57e2bf1d9d29f050bb884f4561b2c66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 18:54:49 +00:00
Bill Yi
3b0f1d48a9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: aa1b476569 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia586436aa44f5f458cea5fde9cc8b37e3728d551
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 18:54:40 +00:00
Bill Yi
74ada3e8a7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2b6409fe37 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie5e8aec31403e59ecb7ddb1be9bffca958f361d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 18:54:30 +00:00
TreeHugger Robot
f1ba850f94 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 3837351d59 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I39ff50f3c1f5b355735f5d760ba37b1a53cb1cc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 18:54:25 +00:00
Bill Yi
9b2202a558 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2b6409fe37 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iec8a8d2ae56e0156cb47cbbee266968739856491
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 18:54:11 +00:00
TreeHugger Robot
18675f81a0 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-06-06 18:47:52 +00:00
TreeHugger Robot
3837351d59 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-06-06 18:47:52 +00:00
TreeHugger Robot
95b4c4798d Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2022-06-06 18:42:20 +00:00
TreeHugger Robot
059271dcc4 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2022-06-06 18:42:20 +00:00
TreeHugger Robot
cad01723c0 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-06-06 18:40:47 +00:00
TreeHugger Robot
b40d530a27 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-06-06 18:40:47 +00:00
Treehugger Robot
fe38e396b2 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-06-06 18:31:02 +00:00
Treehugger Robot
c2d1ef5127 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-06-06 18:31:02 +00:00
Avinash Vadlamudi
5bf8cd7a09 Rename method for better readability 
- Rename encircle to encircleUserIcon for proper readability

Bug: 231592331
Test: build, manual check
Change-Id: If9e829372834d8a5f43e4cce358e8c0975fa30eb
(cherry picked from commit 1b7e411315)
 2022-06-06 10:03:05 +00:00
SongFerngWang
64430ba2d2 Unable to enable the removable esim 
When the user enable the removable esim, the settings select wrong
slot(esim slot). The slot shold be the removable + esim slot and the
UiccCardInfo's cardId is the same as the removable esim's cardId.

Bug: 233170453
Bug: 233338345
Test: atest UiccSlotUtilTest
Change-Id: Ibd324b781c84318c994e3742bb82e1d1393b94e4
 2022-06-06 17:56:25 +08:00
Automerger Merge Worker
97612dfbc0 Merge "[automerger skipped] Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa am: 84bafc9fda am: d6353487cf am: 6d5ea9e89a am: 8da96d69dd -s ours am: aa31e245ab -s ours am: a2b94beca8 -s ours am: 0a5f62976c -s ours" into tm-d1-dev-plus-aosp am: 00d1058c40 -s ours 
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 8d749c55f4 is already in history

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

Change-Id: I5a91af55e2468e1ce0aaa9505f46161780d2c874
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 09:48:38 +00:00
Raphael Kim
4128586614 [automerger skipped] Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa am: 84bafc9fda am: d6353487cf am: 6d5ea9e89a am: 8da96d69dd -s ours am: aa31e245ab -s ours am: a2b94beca8 -s ours am: 0a5f62976c -s ours am: 16fe784189 -s ours 
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 c548f102e5 is already in history

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

Change-Id: I1f049f4d1a8d9060c5ab72897e47e72bddb8d474
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 09:48:36 +00:00
Raphael Kim
b8e8783b2c [automerger skipped] Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa am: 84bafc9fda am: d6353487cf am: 6d5ea9e89a am: 8da96d69dd -s ours am: aa31e245ab -s ours am: a2b94beca8 -s ours am: cf9516b716 -s ours am: 6293ac5d63 -s ours 
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 c548f102e5 is already in history

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

Change-Id: Ia4cbd2bffce7adc87f441a5b894d608359bef114
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 09:47:37 +00:00
Raphael Kim
24d08998f9 [automerger skipped] Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa am: 84bafc9fda am: d6353487cf am: 6d5ea9e89a am: 8da96d69dd -s ours am: aa31e245ab -s ours am: a2b94beca8 -s ours am: 0a5f62976c -s ours am: a3b0938595 -s ours 
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 c548f102e5 is already in history

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

Change-Id: I153b6a4214d86d1fb8e6a5eeb868b282a3610cfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 09:47:21 +00:00
Automerger Merge Worker
00d1058c40 Merge "[automerger skipped] Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa am: 84bafc9fda am: d6353487cf am: 6d5ea9e89a am: 8da96d69dd -s ours am: aa31e245ab -s ours am: a2b94beca8 -s ours am: 0a5f62976c -s ours" into tm-d1-dev-plus-aosp 2022-06-06 09:26:56 +00:00