PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,737 Commits 1 Branch 0 Tags
8ff68f9850f251752cfe25d597b460c87943b3be
Commit Graph

85737 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Edgar Wang
8ff68f9850 Fix LaunchAnyWhere in AppRestrictionsFragment am: f8f45888e6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730677

Change-Id: I3248f9b64e348700f3ef5f23c8655e3b88ea40a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 02:47:56 +00:00
Edgar Wang
f8f45888e6 Fix LaunchAnyWhere in AppRestrictionsFragment 
If the intent's package equals to the app's package, this intent
will be allowed to startActivityForResult.
But this check is unsafe, because if the component of this intent
is set, the package field will just be ignored. So if we set the
component to any activity we like and set package to the app's
package, it will pass the assertSafeToStartCustomActivity check
and now we can launch anywhere.

Bug: 223578534
Test: robotest and manual verify
Change-Id: I40496105bae313fe5cff2a36dfe329c1e2b5bbe4
(cherry picked from commit 90e095dbe3)
 2022-04-13 04:50:03 +00:00
TreeHugger Robot
cb8148ebaf Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-04-11 06:05:47 +00:00
Bill Yi
8acb20ea2a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8ec8d124d01075b528fe637783670daccb2da3cf
 2022-04-09 13:07:19 +00:00
Bill Yi
4beecb6946 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia56e96f0f7b667a6811440e12e3caab7dee7548e
 2022-04-09 13:03:44 +00:00
