Commit Graph

508857 Commits

Author SHA1 Message Date
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
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
Ryan Mitchell
59cefc8403 Add ".webp" to default compress extensions
The .webp extension contains compressed image data so do not deflate
.webp files in APKs.

Bug: 166137617
Test: aapt2 link
Merged-In: I70181437e0b51122c7aa5047bd0a0791ac3b8df6
Change-Id: I70181437e0b51122c7aa5047bd0a0791ac3b8df6
2020-09-17 08:19:49 -07:00
Ryan Mitchell
0a0bf36555 Make configs differing only in density siblings
Configurations differing only in density value will match the same
device configuration at runtime; therefore, they should be considered
sibling configurations in the dominator tree.

So, given configurations A and B:
1) If A has a density defined and B does not, A must never dominate B.
2) If A and B both have densities defined, neither must dominate the
   other.

Previous behavior:
<default>
  sw600dp-v13
    sw600dp-hdpi-v13
       sw800dp-hdpi-v13
    sw800dp-xxhdpi-v13

New behavior:
<default>
  sw600dp-v13
    sw600dp-hdpi-v13
      sw800dp-hdpi-v13
      sw800dp-xxhdpi-v13

Bug: 167944889
Test: aapt2_tests
Merged-In: Ie9fba4c4b74af2b3bbf8fc6432539a99f8647634
Change-Id: Ie9fba4c4b74af2b3bbf8fc6432539a99f8647634
2020-09-17 08:18:27 -07:00
Lev Proleev
689ff54e86 Revert "Ringtone uri should add type query"
This reverts commit 3b25df9ad3.

Reason for revert: potential culprit for test breakage: b/168789394

Change-Id: Ie042b91c189c026079b040f6609df4c22c70f2cf
2020-09-17 13:47:54 +00:00
Jakub Pawlowski
8e139a82cd Merge "Bluetooth: log who changes adapter name" am: 78f92ef7fa
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1428568

Change-Id: Ifdf6380978750295b4c88077ae4081937b38d56e
2020-09-17 11:42:51 +00:00
Jakub Pawlowski
78f92ef7fa Merge "Bluetooth: log who changes adapter name" 2020-09-17 11:13:35 +00:00
Jakub Pawlowski
6dcad2884a Bluetooth: log who changes adapter name
This is very helpful to find which third party app modified the adapter
name.

Bug: 168605944
Test: manual - change name, observe logcat output
Change-Id: I9a13c89e6ef416286411f786e233d81507c9d53a
2020-09-17 08:07:39 +00:00
Treehugger Robot
773810d198 Merge "Add action for Bluetooth tethering state changed" am: cf44a015e8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1422889

Change-Id: I982ccbaae0f9865d20f1b0c16c1990f863b5c325
2020-09-17 02:38:18 +00:00
Treehugger Robot
cf44a015e8 Merge "Add action for Bluetooth tethering state changed" 2020-09-17 02:01:00 +00:00
Lucas Lin
5445a0f7ab Merge "Rename mUserHandle to mUserId for better understanding" am: 8f10e0097b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426656

Change-Id: I0a9cdc959def7dc157494bc30b311b09d0fcea53
2020-09-17 01:36:15 +00:00
Lucas Lin
8f10e0097b Merge "Rename mUserHandle to mUserId for better understanding" 2020-09-17 01:30:27 +00:00
Robert Chou
caf558ecdc Merge "Ringtone uri should add type query" am: 96d98a9fad
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426651

Change-Id: I06a7b6696daebe999e90887bcc5dcb645a683002
2020-09-17 01:25:06 +00:00
Robert Chou
96d98a9fad Merge "Ringtone uri should add type query" 2020-09-17 01:00:58 +00:00
Amit Mahajan
eeeb5b506f Merge "Fixed that data connections not tearing down when APN set id changes" am: 2c3e56fce6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1371060

Change-Id: I241c839930f98ba838e3e30f900fa42a64663df2
2020-09-16 22:22:09 +00:00
Amit Mahajan
2c3e56fce6 Merge "Fixed that data connections not tearing down when APN set id changes" 2020-09-16 21:11:50 +00:00
Leon Scroggins
3a62413c4f Merge "ImageDecoder: Use AssetFileDescriptor's length" am: efca2d56f1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426968

Change-Id: I9fe8e278e8efb2fe00206dd413b08e6cffc8291c
2020-09-16 16:06:45 +00:00
Leon Scroggins
efca2d56f1 Merge "ImageDecoder: Use AssetFileDescriptor's length" 2020-09-16 13:44:28 +00:00
Michael Plass
a3144f871b Merge "Update wifi OWNERS (base)" am: 630c5dd1c7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1427553

Change-Id: Ic3b4e9c75523ee447a2c4e7aaf6722e89fa6ac75
2020-09-16 11:57:36 +00:00
Michael Plass
630c5dd1c7 Merge "Update wifi OWNERS (base)" 2020-09-16 11:02:40 +00:00
Treehugger Robot
77b171be6f Merge "Remove a useless method" am: 3edc1b50bf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426655

Change-Id: I371245204277fa58c986370b503b379e97a0706e
2020-09-16 06:36:15 +00:00
Treehugger Robot
3edc1b50bf Merge "Remove a useless method" 2020-09-16 05:58:01 +00:00
wan.li
3b25df9ad3 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.

Bug: 168431815

Change-Id: Ic37f879a658379179dc53715fa016631bb7309d9
2020-09-16 02:50:23 +00:00
Ted Wang
47558ca2b2 Add action for Bluetooth tethering state changed
Add new action for Bluetooth tethering state changed and extra for
broadcasting Bluetooth tethering state changed.

