PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
106,722 Commits 1 Branch 0 Tags
148f0a85910c21c80d03f4b741cd1c83cfceaa0c
Commit Graph

106722 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bonian Chen
6af2fb8578 Merge "[Settings] Not allow APN delete when adding is not an option" into tm-d1-dev am: 45051bb169 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746893

Change-Id: If948deb5fc93c3654e474bd4d4d588859affbfa6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-27 04:12:07 +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
Oli Lan
f70e351d1a Prevent exfiltration of system files via avatar picker. 
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.

This is a fixed version of ag/17003629, to address b/239513606.

Bug: 187702830
Test: build and check functionality
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
Change-Id: I98eea867f926c508456ec9bc654e24eeeffa0e54
 2022-08-26 19:46:02 +01:00
Automerger Merge Worker
34db7cdde9 Merge changes from topic "am-1f14ab54c2414b4ca60bb589f9ee6837" into tm-d1-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: ecbf9be9a4 -s ours am: 2810928518 -s ours am: 29f4dd9a23 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e5669b82f -s ours am: c9ac950159 -s ours am: aacbd2e2ae -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ccb75281f -s ours am: bfd43e8459 -s ours am: 089e0c7606 -s ours
 2022-08-26 18:33:31 +00:00
TreeHugger Robot
5d6defbe4c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: ecbf9be9a4 -s ours am: 2810928518 -s ours am: 29f4dd9a23 -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: I927d21f0655638ca2fc42d0336e9db0283520ce4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 18:32:23 +00:00
Bill Yi
a99db9e352 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e5669b82f -s ours am: c9ac950159 -s ours am: aacbd2e2ae -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: I5f14460622da4d3cb2a836f043cd872dd234eff0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 18:32:10 +00:00
Bill Yi
e2c968545f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ccb75281f -s ours am: bfd43e8459 -s ours am: 089e0c7606 -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: Ib4a34154bab2bac31d30af95ff10a1192137562e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 18:31:59 +00:00
TreeHugger Robot
be93a93ceb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: ecbf9be9a4 -s ours am: 2810928518 -s ours am: c006955815 -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: I340e0338e9ab57fce5a22807eeaf075a451dece2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 18:31:15 +00:00
Bill Yi
1620b3809f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e5669b82f -s ours am: c9ac950159 -s ours am: 58ea31040c -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: Ibea23be346fedd84bde90a3a78b60eb76c6eac01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 18:31:02 +00:00
Bill Yi
40e838cb44 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ccb75281f -s ours am: bfd43e8459 -s ours am: 7a3ffa65cb -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: Idc32ec7001b86babab1367eb6c802a5410e97796
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 18:30:52 +00:00
TreeHugger Robot
29f4dd9a23 [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: I751f3f087f95c4e51a4850958fea09fd65fb1edf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 17:57:19 +00:00
Bill Yi
aacbd2e2ae [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: I6d96dcd9e2da4c62d4a81aa2379dd52b6f03605e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 17:57:06 +00:00
Bill Yi
089e0c7606 [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: I765f7749ff566563f7121463d3d3cad7790054aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 17:56:55 +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
f9bf84d822 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I022fac7bfc51decd6c42007534917453acf4b7cf
 2022-08-24 20:54:14 -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
5c691c0670 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 1be27e97c5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iad5a8f14604bcba021c13146ec1b0b4fb2d11681
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 14:23:20 +00:00
Bill Yi
60f828e428 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9c441ad4fe -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icd342af76d5df98b8855635e5fdac9097dc66335
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 14:22:55 +00:00
Bill Yi
9281ec1752 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 1a3d6c47c2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3ce860ad406c50b616e86eeb03d341dc422cff4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 14:22:35 +00:00
Bill Yi
381f37b918 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 789b774cb2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I832faea9d0f28e85e4ce5fc7c796bf0d94a093c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 14:22:18 +00:00
Treehugger Robot
1467de15bc Merge "Fix always return first package for mock location app in developer options." am: d221269892 am: 280ad76afb am: 4c06c2426d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2133170

Change-Id: I6ffe3f49c01d692a9eb1c77030be732be204ef8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 14:17:42 +00:00
Treehugger Robot
4c06c2426d Merge "Fix always return first package for mock location app in developer options." am: d221269892 am: 280ad76afb 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2133170

Change-Id: If151337acb399e3ce8ab733eb44d2cc6a9ef0484
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 13:59:51 +00: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
280ad76afb Merge "Fix always return first package for mock location app in developer options." am: d221269892 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2133170

Change-Id: I66bdf2036d3a3af348137b07a1b2b9edb29d1894
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 13:38:27 +00:00
Treehugger Robot
d221269892 Merge "Fix always return first package for mock location app in developer options." 2022-08-23 13:15:51 +00:00
张倞诚
d8d0cb3532 Fix always return first package for mock location app in developer options. 
The mock location app should be OP_MOCK_LOCATION allowed app, the packageOps.get(0).getPackageName()
is the first app that used the OP_MOCK_LOCATION in history, but maybe rejected.

Change-Id: I0158436dd7d2790f4e9640075bc9c8bd3422f467
 2022-08-23 07:50:16 +00:00
Automerger Merge Worker
ad5444df28 Merge changes from topic "am-3814f95bacde4982ab989e398ac8052d" into tm-d1-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ad78b5a675 -s ours am: 4f819e1516 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 32ddcf7c21 -s ours am: f8f3b752ea -s ours
 2022-08-23 06:52:09 +00:00
TreeHugger Robot
9313d8a22a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ad78b5a675 -s ours am: aa3a5a8e5f -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: Icbc3f343aa07d0122481f2908c9b6d97aea4d30d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 06:51:15 +00:00
TreeHugger Robot
a31f4bd4de [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ad78b5a675 -s ours am: 4f819e1516 -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: Ibb4cb81dd2d8389d328d97cb4736888a8791b4c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 06:51:10 +00:00
Bill Yi
03694f9b15 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 32ddcf7c21 -s ours am: c6fcf4dd69 -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: I1f306f069b9c31b824091a7aafc43ef84b348cf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 06:50:57 +00:00
Bill Yi
43e0cb70ee [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 32ddcf7c21 -s ours am: f8f3b752ea -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: I891d1b51f44b3da0074262eeb5b7a92f7598fe3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 06:50:52 +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
aa3a5a8e5f [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: Iaeecd274c351d8e464dde1a2d47b97fe7dbc4768
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 06:11:12 +00:00
Bill Yi
c6fcf4dd69 [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: If536c05600e8c63286f3ca35e5526b3dd0179e62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 06:10:54 +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
5c46283548 [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: 80cdde7ce8 -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: Icb22ace85025a844aedfcc8f83a2f25aa88912af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 16:53:19 +00:00
Automerger Merge Worker
19f1f4fb14 Merge "[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: 5d23958f2a -s ours" into tm-d1-dev-plus-aosp 2022-08-22 16:53:13 +00:00