Arc Wang
db9a89249b [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into rvc-dev am: 91481f8a1f -s ours am: 3fc5b81efe -s ours am: 6b70d3b6ec -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: I89ff3c5700ccd2ab1c96152cd135e5389a330420
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 02:52:21 +00:00
Arc Wang
925bcd19dc [automerger skipped] Hide non-system overlay window on ActivityPicker am: d10662cf97 -s ours am: 4bf19c2271 -s ours am: cf3835db35 -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: I83893011ad3948a674e713d3f22da8c872da50c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 02:52:20 +00:00
Arc Wang
6b70d3b6ec [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into rvc-dev am: 91481f8a1f -s ours am: 3fc5b81efe -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: I2f92dcd0ce9c7e0075b2bb0147547e65ef5802c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 02:19:30 +00:00
Arc Wang
cf3835db35 [automerger skipped] Hide non-system overlay window on ActivityPicker am: d10662cf97 -s ours am: 4bf19c2271 -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: Ieb785f34e2f09e855d511a22994d6869589d77f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 02:19:28 +00:00
Arc Wang
3fc5b81efe [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into rvc-dev am: 91481f8a1f -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: Ied0f1e36a2d67fa9681f60c89ce0748af48148b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 01:50:59 +00:00
Arc Wang
4bf19c2271 [automerger skipped] Hide non-system overlay window on ActivityPicker am: d10662cf97 -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: Ib0ff605c1ed18d9053248dace8087fab90c3234c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 01:50:58 +00:00
Arc Wang
282f65828a [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into sc-dev am: f2b1582e0a -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 d0a23dc840 is already in history

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

Change-Id: I169e9c7252f6d43b3ce3bac36940b61a21d382ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 01:35:26 +00:00
Arc Wang
91481f8a1f Merge "Hide non-system overlay window on ActivityPicker" into rvc-dev 2022-04-08 01:19:01 +00:00
Arc Wang
f2b1582e0a Merge "Hide non-system overlay window on ActivityPicker" into sc-dev 2022-04-08 01:01:27 +00:00
Arc Wang
9877f69b2f Merge changes from topic "presubmit-am-3cc3de9f6a154c869e57eba3d059bade-sc-dev" into sc-mainline-prod 
* changes:
  [automerge] Hide non-system overlay window on ActivityPicker 2p: d0a23dc840
  Hide non-system overlay window on ActivityPicker
 2022-04-08 01:01:27 +00:00
TreeHugger Robot
2e98d2e165 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-04-08 00:03:42 +00:00
Arc Wang
d65f4f645e [automerger skipped] Hide non-system overlay window on ActivityPicker am: c4121c15e4 am: 21a0db9882 am: e5e271bfed -s ours am: 346ab35fc4 -s ours am: 038da819d2 -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: I30b031e36a6553930faec328c2d0097e426fb8b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 20:32:41 +00:00
Arc Wang
37a290bf79 Hide non-system overlay window on ActivityPicker am: c55b5b54d2 am: fcf0584f93 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628098

Change-Id: I1828afe6ae782b7165d17b7c3f721ffc52c9f7db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 20:32:35 +00:00
Arc Wang
038da819d2 [automerger skipped] Hide non-system overlay window on ActivityPicker am: c4121c15e4 am: 21a0db9882 am: e5e271bfed -s ours am: 346ab35fc4 -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: I705269b27f44fd7335013ff728113a12f088bc60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 20:32:16 +00:00
Arc Wang
346ab35fc4 [automerger skipped] Hide non-system overlay window on ActivityPicker am: c4121c15e4 am: 21a0db9882 am: e5e271bfed -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: If996f3775f8de7981af3409129d8d5254b470b93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 20:05:45 +00:00
Arc Wang
fcf0584f93 Hide non-system overlay window on ActivityPicker am: c55b5b54d2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628098

Change-Id: I5404085011ef8f1120e0a8239e4049d617716690
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 19:59:23 +00:00
Arc Wang
e5e271bfed Hide non-system overlay window on ActivityPicker am: c4121c15e4 am: 21a0db9882 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628100

Change-Id: Id6820351a67c2b2924a9a6ee3a06731519510ff7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 19:44:36 +00:00
Arc Wang
21a0db9882 Hide non-system overlay window on ActivityPicker am: c4121c15e4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628100

Change-Id: I54645a67488b6c155218eca6c5fb5779daabd495
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 19:15:23 +00:00
TreeHugger Robot
22de864c99 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-04-07 18:36:40 +00:00
TreeHugger Robot
6336dc03b4 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-04-07 17:40:35 +00:00
TreeHugger Robot
ce51beb64d Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-04-07 17:40:13 +00:00
Bill Yi
f94a8a9af3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1a31725689e388e013ea1122842c7aa0250e41a7
 2022-04-07 14:17:44 +00:00
Bill Yi
2c4b82e04b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9df9e2fad6107338e395c58a794596f8f388c32e
 2022-04-07 14:12:33 +00:00
Arc Wang
c4121c15e4 Hide non-system overlay window on ActivityPicker 
To improve security.

Bug: 181962311
Test: manual
      Show an AlertDialog and observe if it will hide after below command.
      adb shell am start -a android.intent.action.PICK_ACTIVITY -n com.android.settings/.ActivityPicker
Change-Id: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
Merged-In: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
 2022-04-07 03:44:12 +00:00
Arc Wang
d10662cf97 Hide non-system overlay window on ActivityPicker 
To improve security.

Bug: 181962311
Test: manual
      Show an AlertDialog and observe if it will hide after below command.
      adb shell am start -a android.intent.action.PICK_ACTIVITY -n com.android.settings/.ActivityPicker
Change-Id: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
Merged-In: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
 2022-04-07 03:42:30 +00:00
Arc Wang
c55b5b54d2 Hide non-system overlay window on ActivityPicker 
To improve security.

Bug: 181962311
Test: manual
      Show an AlertDialog and observe if it will hide after below command.
      adb shell am start -a android.intent.action.PICK_ACTIVITY -n com.android.settings/.ActivityPicker
Change-Id: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
Merged-In: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
 2022-04-07 03:42:02 +00:00
Arc Wang
abf3369340 [automerge] Hide non-system overlay window on ActivityPicker 2p: d0a23dc840 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628096

Bug: 181962311
Change-Id: Ic87c5c0052ae76f4b5a689a34768e678210c64b0
Merged-In: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
 2022-04-07 03:38:37 +00:00
Arc Wang
d0a23dc840 Hide non-system overlay window on ActivityPicker 
To improve security.

Bug: 181962311
Test: manual
      Show an AlertDialog and observe if it will hide after below command.
      adb shell am start -a android.intent.action.PICK_ACTIVITY -n com.android.settings/.ActivityPicker
Change-Id: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
Merged-In: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
 2022-04-07 03:38:24 +00:00
Bonian Chen
a171ca8477 [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into qt-dev am: d0888970a4 am: d35d3e2446 -s ours am: 961d4b26b7 -s ours am: 8c89ac9027 -s ours am: ad3fef885f -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 dddd74a491 is already in history

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

Change-Id: I5b13cb302d6d75a217428c05401ae52e6a9b1a81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 02:02:04 +00:00
Bonian Chen
ad3fef885f [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into qt-dev am: d0888970a4 am: d35d3e2446 -s ours am: 961d4b26b7 -s ours am: 8c89ac9027 -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 dddd74a491 is already in history

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

Change-Id: I912d9f1baa62559df394f95080fdde71ac91c318
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:39:53 +00:00
Bonian Chen
8c89ac9027 [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into qt-dev am: d0888970a4 am: d35d3e2446 -s ours am: 961d4b26b7 -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 dddd74a491 is already in history

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

Change-Id: I38b41e693d544fa9b44323f3b9d1d7a6c53690ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:15:26 +00:00
Bonian Chen
961d4b26b7 [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into qt-dev am: d0888970a4 am: d35d3e2446 -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 dddd74a491 is already in history

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

Change-Id: I50b0f293bc021fe8f28fb1f10cb20bc93c75bcf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:45:39 +00:00
Bonian Chen
2b767881d6 [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into rvc-dev am: d0d67e68a5 -s ours am: e8097d4464 -s ours am: 35c5b0b0a2 -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5fc0e6614d is already in history

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

Change-Id: I6ea85d8201f1582bef4a96ca295ca8041be5c460
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:23:43 +00:00
Bonian Chen
065876ee1b [automerger skipped] [Settings] Move display of VPN version into summary text am: dddd74a491 -s ours am: eefa7371ed -s ours am: fcdc4a4de3 -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5fc0e6614d is already in history

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

Change-Id: I42bb51e2686a65d73da0ef0c6db94a253016c777
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:23:41 +00:00
Bonian Chen
dad1ee3deb [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into rvc-qpr-dev am: 6279d80f93 -s ours am: d15869f014 -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5935cae639 is already in history

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

Change-Id: Iad2e8ed7a78c79b972ff5d3042e8c5b806b80a46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:23:33 +00:00
Bonian Chen
b3be027c39 [automerger skipped] [Settings] Move display of VPN version into summary text am: 5fc0e6614d -s ours am: 96fe347312 -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5935cae639 is already in history

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

Change-Id: Ifef705f785658826b4f8e34768428cc74338ffad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:23:32 +00:00
Bonian Chen
1893045740 Merge "[Settings] Move display of VPN version into summary text" into sc-dev am: 0f10561082 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341972

Change-Id: Ied57a6cc4b3948ea50e72859b6c207fd260907fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:23:26 +00:00
Bonian Chen
d35d3e2446 Merge "[Settings] Move display of VPN version into summary text" into qt-dev am: d0888970a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341975

Change-Id: Iabf1f3d5b113e12ddfd1cfe1037a94fb4509e180
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:23:16 +00:00
Bonian Chen
35c5b0b0a2 [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into rvc-dev am: d0d67e68a5 -s ours am: e8097d4464 -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5fc0e6614d is already in history

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

Change-Id: I74e55c981975f965e6cf42950b9642b17f891413
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:23:09 +00:00
Bonian Chen
fcdc4a4de3 [automerger skipped] [Settings] Move display of VPN version into summary text am: dddd74a491 -s ours am: eefa7371ed -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5fc0e6614d is already in history

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

Change-Id: Id825050bb1431aa5679b4b755a81333b75de140e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:23:07 +00:00
Bonian Chen
d15869f014 [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into rvc-qpr-dev am: 6279d80f93 -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5935cae639 is already in history

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

Change-Id: Ife42fa9c137e142f976d68cb63e2b954a176920f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:22:59 +00:00
Bonian Chen
96fe347312 [automerger skipped] [Settings] Move display of VPN version into summary text am: 5fc0e6614d -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5935cae639 is already in history

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

Change-Id: I218a79f1c264eea6b72e604392fb0c69c54c7ece
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:22:57 +00:00
Bonian Chen
e8097d4464 [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into rvc-dev am: d0d67e68a5 -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5fc0e6614d is already in history

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

Change-Id: Id3bd26debfc50e0b332695ffaf9f1fe1aca51feb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:22:44 +00:00
Bonian Chen
eefa7371ed [automerger skipped] [Settings] Move display of VPN version into summary text am: dddd74a491 -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5fc0e6614d is already in history

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

Change-Id: Ide4d80dc46e692c7664010e6ab2746be482dff5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:22:43 +00:00
Bonian Chen
0f10561082 Merge "[Settings] Move display of VPN version into summary text" into sc-dev 2022-04-07 00:08:28 +00:00