Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
556,127 Commits 3 Branches 0 Tags
1946bfb890f11bb09f3d5b1ebf8a56883fe56bb7
Commit Graph

556127 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
1946bfb890 Merge "Ignore resources from unknown types" am: e0f44eb6e7 am: a4bb7ab3b4 am: fda617812b am: 2a2720593f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1430090

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

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

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

Change-Id: I3df68434989ee8231db6adf41a203526be5027ab
 2020-09-17 22:10:57 +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
acead94428 Merge "Add telecom to priorityOnlyDndExemptPackages" into rvc-qpr-dev am: b4e06d0147 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12615932

Change-Id: Ie674a6ab2f32579ddec80c6926f25798975691a9
 2020-09-17 21:07:29 +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
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
b4e06d0147 Merge "Add telecom to priorityOnlyDndExemptPackages" into rvc-qpr-dev 2020-09-17 19:45:53 +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
TreeHugger Robot
837b88446a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 73489b9ccf -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12626280

Change-Id: Ia142f4d6ca9199105537e0a612caff0fec9e30c9
 2020-09-17 19:13:50 +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
bba27dfebf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 47c0c889db -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12627493

Change-Id: I713063ecc9fc683aa15a334ec36a2a72dd2be879
 2020-09-17 19:13:18 +00:00
Beth Thibodeau
11785386f1 Merge "[DO NOT MERGE] Revert "Allow user to block individual apps from resuming"" into rvc-qpr-dev am: c8f18d19a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12597796

Change-Id: I201e5d48c57dd38bb966c8aaf53999e082756468
 2020-09-17 19:12:29 +00:00
Beth Thibodeau
48f5f05e91 [DO NOT MERGE] Revert "Allow user to block individual apps from resuming" am: f715910293 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12597796

Change-Id: Ib12f9d769f6273849216678f7749c72172f3e179
 2020-09-17 19:12:14 +00:00
TreeHugger Robot
73489b9ccf Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-09-17 18:30:02 +00:00
Beverly
c384c930fd Add telecom to priorityOnlyDndExemptPackages 
telecom plays dialer's ringtone, so we allow them to play sounds when
DND is on in priority mode. We trust that telecom will abide by the DND
rules and exceptions (ie: checking for starred contacts)

Test: manual
Bug: 163525045
Change-Id: I798f1d968821e7d1b0a97b9b034c1ef0726f8242
Merged-In: I798f1d968821e7d1b0a97b9b034c1ef0726f8242
 2020-09-17 18:28:40 +00:00
TreeHugger Robot
47c0c889db Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-09-17 18:12:14 +00:00
Beth Thibodeau
c8f18d19a2 Merge "[DO NOT MERGE] Revert "Allow user to block individual apps from resuming"" into rvc-qpr-dev 2020-09-17 17:56:29 +00:00
Beth Thibodeau
f715910293 [DO NOT MERGE] Revert "Allow user to block individual apps from resuming" 
Revert "Allow user to block individual apps from resuming."

Revert submission 12392268-cherrypick-mediaappsettings-5fxuo164a2

Bug: 161813143

Reason for revert: no longer want change in QPR
Reverted Changes:
Id3de52419:Allow user to block individual apps from resuming....
I8c85bc937:Allow user to block individual apps from resuming

Change-Id: I888079abc77f5bc22aefa19c2f7523bb9db05bf8
 2020-09-17 17:56:11 +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
Paul Hu
aed20efa42 Merge "Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission to DownloadProvider" into rvc-qpr-dev am: 8b9d40586b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12533920

Change-Id: I1d881a0c74870c700597e3ef3280ba349640591e
 2020-09-17 16:26:52 +00:00
Paul Hu
8b9d40586b Merge "Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission to DownloadProvider" into rvc-qpr-dev 2020-09-17 15:36:15 +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
Jakub Pawlowski
c79ae51bd4 Merge "Bluetooth: log who changes adapter name" am: 78f92ef7fa am: 8e139a82cd am: b1f4504f56 am: 350b085cc8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1428568

Change-Id: I39e2e2358e3c0fabe3a11a0d98c46f6457dc0780
 2020-09-17 14:13:07 +00: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
350b085cc8 Merge "Bluetooth: log who changes adapter name" am: 78f92ef7fa am: 8e139a82cd am: b1f4504f56 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1428568

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

Change-Id: I2b63691b16d78be09b8217e06006a6f58f357604
 2020-09-17 12:17: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
Bill Yi
0c40ca6b7c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia0894555f04fcf70d19c572c558625e0bec05b53
 2020-09-17 10:10:47 +00:00
Gustav Sennton
dba722b88c Merge "Fix SystemCaptionsManagerService to re-bind after a force stop" into rvc-qpr-dev am: 2f4d456c2c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12501883

Change-Id: I399b0c3961be731947c50d26b9a31c1db6c268cd
 2020-09-17 08:53:13 +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
Gustav Sennton
2f4d456c2c Merge "Fix SystemCaptionsManagerService to re-bind after a force stop" into rvc-qpr-dev 2020-09-17 07:49:16 +00:00
Bill Yi
3954301ee5 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2484a2f6589dce0da90dd9df6b2886bbbd5b108f
 2020-09-17 07:49:00 +00:00
Treehugger Robot
e6b1120635 Merge "Add action for Bluetooth tethering state changed" am: cf44a015e8 am: 773810d198 am: f03a18b7ab am: eca1afc382 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1422889

Change-Id: Ia9e532d720f6cdd969bcb0fd5beda0a8a8866c3f
 2020-09-17 05:56:37 +00:00
Lucas Lin
db771d24cf Merge "Rename mUserHandle to mUserId for better understanding" am: 8f10e0097b am: 5445a0f7ab am: ab666813e2 am: 1663ccb254 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426656

Change-Id: Ib6e32fde2f2f73db8a7644d77cf243b749170246
 2020-09-17 05:49:35 +00:00
Robert Chou
7a38d00bc7 Merge "Ringtone uri should add type query" am: 96d98a9fad am: caf558ecdc am: 8e9f6c8db1 am: 53aa756a06 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426651

Change-Id: I02b2f6d4c39c93d1c3b4be6583b58fa5c0f00060
 2020-09-17 05:35:22 +00:00