Bill Yi
00a98ec423
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1d3e63f1ab
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19739235
Change-Id: I01a66f9a0e5e1b649f31ab2ab7538e5d8b62aedf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-28 02:21:32 +00:00
Bill Yi
ed96a6cb86
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-08-27 21:05:56 +00:00
Bill Yi
15380dd7b4
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-08-27 21:05:56 +00:00
Bonian Chen
45051bb169
Merge "[Settings] Not allow APN delete when adding is not an option" into tm-d1-dev
2022-08-27 03:58:07 +00:00
TreeHugger Robot
c006955815
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: ecbf9be9a4
-s ours am: 2810928518
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746133
Change-Id: I7b05ab7b867f2acb4b71038db45864e69ce28d80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 17:56:53 +00:00
Bill Yi
58ea31040c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e5669b82f
-s ours am: c9ac950159
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746133
Change-Id: I6c6697a911ebd5b1cc0dea82c85e82f009919803
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 17:56:40 +00:00
Bill Yi
7a3ffa65cb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ccb75281f
-s ours am: bfd43e8459
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745590
Change-Id: Idb18a7c53c6222bf52f71b26ab064c9f2547b9ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 17:56:29 +00:00
TreeHugger Robot
2810928518
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: ecbf9be9a4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746133
Change-Id: I75db89938d39c6c1c576a31ecbd8d5bf7868991d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 17:47:08 +00:00
Bill Yi
c9ac950159
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e5669b82f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746133
Change-Id: I48e41e88032dfe727058fbce95de2efaf618757a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 17:46:49 +00:00
Bill Yi
bfd43e8459
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ccb75281f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745590
Change-Id: Ie0bbb18017f81853c962c6cb34ee6eabaf9e619a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 17:46:35 +00:00
TreeHugger Robot
ecbf9be9a4
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2022-08-26 17:25:46 +00:00
Bonian Chen
8c6c1ca236
[Settings] Not allow APN delete when adding is not an option
...
When not allowing APN to add, user may not be able to recover easily
when delete it.
Therefore, avoid from APN to be deleted when adding is not allowed.
Bug: 243664439
Bug: 200875858
Test: local, robolectric
Change-Id: I5cf984000244b4ad901c6a4977a1368279323e0a
2022-08-26 08:52:42 +00:00
Bill Yi
4e5669b82f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie7ff28b6cf65231bab7757ae9c5c9bf1bee9f475
2022-08-25 08:40:29 -07:00
Bill Yi
6ccb75281f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I222a6fa89b2ba5da975e473b52c7ebb70e5e607f
2022-08-25 08:36:52 -07:00
Bill Yi
6577aa89b6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7db8155cb74847cc3a16d49793c7018b2d3c6e77
2022-08-24 21:02:51 -07:00
Bill Yi
631dfab65d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I69bb22cae943842b51980d5fe875e14033930a1e
2022-08-24 20:50:20 -07:00
Bill Yi
1d3e63f1ab
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I849b26dc45abefbb04f7b16a40b8f629805cdd78
2022-08-24 20:47:00 -07:00
Bill Yi
1be27e97c5
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-08-23 13:56:32 +00:00
Bill Yi
1a3d6c47c2
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-08-23 13:56:32 +00:00
TreeHugger Robot
4f819e1516
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ad78b5a675
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19694393
Change-Id: Iaa6359f18e9ab1bc55e1b98b25d634b893ff4cc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-23 06:12:41 +00:00
Bill Yi
f8f3b752ea
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 32ddcf7c21
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19694393
Change-Id: I2e8b27c3967b6a51860cb17f7da2ec6f5f53c4b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-23 06:12:23 +00:00
TreeHugger Robot
ad78b5a675
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-08-23 05:47:36 +00:00
Oli Lan
80cdde7ce8
[automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d
am: 05031cc574
am: 03b1a52977
am: e2815b7e11
-s ours am: 48046cf4ae
-s ours am: 141dc63796
-s ours am: 40ec6382a0
-s ours am: bb562d7426
-s ours
...
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e
is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19449016
Change-Id: Ic216159568b50b5e42fd19f762fe16b83f3de50a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-22 16:34:53 +00:00
Oli Lan
da927d5a6b
[automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d
am: 05031cc574
am: 03b1a52977
am: e2815b7e11
-s ours am: 48046cf4ae
-s ours am: 819430ed60
-s ours am: d3938dfc4c
-s ours
...
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e
is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19449016
Change-Id: I81a86c60b0b2a352d6b326864a2e5a8eee53ca98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-22 16:34:43 +00:00
Oli Lan
bb562d7426
[automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d
am: 05031cc574
am: 03b1a52977
am: e2815b7e11
-s ours am: 48046cf4ae
-s ours am: 141dc63796
-s ours am: 40ec6382a0
-s ours
...
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e
is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19449016
Change-Id: I07b0906b78784d42784afcc982973e916517b479
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-22 16:33:17 +00:00
Oli Lan
40ec6382a0
[automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d
am: 05031cc574
am: 03b1a52977
am: e2815b7e11
-s ours am: 48046cf4ae
-s ours am: 141dc63796
-s ours
...
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e
is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19449016
Change-Id: I4db81a26ef2ede09401e576c6fc5afeb57d48291
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-22 16:16:49 +00:00
Oli Lan
d3938dfc4c
[automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d
am: 05031cc574
am: 03b1a52977
am: e2815b7e11
-s ours am: 48046cf4ae
-s ours am: 819430ed60
-s ours
...
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e
is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19449016
Change-Id: Iecf56bfac38ff2dbc603a9f96f4f57add7de3a2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-22 16:16:47 +00:00
Oli Lan
819430ed60
[automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d
am: 05031cc574
am: 03b1a52977
am: e2815b7e11
-s ours am: 48046cf4ae
-s ours
...
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e
is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19449016
Change-Id: Iec95e74515918dd7a9c7c0598f88031ee58682d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-22 15:58:26 +00:00
Oli Lan
141dc63796
[automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d
am: 05031cc574
am: 03b1a52977
am: e2815b7e11
-s ours am: 48046cf4ae
-s ours
...
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e
is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19449016
Change-Id: Ic969ff87d67009c3737c74f950966f19772f3269
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-22 15:57:47 +00:00
Oli Lan
48046cf4ae
[automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d
am: 05031cc574
am: 03b1a52977
am: e2815b7e11
-s ours
...
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e
is already in history. Merged-In was found from reverted change.
Reverted change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17003629
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19449016
Change-Id: I8dbc2b22a606856e839bcdbdc368c139df7d0b30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-22 15:39:22 +00:00
Oli Lan
e2815b7e11
Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d
am: 05031cc574
am: 03b1a52977
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19449016
Change-Id: I017c55ae2e7770bd52f1daca54e2aed7be05cb5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-22 15:21:18 +00:00
Oli Lan
03b1a52977
Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d
am: 05031cc574
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19449016
Change-Id: I5a78c2328f8c68fb5bf15799a69479a82b8e7af7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-22 15:03:51 +00:00
Oli Lan
05031cc574
Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19449016
Change-Id: Icfcf27040f9402b736306cf19178feee9f2a774b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-22 14:46:20 +00:00
Oli Lan
b9bafa0d3d
Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev
2022-08-22 14:27:57 +00:00
Bill Yi
9c441ad4fe
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia5f187a561427f4822814e50b6a490df46dc432d
2022-08-22 02:33:14 -07:00
Bill Yi
789b774cb2
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I39edf1cef0326d044fa50b652adbddb6a7a2a437
2022-08-22 02:21:31 -07:00
Bill Yi
32ddcf7c21
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I39be64756b5d020673c662eb51e372997587ccc7
2022-08-22 02:18:18 -07:00
Tsung-Mao Fang
4e53971f19
[automerger skipped] Wi-Fi panel doesn't need to check permission am: 5e785a2d99
-s ours
...
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 d2c372450c
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19634561
Change-Id: I22b02fef7d8f63615f203fa3634d47b2d369cc96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-17 18:11:47 +00:00
TreeHugger Robot
75ee88eaa0
Merge "Wi-Fi panel doesn't need to check permission" into tm-d1-dev
2022-08-17 17:16:52 +00:00
Tsung-Mao Fang
5e785a2d99
Wi-Fi panel doesn't need to check permission
...
Prior to this cl, we use #getPackagesForUid()
to get a list of calling package names and
pick up 1st package name in the list as target
calling package. And then go to check the
Wi-Fi permission.
This implementation is ok for most apps without
sharing system uid. However, this may not work
if the package is set with sharing system ui.
In this case, we get a list of packages
and we don't know which one is caller. So, if we
decide to choose the 1st package as our
calling package, then it could fail to pass
permission check since that package could be not
a correct calling package.
In this cl, we skip permission check for those
packages running with system uid. So, it can resolve
Wi-Fi Panel problem since Wi-Fi panel runs
on settings process(with system uid).
Test: 1. adb shell am start -a android.settings.panel.action.WIFI
2. Verify on assistant app and system ui launcher and search app.
Bug: 240531998
Change-Id: Ia825853dde2e966e3d390cecfbe1a99f6439d31e
Merged-In: Ia825853dde2e966e3d390cecfbe1a99f6439d31e
2022-08-17 02:43:03 +00:00
Tsung-Mao Fang
d2c372450c
Wi-Fi panel doesn't need to check permission
...
Prior to this cl, we use #getPackagesForUid()
to get a list of calling package names and
pick up 1st package name in the list as target
calling package. And then go to check the
Wi-Fi permission.
This implementation is ok for most apps without
sharing system uid. However, this may not work
if the package is set with sharing system ui.
In this case, we get a list of packages
and we don't know which one is caller. So, if we
decide to choose the 1st package as our
calling package, then it could fail to pass
permission check since that package could be not
a correct calling package.
In this cl, we skip permission check for those
packages running with system uid. So, it can resolve
Wi-Fi Panel problem since Wi-Fi panel runs
on settings process(with system uid).
Test: 1. adb shell am start -a android.settings.panel.action.WIFI
2. Verify on assistant app and system ui launcher and search app.
Bug: 240531998
Change-Id: Ia825853dde2e966e3d390cecfbe1a99f6439d31e
Merged-In: Ia825853dde2e966e3d390cecfbe1a99f6439d31e
2022-08-16 03:59:56 +00:00
TreeHugger Robot
cedd9510e1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 957768ce00
-s ours am: e91b230bac
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19606358
Change-Id: I03bd64208ce12db81a9f8baf2aa7915bc452e4d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-13 04:33:19 +00:00
Bill Yi
0e2272c6f6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d4bf7b223
-s ours am: 9b8d62847e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19606358
Change-Id: I2c3534ae74b3530ce4b795b90f2fe4abf07a23b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-13 04:33:09 +00:00
Bill Yi
89ae91f7cd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0d14a19eee
-s ours am: c64165dc4a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19606357
Change-Id: I3d548bafd75b267eda401f03d688edae9f8c0565
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-13 04:33:00 +00:00
TreeHugger Robot
e91b230bac
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 957768ce00
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19606358
Change-Id: I8d9fe810fae9f907eaaee43681b54b047c2cedf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-13 04:01:35 +00:00
Bill Yi
9b8d62847e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d4bf7b223
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19606358
Change-Id: Iacfaa7a89d11000f8e5218661d404cad0e435795
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-13 04:01:28 +00:00
Bill Yi
c64165dc4a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0d14a19eee
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19606357
Change-Id: I08ee6f10b0daff666ef0100551f50405a59f3132
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-13 04:01:17 +00:00
TreeHugger Robot
ba19ab70fa
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-08-12 19:50:01 +00:00
Bill Yi
1d60978515
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9257e5881a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19602317
Change-Id: Icd7bb1e1eb6caba9610276ed3660e919c2be94c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 19:06:24 +00:00
TreeHugger Robot
957768ce00
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2022-08-12 18:52:01 +00:00