Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
509,669 Commits 3 Branches 0 Tags
6f39d5a8c2dfdbe3c292998f4ffee869b394aee8
Commit Graph

509669 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
6f39d5a8c2 Merge "Mark emergency dialer package string as untranslatable." am: 9a4505c4fb am: 635845b15b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1430102

Change-Id: Ida845bd34807653bc791389f60cef7bad7ed5bc4
 2020-09-19 07:08:06 +00:00
Amit Mahajan
eb10ff679b Merge "Data connection for carrier specific APN" am: 47a1e949c3 am: ba9b991631 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1238996

Change-Id: I5186d773ee3952cee516ac0ccb473352ca847ad9
 2020-09-19 06:57:45 +00:00
Brad Ebinger
55895d9414 Merge "Fix a typo in service class" am: 7b38b459f3 am: 7420236576 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1429089

Change-Id: I44f67a3658ab2d0649f509634afae355f5e2c36e
 2020-09-19 06:09:52 +00:00
Bill Yi
1de555b1a3 [automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: e935e010b3 am: 2075ab0f01 -s ours 
am skip reason: Change-Id Id04ea331831e8b26ba99478848392b40a92548d5 with SHA-1 c54ab73ef9 is in history

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

Change-Id: I2ad75dfe2a2109ea63eade0ed3edc40b92149a16
 2020-09-19 05:51:33 +00:00
Bill Yi
847cfb2230 [automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 5b49c68d11 am: 1848cf03d8 -s ours 
am skip reason: Change-Id Id04ea331831e8b26ba99478848392b40a92548d5 with SHA-1 c54ab73ef9 is in history

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

Change-Id: I4a14d0f2ef305f4f564e7e38134763a85fd09ad3
 2020-09-19 05:50:36 +00:00
Treehugger Robot
635845b15b Merge "Mark emergency dialer package string as untranslatable." am: 9a4505c4fb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1430102

Change-Id: I59c2843430e2e9545c4feff69df67e298c168c9b
 2020-09-19 05:42:25 +00:00
Amit Mahajan
ba9b991631 Merge "Data connection for carrier specific APN" am: 47a1e949c3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1238996

Change-Id: Iefc784867da56b9ac0acfe0ac3744da9a3625a14
 2020-09-19 05:37:38 +00:00
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
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
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
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
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
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
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
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
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
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
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
f03a18b7ab Merge "Add action for Bluetooth tethering state changed" am: cf44a015e8 am: 773810d198 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1422889

Change-Id: I899bd778c56b32139405636dc5c434e4138f1c1e
 2020-09-17 03:44:57 +00:00