PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
84,317 Commits 1 Branch 0 Tags
c18be19b10eef818a7fa99fc2938dd2f44a1547f
Commit Graph

84317 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Edgar Wang
036905c62a Fix LaunchAnyWhere in AppRestrictionsFragment am: aeb36e5c28 am: 03d36d79d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730675

Change-Id: Iba3eba75524c0e6b64a7c69e38733e844b08e086
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 02:47:56 +00:00
Edgar Wang
0b17e62b6b Fix LaunchAnyWhere in AppRestrictionsFragment am: 1b9da55a31 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730676

Change-Id: Ia021a8974fa666e1aa2b5f87418bd1096473f2eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 02:47:49 +00:00
Edgar Wang
9562e2e011 Fix LaunchAnyWhere in AppRestrictionsFragment am: b3eecdd13d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730674

Change-Id: Ib3c3ca64de6e099b2e2fde18abd35feb3412878c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 02:47:48 +00:00
Edgar Wang
03d36d79d6 Fix LaunchAnyWhere in AppRestrictionsFragment am: aeb36e5c28 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730675

Change-Id: Ice72452717b8ca2edd68a01ba103b33cc7b12fea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 02:47:40 +00:00
Edgar Wang
f600c05a5a 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:33 +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
Edgar Wang
1b9da55a31 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:49:26 +00:00
Edgar Wang
aeb36e5c28 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:48:46 +00:00
Edgar Wang
b3eecdd13d 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:47:24 +00:00
Arc Wang
88f4d41a82 [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: I4929ded7641c64da2331ef184e08a90d7e31df6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 02:53:16 +00:00
Arc Wang
e80a3dda3c [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: I4ce3bc069c05b36c61dcb97204ec3eadb9a0a541
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 02:53:15 +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
1d7d6ec5b8 [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: I20a17544720140fd1fc62b91f538c89d06184a5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 01:35:56 +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
c2c5b15855 Merge changes from topic "presubmit-am-3cc3de9f6a154c869e57eba3d059bade-sc-dev" into sc-qpr1-dev 
* 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
Arc Wang
4433b23ba9 [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: Iad907d4b02e7e2406aca918d8841d21aceab12e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 20:33:34 +00:00
Arc Wang
4f2a4c2036 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: I385f1718bdc0810db374edff607a5d088caffa52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 20:33:29 +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
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
3357f3071a [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: Ia1f3c9944e2ef886366719b754c89e7c4d99478a
Merged-In: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
 2022-04-07 03:38:36 +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
62694fefcb [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: I5097c99851620d39004d0b62f6479d4d71b46d96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 02:03:06 +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
c058392a70 [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: I5ef85a51130641bb7690d7de5e15ff6e350508ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:24:12 +00:00
Bonian Chen
b17f587257 [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: I93d97253b7686f176d2b5a2bb192a5d4ff1cf7ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:24:11 +00:00
Bonian Chen
eedfefab4b [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: Ia97c0a7c8667c952ec2e6e286a02d736bc526335
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:24:04 +00:00
Bonian Chen
83e4693075 [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: I2d597ac19b472b75fa776e207238c05d52f912af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:24:03 +00:00
Bonian Chen
771b606116 [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into sc-dev am: 0f10561082 -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 96f581310f is already in history

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

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

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

Change-Id: I77fbb84a4fc98dcc2aca741a1ec1c479b6051e9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:23:55 +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
a84027d685 Merge "[Settings] Move display of VPN version into summary text" into sc-qpr1-dev 2022-04-07 00:08:34 +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