Tag: #feature
Bug: 138688805
Test: Manual
Change-Id: Ie0f848448f9717a6a1233d0dbb0785da7d30dc81
2020-09-16 10:31:25 +08:00
Hall Liu
1bf919f084 Merge "Expose Telecom constants for use in Telephony" am: 9fcb2819d0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1427473

Change-Id: I014d1c58714cf85fff87eb45cd49f01a23c4fad5
2020-09-16 00:24:34 +00:00
Hall Liu
9fcb2819d0 Merge "Expose Telecom constants for use in Telephony" 2020-09-16 00:05:18 +00:00
Leon Scroggins III
d172a0cff8 ImageDecoder: Use AssetFileDescriptor's length
Bug: 166069819
Test: ImageDecoderTest (cts)

The contained asset may only be a subset of the AssetFileDescriptor.
SkWebpCodec reads the entire stream into a contiguous block of memory.
(This is because libwebp does not provide a streaming API for creating
its demuxer.) If the AssetFileDescriptor contains data after the webp
file, this wastes memory. In some cases, there may be a *lot* of data
after the webp file, so this can use too much memory, particularly on
low memory devices.

Merged-In: I8d8e520f43a7ef0d7e4534ef165d8c7e4d2a0b55
Change-Id: I8d8e520f43a7ef0d7e4534ef165d8c7e4d2a0b55
2020-09-15 15:52:38 +00:00
Michael Plass
2d7adeed89 Update wifi OWNERS (base)
Bug: 168325766
Test: builds
Change-Id: I74b44fbe9f8da58a84695d5b27a961ae1636ea02
2020-09-15 08:02:51 -07:00
lucaslin
9429531062 Rename mUserHandle to mUserId for better understanding
- mUserHandle is not good for understanding.
- In fact, mUserHandle or userHandle in Vpn.java means user id.

Bug: 168576152
Test: atest FrameworkNetTests
Change-Id: I3ec8ee21f45283b400ea451ade31be7c6c24102b
2020-09-15 08:53:28 +00:00
Chalard Jean
5f385ba620 Remove a useless method
No seriously ?

Test: builds
Change-Id: Ie1508ce50a39e4c69a4b238067bab1e83ddaf019
2020-09-15 16:18:56 +09:00
Treehugger Robot
1f03dce40c Merge "Fix navigation input consumer not working when first window is invisible" am: 0a2c4f34c9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426652

Change-Id: Ia094050b9e35f509f7c69dce48e8d95f156ea093
2020-09-15 02:54:22 +00:00
Treehugger Robot
0a2c4f34c9 Merge "Fix navigation input consumer not working when first window is invisible" 2020-09-15 02:18:56 +00:00
Hall Liu
2ef041183d Expose Telecom constants for use in Telephony
Expose Telecom constants that are used in Telephony in preparation for
mainline. Exposure is a combination of public/system -- those which made
sense for 3pty apps to access were made public.

Fixes: 168551099
Test: atest CtsTelecomTestCases
Change-Id: I688f04ba4ddf0498bad3463888fae71cdff2844a
2020-09-14 18:37:44 -07:00
Jeff Sharkey
69e6f07347 Merge changes from topic "sep11" am: c0b288133a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426195

Change-Id: I4fd71573b4301e5473d44517a72d73858b3928c8
2020-09-14 22:36:51 +00:00
Jeff Sharkey
c0b288133a Merge changes from topic "sep11"
* changes:
  Update language to comply with Android's inclusive language guidance
  Update language to comply with Android's inclusive language guidance
  Update language to comply with Android's inclusive language guidance
  Update language to comply with Android's inclusive language guidance
  Update language to comply with Android's inclusive language guidance
  Update language to comply with Android's inclusive language guidance
  Update language to comply with Android's inclusive language guidance
  Update language to comply with Android's inclusive language guidance
2020-09-14 21:52:13 +00:00
Treehugger Robot
3563eeb4ae Merge "Replace 'whitelist' with 'allowlist'" am: 8ac6819c0e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1427048

Change-Id: Ifd5f2a31ba5d3fbe9aaedca7b4c83d665cc61b9f
2020-09-14 20:26:42 +00:00
Treehugger Robot
8ac6819c0e Merge "Replace 'whitelist' with 'allowlist'" 2020-09-14 19:53:04 +00:00
Julia Reynolds
71c18d2afc Replace 'whitelist' with 'allowlist'
Change-Id: If7422064e59e6c055c9dae092ead298b81cf41e8
Test: atest
Bug: 161889253
Merged-In: I94a43c1c995052b034d8a5377786e1a15e4c9c59
2020-09-14 18:29:23 +00:00
Meng Wang
96e61153a1 Merge "Skip notify celllocation of not really changed." am: 87a7929958
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1425373

Change-Id: I2a9ccf5cc711411829c66f1a91715bb289e7a144
2020-09-14 18:14:33 +00:00
Meng Wang
87a7929958 Merge "Skip notify celllocation of not really changed." 2020-09-14 17:43:53 +00:00
Ioannis Ilkos
6a6ad9af99 Merge "Additional LMK diagnostic information" am: f3aeac8f09
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1424810

Change-Id: I6045fb5ecd45f58175393e9cc4b90c9a4064eae0
2020-09-14 17:32:25 +00:00
Ioannis Ilkos
f3aeac8f09 Merge "Additional LMK diagnostic information" 2020-09-14 17:15:51 +00:00
Jeff Sharkey
10fc5bc904 Update language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference

Test: none
Bug: 168334533
Exempt-From-Owner-Approval: docs updates
Change-Id: Ic93fe142433b1aa9035a72031b80e875d14c9cc0
2020-09-14 10:00:16 -06:00