Commit Graph

105035 Commits

Author SHA1 Message Date
Taran Singh
0ee3b96e59 DO NOT MERGE: Prevent non-system IME from becoming device admin
Currently selected IME can inject KeyEvent on DeviceAdminAdd screen to
activate itself as device admin and cause various DoS attacks.

This CL ensures KeyEvent on "Activate" button can only come from system
apps.

Bug: 280793427
Test: atest DeviceAdminActivationTest
Change-Id: I6470d1684d707f4b1e86f8b456be0b4e0af5f188
(cherry picked from commit 70a501d02e)
2023-06-02 21:58:54 +00:00
TreeHugger Robot
672ba73070 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2023-05-31 16:55:16 +00:00
Bill Yi
cd3e51654c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I50112e91300526751158c02ab03960f005b60c39
2023-05-29 00:51:07 -07:00
Bill Yi
e9d26cfdce Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I481b414f50fc988072ec462c2e6ac4f48fe69585
2023-05-29 00:49:34 -07:00
Bill Yi
07b6109a0f Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2023-05-24 01:54:48 +00:00
Bill Yi
e4cc2b888b Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iffb438b8033773986e3c24d85f13199d23007994
2023-05-22 16:43:01 -07:00
Bill Yi
02863edd4e Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I539b27b03f5c9c5dc0cf1dd44b3e4263bf617eff
2023-05-22 16:41:26 -07:00
Bill Yi
d83c9c6f21 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2023-05-17 22:07:24 +00:00
Bill Yi
f88b1c7f59 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I8b8eb430e0153199122fa34a8075e6f126699e65
2023-05-16 21:30:56 -07:00
Bill Yi
ddb6d0ea0a Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I27580b73ccc5dad4b82850898cc9c71c0e83abeb
2023-05-16 21:29:01 -07:00
Treehugger Robot
b570c10767 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2023-05-11 19:28:21 +00:00
Bill Yi
63af1d8683 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Id5b16e70d8c5cc99699281eed833bcabbcd8e8aa
2023-05-09 19:04:28 -07:00
Bill Yi
eac02feb2d Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I752b8c12cf13fcb989dbb335b3230198d3be3201
2023-05-09 19:02:21 -07:00
Lin Yuan
eb3be1fa5b [automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 am: 062a9ca549 am: f86d507407 am: d8321f5df7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203

Change-Id: Iff01dd3f1528b2ded54b281c1f810293093f2ff4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 00:52:56 +00:00
Lin Yuan
d8321f5df7 [automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 am: 062a9ca549 am: f86d507407
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203

Change-Id: I23d09d7f0c376493ba30ac38577d196b69d46335
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 00:02:52 +00:00
Lin Yuan
f86d507407 [automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 am: 062a9ca549
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203

Change-Id: I7884ced3a0a1d29508127fbc263197c20f6ff0d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 23:23:36 +00:00
Treehugger Robot
7b5293a704 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2023-05-03 21:31:16 +00:00
Bill Yi
437972564f Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I7b7680565a7eebacce97ba3f8868d190252962d2
2023-05-02 12:41:32 -07:00
Bill Yi
a68ce93fbe Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I923b5604d38de2cf630a11d9dc7faca02311801a
2023-05-02 12:39:11 -07:00
Lin Yuan
062a9ca549 [automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203

Bug: 277333746
Bug: 277333781
Change-Id: I91aa143223d7d37751120aa9246bce4dc31a54a6
2023-04-25 19:24:13 +00:00
Lin Yuan
7591fff234 Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency.
When DISALLOW_CONFIG_LOCATION is set, make location service's
MainSwitchPreference pages for wifi scanning and bluetooth scanning
unavailable too, so that intent direct access is disabled.

screenshot: http://shortn/_kkK3BMTSh1

Bug: 277333746
Bug: 277333781
Test: atest SettingsRoboTests, on device
Change-Id: I52f9a11b1dd78a5e5dbb1bbde3cda7381c87ae39
2023-04-25 19:23:53 +00:00
Treehugger Robot
32873d192b Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2023-04-25 17:49:42 +00:00
Bill Yi
fa5e1c57f8 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ide3a650caf8d7a7d3a127d31be873d5eb3e067d9
2023-04-21 17:15:06 -07:00
Bill Yi
960fa1521c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I686b72adb7baa39b1bf41d1a4e112530b0d773c6
2023-04-21 17:13:18 -07:00
Bill Yi
b660ca5570 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2023-04-19 17:44:26 +00:00
Bill Yi
6c08eb4631 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I040ac2ddddb7199dd21d9bc5941eb22c32e535a9
2023-04-17 21:13:50 -07:00
Bill Yi
488128bd1d Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ida5f1de75b985bbea418a20e4537a40b213827e6
2023-04-17 21:08:01 -07:00
Treehugger Robot
8e95c6e66a Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2023-04-12 18:38:34 +00:00
Bill Yi
817fa66f8b Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Idfc95fbffa4b55fe31507a00c25ce3d99d058c79
2023-04-10 23:53:44 -07:00
Bill Yi
bc0dc12fce Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I636427362221ee1405fa14fd1d66218793460cff
2023-04-10 23:51:57 -07:00
Jason Chiu
1bd4b6e2ea [automerger skipped] Refine permission check process of 2-pane deep link am: 0f13f70655 -s ours
am skip reason: skipped by user chiujason

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

Change-Id: I5669aefc0320ecdc610c56e0aade5600b5a1c79a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-07 06:26:10 +00:00
Jason Chiu
0f13f70655 Refine permission check process of 2-pane deep link
- Check the deep link activity instance before redirecting to the
  internal activity for the managed profile invocation, so the caller
  can't bypass the permission check.
- Get the referrer as the caller so that onNewIntent can recognize the
  new caller and check if it has a permission to open the target page.

Test: robotest & manual
Bug: 268193384
Change-Id: Ie69742983fb74ee2316b7aad16461db95ed927c2
Merged-In: Ie69742983fb74ee2316b7aad16461db95ed927c2
2023-04-06 04:23:01 +00:00
Bill Yi
bc051a4860 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2023-04-04 04:33:23 +00:00
Bill Yi
4c6c727262 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ie6806ae2768788dbef4a8dcff5f418970731ebb6
2023-04-02 17:46:34 -07:00
Bill Yi
7a4e68d269 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ieb9881a34662fb6c68038a3702b7e26907e25ef0
2023-04-02 17:45:04 -07:00
Julia Reynolds
f445bb3b32 [automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours am: 8befc27425 -s ours am: cfacc2acb8 -s ours am: 85c25d29d7 -s ours am: 684952a8b0 -s ours am: e4ce644bfe -s ours
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618 is already in history

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

Change-Id: Ie5dfb22c27e0557719ddd96c104f5582f6c14b43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 17:36:12 +00:00
Julia Reynolds
e4ce644bfe [automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours am: 8befc27425 -s ours am: cfacc2acb8 -s ours am: 85c25d29d7 -s ours am: 684952a8b0 -s ours
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618 is already in history

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

Change-Id: I760d7d641cc26d9d640c3504414a16a26d70bc24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 16:57:36 +00:00
Julia Reynolds
684952a8b0 [automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours am: 8befc27425 -s ours am: cfacc2acb8 -s ours am: 85c25d29d7 -s ours
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618 is already in history

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

Change-Id: Ic239b938c957b82b8eb072ba55b34ab9388a24af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 16:25:15 +00:00
TreeHugger Robot
71f0ec1432 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2023-03-30 06:57:35 +00:00
Julia Reynolds
85c25d29d7 [automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours am: 8befc27425 -s ours am: cfacc2acb8 -s ours
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618 is already in history

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

Change-Id: I8124bdb6668bc43f275489abb311994ea69645db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-29 16:58:46 +00:00
Julia Reynolds
cfacc2acb8 [automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours am: 8befc27425 -s ours
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618 is already in history

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

Change-Id: Ie11a802db36591d58289cd82956c5205f0893244
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-29 16:28:40 +00:00
Julia Reynolds
8befc27425 [automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618 is already in history

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

Change-Id: I8d1fa61e9c43c711725505554b464697f1f1ad4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-29 15:56:56 +00:00
Bill Yi
71ac923b9e Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I9b2e5e99dedd51de896dc2a34814e0ef8b658595
2023-03-28 17:51:47 -07:00
Bill Yi
ac1796011a Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I99912ab2402e8f08b599c8ad69252ba0c413f687
2023-03-28 17:50:06 -07:00
Julia Reynolds
592574f05d [automerger skipped] Don't show NLSes with excessively long component names am: 79cb59e618 -s ours am: ceb2d0400a -s ours am: 7c9190d25a -s ours am: 82fcfa8da0 -s ours am: 40bec70af8 -s ours
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 52a102cc2a is already in history

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

Change-Id: I34532bbc1689a65d9d5cac6325956e4931ee7a94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 22:03:48 +00:00
Julia Reynolds
40bec70af8 [automerger skipped] Don't show NLSes with excessively long component names am: 79cb59e618 -s ours am: ceb2d0400a -s ours am: 7c9190d25a -s ours am: 82fcfa8da0 -s ours
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 52a102cc2a is already in history

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

Change-Id: I0c3f8af192ffa31af66955a27ef870122a04ce4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 21:46:08 +00:00
Julia Reynolds
82fcfa8da0 [automerger skipped] Don't show NLSes with excessively long component names am: 79cb59e618 -s ours am: ceb2d0400a -s ours am: 7c9190d25a -s ours
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 52a102cc2a is already in history

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

Change-Id: I78da1d627b1db61015124fbd3df59cd80376bbf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 21:16:39 +00:00
Julia Reynolds
7c9190d25a [automerger skipped] Don't show NLSes with excessively long component names am: 79cb59e618 -s ours am: ceb2d0400a -s ours
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 52a102cc2a is already in history

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

Change-Id: Icb423063d82a05cfb734fd889f2799474f453c59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 20:43:18 +00:00
Julia Reynolds
ceb2d0400a [automerger skipped] Don't show NLSes with excessively long component names am: 79cb59e618 -s ours
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 52a102cc2a is already in history

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

Change-Id: I6ab06a30496dffbfc038300866d0b3ca3c1d42a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 20:25:32 +00:00
Julia Reynolds
8a344f301b [automerger skipped] [automerged blank] Don't show NLSes with excessively long component names 2p: 52a102cc2a am: cbb6811219 -s ours am: acb5e90d5d -s ours am: 7594f2deea -s ours
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 1f3969f615 is already in history

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

Change-Id: I703bdb03adef5c11693b308a6e2f897417e43b7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 19:45:07 +00:00