Bill Yi
5e07d7fd84
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 392df50da0 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18054880
Change-Id: I048fe580663c03d27cae41e605f9d6719507e0c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-02 21:28:28 +00:00
Bill Yi
392df50da0
Import translations. DO NOT MERGE ANYWHERE
...
BUG:205460459
Auto-generated-cl: translation import
Change-Id: I67386b7749b6575747c0507e3841fa404c6a69f4
2022-04-28 18:23:10 +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
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
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
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
d0888970a4
Merge "[Settings] Move display of VPN version into summary text" into qt-dev
2022-04-07 00:08:08 +00:00
TreeHugger Robot
e6e739d8b0
Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17003629
Change-Id: I5ebae8947d883130b93c9a82d087656dab41498a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 12:58:31 +00:00
TreeHugger Robot
74ff164972
Merge "Prevent exfiltration of system files via user image settings." into qt-dev
2022-04-01 12:42:31 +00:00
lucaslin
2c1c76cd35
Hide private DNS settings UI in Guest mode am: 52e863b5a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17129063
Change-Id: I5fc7b5001299b8831a1dd9440b6e25dfaf6d8a98
2022-03-09 06:08:16 +00:00
lucaslin
52e863b5a2
Hide private DNS settings UI in Guest mode
...
Hide private DNS settings UI in Guest mode to prevent guest
users modifying global private DNS settings.
Bug: 206987762
Test: 1. make RunSettingsRoboTests \
ROBOTEST_FILTER=PrivateDnsPreferenceControllerTest
2. Switch to Guest user and check if the private DNS UI is
hidden or not.
Change-Id: Iebfb8684da3be32110decd9e8447dd07b1c40387
2022-03-09 02:54:12 +00:00
Oli Lan
8950a90024
Prevent exfiltration of system files via user image settings.
...
This is a backport of ag/17005706.
This adds mitigations to prevent system files being exfiltrated
via the settings content provider when a content URI is provided
as a chosen user image.
The mitigations are:
1) Copy the image to a new URI rather than the existing takePictureUri
prior to cropping.
2) Only allow a system handler to respond to the CROP intent.
Bug: 187702830
Test: build and check functionality
Change-Id: Ia6314b6810afb5efa0329f3eeaee9ccfff791966
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
2022-03-03 13:18:16 +00:00
Jack Yu
46bd9ba5a5
Do not let guest user disable secure nfc am: 4e543a38f6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691813
Change-Id: Iffe578c58bf2dcebda45b0b71dd901bd3e08be41
2022-02-08 02:15:55 +00:00
Jack Yu
4e543a38f6
Do not let guest user disable secure nfc
...
Bug: 209446496
Test: manual
Merged-In: I7253f7f08fde04e30400a30d9a0d24f1ceff04b0
Change-Id: I7253f7f08fde04e30400a30d9a0d24f1ceff04b0
(cherry picked from commit d9e3e6e4b1 )
2022-02-02 17:44:55 +00:00
TreeHugger Robot
1ef5f42b54
Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577205
Change-Id: I8dae6a8a3fd0ed7cde335ead1e4b760bb5a8d195
2022-01-13 19:04:05 +00:00
TreeHugger Robot
50b65a168a
Merge "Add caller check to com.android.credentials.RESET" into qt-dev
2022-01-13 18:50:36 +00:00
Edgar Wang
c0d6987e06
Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment am: f57d75f127
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16579585
Change-Id: Icd26ee5a31e0cc7e11edaf6c542b045ab3a7ff01
2022-01-13 06:50:30 +00:00
Edgar Wang
f57d75f127
Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment
...
In onReceive of AppRestrictionsFragment.java, there is a possible way to
start a phone call without permissions due to a confused deputy.
This could lead to local escalation of privilege with no additional
execution privileges needed.
We should not allow the restrictionsIntent to startActivity simply
because it resolves to multiple activities.
Instead, we should call resolveActivity and check the result's package
name is same as current package name, then it is safe to startActivity.
Bug: 200688991
Test: manual verify
Change-Id: Iaa2d3a9497c3266babe0789961befc9776a4db7a
Merged-In: Iaa2d3a9497c3266babe0789961befc9776a4db7a
(cherry picked from commit 359512cd95 )
2022-01-07 04:23:50 +00:00
Alex Johnston
35e3d0c1b0
Add caller check to com.android.credentials.RESET
...
* Only the Settings app can reset credentials
via com.android.credentials.RESET.
* com.android.credentials.INSTALL should still be
callable by CertInstaller.
Manual testing steps:
* Install certificate via Settings
* Verify unable to reset certificates via test app
provided in the bug (app-debug.apk)
* Verify able to reset certificates via Settings
* Verify com.android.credentials.INSTALL isn't changed
Bug: 200164168
Test: manual
Change-Id: I9dfde586616d004befbee529f2ae842d22795065
(cherry picked from commit 4c1272a921 )
Merged-In: I9dfde586616d004befbee529f2ae842d22795065
2022-01-06 22:17:17 +00:00
Bonian Chen
8c0052d537
[Settings] Move display of VPN version into summary text
...
Move the display of version text within VPN into summary part of the
display, and limit the height of summary area.
Bug: 205460459
Test: install apk from b/205460459#comment3 and verify
Change-Id: I666b9db356feeebf04e3be688897c2d9110a5275
(cherry picked from commit 144f295d7a )
Merged-In: I666b9db356feeebf04e3be688897c2d9110a5275
2021-12-06 09:54:00 +00:00
TreeHugger Robot
c96d9867c5
Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into qt-dev am: 7aa03c4821
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145003
Change-Id: Ic9f02f2c7b60b131194896fd841cc27aff23c686
2021-11-09 07:24:47 +00:00
Hugh Chen
d1ee2f41e8
RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d4e0ed2284
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145003
Change-Id: If228864e833e512870a9d60ef457e4aa2c7820a9
2021-11-09 07:24:45 +00:00
TreeHugger Robot
7aa03c4821
Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into qt-dev
2021-11-09 06:59:11 +00:00
TreeHugger Robot
7134e1ac35
[automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into pi-dev am: 5006367685 -s ours am: 0e8d3e3c35 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145004
Change-Id: I9987e661cfb85b5c9aa105105d2cc37fd7240903
2021-11-09 06:15:20 +00:00
TreeHugger Robot
0e8d3e3c35
[automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into pi-dev am: 5006367685 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145004
Change-Id: I4363a8652c623e915daf6439e477385710a30726
2021-11-09 06:01:40 +00:00
TreeHugger Robot
5006367685
Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into pi-dev
2021-11-09 05:46:16 +00:00
Bill Yi
775e9c5605
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64149823f2 -s ours am: 8736277f07 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16185416
Change-Id: Ic2268876a1e75e76323939efdbdab1220714d8c9
2021-11-04 06:37:11 +00:00
Bill Yi
8736277f07
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64149823f2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16185416
Change-Id: Ifde1a3575cfe9250d965e658a384b3769a030a5e
2021-11-04 06:31:56 +00:00
Bill Yi
5f68234c40
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a69cc3921 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16185415
Change-Id: I8169ce55b91fbf5fee42b5fa6f0370ce4167eb37
2021-11-04 06:30:57 +00:00
Bill Yi
64149823f2
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I31603b51131a4bb4423bf9c6f2c3ac32ff08a9d3
2021-11-03 23:44:20 +00:00
Bill Yi
8a69cc3921
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I31603b51131a4bb4423bf9c6f2c3ac32ff08a9d3
2021-11-03 16:41:21 -07:00
Yanting Yang
ac38fc7f32
Rephrase dialog message of clear storage dialog for security concern am: 7fd0ece6f4 am: 204f82d6c4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101569
Change-Id: Ifdb5eb3c216bab863cdf3e641bf1a050c0e5ee74
2021-11-03 19:55:05 +00:00
Yanting Yang
204f82d6c4
Rephrase dialog message of clear storage dialog for security concern am: 7fd0ece6f4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101569
Change-Id: I78d007987cc32a6673e1e843aa2b54d96c9e145c
2021-11-03 19:49:30 +00:00
Yanting Yang
337e182e0f
Rephrase dialog message of clear storage dialog for security concern am: 7d22136fb0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101568
Change-Id: I73a42c76e9bc6c5b3c6aff1da4bc364925f98ff0
2021-11-03 19:48:27 +00:00
Hugh Chen
f8cd68c6e2
RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission
...
- Only enable device can be discoverable when the user launch
"Connected Devices settings" through settings and systemui
Bug: 194695497
Test: make -j42 RunSettingsRoboTests and use test apk to manually test
to verify the device is not discoversable when open "Connected settings"
through test apk.
Change-Id: Ia04ab759b737acf30b782f5c5831dd59f25fb257
(cherry picked from commit d3abbb9821 )
2021-11-01 07:44:18 +00:00
Hugh Chen
d4e0ed2284
RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission
...
- Only enable device can be discoverable when the user launch
"Connected Devices settings" through settings and systemui
Bug: 194695497
Test: make -j42 RunSettingsRoboTests and use test apk to manually test
to verify the device is not discoversable when open "Connected settings"
through test apk.
Change-Id: Ia04ab759b737acf30b782f5c5831dd59f25fb257
(cherry picked from commit d3abbb9821 )
2021-11-01 07:37:33 +00:00
Yanting Yang
7fd0ece6f4
Rephrase dialog message of clear storage dialog for security concern
...
Bug: 193890833
Test: visual
Change-Id: I8f0b066de710169ee8b922c44b6519ca21b9c7ef
(cherry picked from commit 0c359da620 )
2021-10-25 05:54:12 +00:00
Yanting Yang
7d22136fb0
Rephrase dialog message of clear storage dialog for security concern
...
Bug: 193890833
Test: visual
Change-Id: I8f0b066de710169ee8b922c44b6519ca21b9c7ef
(cherry picked from commit 0c359da620 )
2021-10-25 05:53:42 +00:00
TreeHugger Robot
81a3e690c1
Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into qt-dev am: 2642a3c73e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994985
Change-Id: I5a5227a53faaadc78e1bebf725671f04adb0f2c9
2021-10-07 00:17:38 +00:00
TreeHugger Robot
2642a3c73e
Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into qt-dev
2021-10-07 00:03:46 +00:00
Chen Chen
b025b7fa88
BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: aebca7f35b am: d96d13c4f1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994984
Change-Id: I5071ab9c43b8882efb51a7eae9f11a2a982f23cb
2021-10-06 21:30:16 +00:00
Chen Chen
d96d13c4f1
BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: aebca7f35b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994984
Change-Id: Icee7ffd9cd3218bb4cd9fcb8fd1c37fc34274507
2021-10-06 21:18:45 +00:00
Weng Su
2fe0d45ab8
Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into qt-dev am: 3678155f90
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958164
Change-Id: I82807875c1087f54e7c6701ea3cb7e73af9b0352
2021-10-06 19:05:00 +00:00
Weng Su
0fe85baf93
[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: 153b0f03f5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958164
Change-Id: I1060479460cccc4e5e827b3687d3aaa214311ea5
2021-10-06 19:04:59 +00:00
Weng Su
cbd0883356
[RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: 6a2624e500
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958163
Change-Id: I74316633648d6a5002433440358b9a0a443b3cf8
2021-10-06 19:04:58 +00:00
Weng Su
457a63ce84
[RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: d05686b431
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958162
Change-Id: I90af118b9033a7ee53b35aa2b435d2ba95281181
2021-10-06 19:04:56 +00:00
Chen Chen
65a63e76b1
BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog
...
Bug: 194300867
Test: Build
Change-Id: I5a496df50550ea7ee6986c960e28ae3e4a056b4b
2021-10-06 18:52:10 +00:00
Chen Chen
aebca7f35b
BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog
...
Bug: 194300867
Test: Build
Change-Id: I5a496df50550ea7ee6986c960e28ae3e4a056b4b
2021-10-06 18:50:23 +00:00
Weng Su
3678155f90
Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into qt-dev
2021-10-06 18:47:29 +00:00