Commit Graph

530366 Commits

Author SHA1 Message Date
Brad Ebinger
7420236576 Merge "Fix a typo in service class" am: 7b38b459f3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1429089

Change-Id: I72ee0311a6a0f63d6b7a7d3375ac03254302fb62
2020-09-19 05:30:38 +00:00
Bill Yi
2075ab0f01 Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: e935e010b3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515

Change-Id: Iaa631aaca21a51d786f59801d317f27ee635c70f
2020-09-19 05:25:29 +00:00
Bill Yi
1848cf03d8 Merge mainline-release 6664920 to master - DO NOT MERGE am: 5b49c68d11
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515

Change-Id: Id233d0d39ad2d63ae3e6d6128b631e149f68990e
2020-09-19 05:22:39 +00:00
Treehugger Robot
9a4505c4fb Merge "Mark emergency dialer package string as untranslatable." 2020-09-18 21:11:57 +00:00
Amit Mahajan
47a1e949c3 Merge "Data connection for carrier specific APN" 2020-09-18 20:05:25 +00:00
Brad Ebinger
7b38b459f3 Merge "Fix a typo in service class" 2020-09-18 18:58:10 +00:00
Bill Yi
e935e010b3 Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" 2020-09-18 18:47:48 +00:00
wan.li
daf5e2a5b1 Ringtone uri should add type query
When only DisplayName is used to query the default ringtone,
the query may be incorrect, because other types of ringtones
may contain resources with the same name.

It should not happen that other types of ringtone uri are set
as the default ringtone of the current type by mistake.

Test: manual set all types of default ringtones to use the audio
with the same DisplayName as the preset value. See if all types
of ringtones are selected in RingtonePickerActivity.

Bug: 168431815

Change-Id: Iec46c80b1da929cacc0e04fd9641955ce6e8cfcf
2020-09-18 19:32:40 +08:00
wan.li
7fc3eab710 Add the return branch when ringtone position is POS_UNKNOWN
When the getCheckItem is POS_UNKNOWN, it is not the case we expected.
We return null for this case.

Test: manual start RingtonePickerActivity to use
EXTRA_RINGTONE_SHOW_DEFAULT false and EXTRA_RINGTONE_SHOW_SILENT false.
Check the returned EXTRA_RINGTONE_PICKED_URI, it should be null.

Bug: 165892509

Change-Id: Id473dad2e8672a65e5c1b0fee16a7d22e9bcb3e9
2020-09-18 09:30:44 +00:00
paulhu
2cbae66fcb Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission to DownloadProvider
- DownloadManager will use the requestor app's default network to
open a connection. When the VPN app lists the DownloadProvider as
a disallowed application, this will fail with EPERM.
- This is because in R, the DownloadProvider lost its privileges
due to the removal of the CONNECTIVITY_INTERNAL permission. It's
removed without considering the corner case where the
DownloadProvider is excluded from using the VPN. It's the only
case where this makes a difference.
- Adding CONNECTIVITY_USE_RESTRICTED_NETWORKS will give
DownloadProvider the ability to use the VPN again in this case,
fixing the issue.

Bug: 165774987
Test: Build, flash rom and boot to home. Manully test that
      DownloadProvider can download file via VPN.
Change-Id: If8fa785568ace1f15f53daec67c06e1207d5dc9c
Merged-In: If8fa785568ace1f15f53daec67c06e1207d5dc9c
2020-09-18 08:24:12 +00:00
Masaho Nishikawa
52052c8147 Data connection for carrier specific APN
Implement the following features to support carrier network connection.
This commit is to define the carrier config for each features.

1. Sets default preferred APN
2. Uses dun APN when using Preset APN in roaming network

Also, fixed that to use only APNs with the same set id as preferred
APN.

Test: Manual
Bug: 147969062
Merged-in: If1e6d2bf58de39c22caa901fcd90fb11f104d900
Change-Id: If1e6d2bf58de39c22caa901fcd90fb11f104d900
2020-09-18 07:36:28 +00:00
Amit Mahajan
e2b212e94e Merge "Data connection for carrier specific APN" into rvc-d1-dev-plus-aosp 2020-09-18 07:35:46 +00:00
Nucca Chen
4894d08926 Merge "Move BPF offload program from netd to mainline" am: c26848e7bd am: ca5a85bcb0 am: f2deca5759
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1424189

Change-Id: I248a1e3d9aad6a1f632898faa59953f29ba14f5f
2020-09-18 05:36:25 +00:00
Bill Yi
5b49c68d11 Merge mainline-release 6664920 to master - DO NOT MERGE
Merged-In: Id04ea331831e8b26ba99478848392b40a92548d5
Change-Id: I888da0c9475f2d00602d917d2f58169f8d7c93a4
2020-09-17 21:56:59 -07:00
Nucca Chen
f2deca5759 Merge "Move BPF offload program from netd to mainline" am: c26848e7bd am: ca5a85bcb0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1424189

Change-Id: Ic90ce1bc5a5abd1eb515e5392b2980cdd001dc9f
2020-09-18 04:56:57 +00:00
Nucca Chen
ca5a85bcb0 Merge "Move BPF offload program from netd to mainline" am: c26848e7bd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1424189

Change-Id: Ia0b8a185f44dac7db365fcb9fc865a82bd552d62
2020-09-18 04:27:28 +00:00
Nucca Chen
c26848e7bd Merge "Move BPF offload program from netd to mainline" 2020-09-18 04:05:15 +00:00
Jin Seok Park
c6cf32b623 Add function for adding EXIF to WebP files
Code copied from aosp/1148409 and aosp/1236647 with some minor
changes.

Original commit message:
Added code and test for WebP files
1) with EXIF data
2) without EXIF data but with other extra data
Added code and test for saving EXIF to WebP files without EXIF data
1) and have lossy encoding
2) and have lossless encoding
Also refactored test method names for better readability.

Bug: 138786288
Test: atest CtsMediaTestCases:android.media.cts.ExifInterfaceTest
Change-Id: Ib6319e1b7b6711b071542d94ebfdc4a9f80e9c16
Merged-In: Ib6319e1b7b6711b071542d94ebfdc4a9f80e9c16
2020-09-17 16:43:34 -07:00
Jin Seok Park
40b7a9f873 Remove hidden API usage in ExifInterface
Copying over util class methods
ArrayUtils#startsWith(byte[], byte[])
Streams#copy(InputStream, OutputStream)
IoUtils#closeQuietly(AutoCloseable)

Bug: 159569080, Bug: 159569444, Bug: 159569092
Test: atest CtsMediaTestCases:android.media.cts.ExifInterfaceTest
Change-Id: I5f7f3387e88728809b55a0049fb1937a458d02cb
Merged-In: I5f7f3387e88728809b55a0049fb1937a458d02cb
2020-09-17 16:42:02 -07:00
Brad Ebinger
8248366af0 Merge "Customize the service class for Call barring" am: ce872e9898 am: cdbb2d7a40 am: c54ab73ef9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404668

Change-Id: I7c2074ecf612a6cdfcc9e9bfd314063771f60684
2020-09-17 23:41:41 +00:00
Grace Jia
6996ce0011 Mark emergency dialer package string as untranslatable.
When system language set to XA, config_emergency_dialer_package used to
automatically translate to XA version, which cannot be used by Telecom
to start the emergency dialer.

Bug: 168772316
Test: Manually set system language to XA and make sure emergency dialer
can be start expectedly.

Change-Id: I02a522e0a7dcb871bdebb4e373242d94b7684951
2020-09-17 16:18:51 -07:00
Xin Li
719c0cab1b Skip android11-tests-dev.
Bug: 168333982
Change-Id: I17e45ef260cc98cf26f87f8e5bcd91f405576e45
2020-09-17 16:00:46 -07:00
Brad Ebinger
c54ab73ef9 Merge "Customize the service class for Call barring" am: ce872e9898 am: cdbb2d7a40
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404668

Change-Id: Id04ea331831e8b26ba99478848392b40a92548d5
2020-09-17 22:51:15 +00:00
Brad Ebinger
5087fa7156 Merge "Decouple the ImsFeature status listener from creating the feature" am: d259885f8a am: 1ee8c01f2f am: 16288d636f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1427468

Change-Id: Ia4dd0637144e0f0553790564989920d55bc20809
2020-09-17 22:32:02 +00:00
Brad Ebinger
16288d636f Merge "Decouple the ImsFeature status listener from creating the feature" am: d259885f8a am: 1ee8c01f2f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1427468

Change-Id: I51bb4de316f365790df997f89ff90c130781395c
2020-09-17 22:22:50 +00:00
Brad Ebinger
cdbb2d7a40 Merge "Customize the service class for Call barring" am: ce872e9898
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404668

Change-Id: I2a09554becc19cab2ca0b9b3af12f100296bb2d2
2020-09-17 22:16:19 +00:00
Brad Ebinger
1ee8c01f2f Merge "Decouple the ImsFeature status listener from creating the feature" am: d259885f8a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1427468

Change-Id: I897a005be49474e171fbc90f2bf8c569f4408539
2020-09-17 21:51:51 +00:00
Treehugger Robot
8ce81bcb12 Merge "Clarify docs for FLAG_SYSTEM" am: 40dcbcad28 am: b4ff7c066f am: 687923e2c7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426971

Change-Id: I8b6e9e6de24d6c6332a5a224d1375ebc63c08899
2020-09-17 21:43:35 +00:00
Treehugger Robot
2a2720593f Merge "Ignore resources from unknown types" am: e0f44eb6e7 am: a4bb7ab3b4 am: fda617812b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1430090

Change-Id: I8c7c767ac65ff8f01ef29a5f4d7a4374a40a62d6
2020-09-17 21:34:56 +00:00
Treehugger Robot
6db4bc3852 Merge "Add ".webp" to default compress extensions" am: bf6a120aaa am: f700df50c6 am: d97e7b04a2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1430089

Change-Id: I9b775699bfa9c9d9c18393f0db1dadb353aa9492
2020-09-17 21:31:27 +00:00
Treehugger Robot
2ad3277a24 Merge "Make configs differing only in density siblings" am: db0a92a881 am: 93cd93c3b1 am: 26d31a447a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1430088

Change-Id: Ia7ea92a1b1c75c0fd75b1a39bb6e71f84519ab5a
2020-09-17 21:18:12 +00:00
Treehugger Robot
687923e2c7 Merge "Clarify docs for FLAG_SYSTEM" am: 40dcbcad28 am: b4ff7c066f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426971

Change-Id: Ic4c890da09e087f4f676aa257cd6021f48f66ccf
2020-09-17 21:06:52 +00:00
Treehugger Robot
fda617812b Merge "Ignore resources from unknown types" am: e0f44eb6e7 am: a4bb7ab3b4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1430090

Change-Id: I8414859c6142c59c3eb78939ee0ad12b9549f01a
2020-09-17 21:04:22 +00:00
Treehugger Robot
d97e7b04a2 Merge "Add ".webp" to default compress extensions" am: bf6a120aaa am: f700df50c6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1430089

Change-Id: Ibd5aa7d237f4c935ae63b2cce2dcca09f3dc9d89
2020-09-17 20:48:31 +00:00
Treehugger Robot
26d31a447a Merge "Make configs differing only in density siblings" am: db0a92a881 am: 93cd93c3b1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1430088

Change-Id: I9578e7ae692b428c1c50caae2de7118a6eae498a
2020-09-17 20:48:17 +00:00
Brad Ebinger
ce872e9898 Merge "Customize the service class for Call barring" 2020-09-17 20:42:02 +00:00
Brad Ebinger
d259885f8a Merge "Decouple the ImsFeature status listener from creating the feature" 2020-09-17 20:23:25 +00:00
Treehugger Robot
b4ff7c066f Merge "Clarify docs for FLAG_SYSTEM" am: 40dcbcad28
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426971

Change-Id: Ibb91af81ecd8c69af2609a836ec941983f0fb9a3
2020-09-17 20:18:25 +00:00
Treehugger Robot
a4bb7ab3b4 Merge "Ignore resources from unknown types" am: e0f44eb6e7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1430090

Change-Id: Ide8fdd4edb88574b046ed7302fb3e3e9415a8db3
2020-09-17 20:15:43 +00:00
Treehugger Robot
f700df50c6 Merge "Add ".webp" to default compress extensions" am: bf6a120aaa
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1430089

Change-Id: I0c50da091056cfb10c8f166eeb5cd50043c7d8d7
2020-09-17 20:12:02 +00:00
Treehugger Robot
93cd93c3b1 Merge "Make configs differing only in density siblings" am: db0a92a881
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1430088

Change-Id: Ibe1ca214e65376d9c531c40bd7f89dc931e709ef
2020-09-17 20:02:07 +00:00
Ivan Chiang
3bff601a8a Merge "Revert "Ringtone uri should add type query"" am: 56da278127 am: 7a5e865a80 am: b145311a8d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1429968

Change-Id: I1751238eb75a288c9f13a0c857a00c04e908d1f6
2020-09-17 19:45:20 +00:00
Ivan Chiang
b145311a8d Merge "Revert "Ringtone uri should add type query"" am: 56da278127 am: 7a5e865a80
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1429968

Change-Id: I80c2583f27d3376a065f93d985e832c99001536f
2020-09-17 19:13:46 +00:00
Treehugger Robot
40dcbcad28 Merge "Clarify docs for FLAG_SYSTEM" 2020-09-17 18:05:13 +00:00
Treehugger Robot
e0f44eb6e7 Merge "Ignore resources from unknown types" 2020-09-17 17:52:13 +00:00
Treehugger Robot
bf6a120aaa Merge "Add ".webp" to default compress extensions" 2020-09-17 17:52:04 +00:00
Treehugger Robot
db0a92a881 Merge "Make configs differing only in density siblings" 2020-09-17 17:51:53 +00:00
Ivan Chiang
7a5e865a80 Merge "Revert "Ringtone uri should add type query"" am: 56da278127
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1429968

Change-Id: Ia0de693ab6e40de6591ebf223ca9da177ae9735e
2020-09-17 17:39:20 +00:00
Ivan Chiang
56da278127 Merge "Revert "Ringtone uri should add type query"" 2020-09-17 16:28:10 +00:00
Ryan Mitchell
701a7fe39d Ignore resources from unknown types
When loading binary APKs into aapt2 for dumping purposes, aapt2 allows
the presence of custom resource types in the resources.arsc. Since
apapt2 may not be able to correctly interpret the data of custom types,
ignore resources from custom types completely when constructing the
ResourceTable data structure for the APK.

Bug: 168247188
Bug: 36051266
Test: run aapt2 dump bading/resources on APKs from both bugs
Merged-In: Ia3c0b4e07457eb8634b5a256ef77270e99b8bd72
Change-Id: Ia3c0b4e07457eb8634b5a256ef77270e99b8bd72
2020-09-17 08:20:09 -07:00