Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
530,366 Commits 3 Branches 0 Tags
04dede7600a0da25fa29fedd9a9ae493bfc0bf0c
Commit Graph

530366 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
junyulai
08ea47d0a1 Skip stop if keepalive is already in stopping state 
In current design, crash has been generated when stop function
has been re-entered to catch unexpected behavior. However,
it is possible to re-enter stop function if the network
disconnection occurs after stopping.

Thus, skip stop if keepalive is already in stopping state.

Test: atest ConnectivityServiceTest#testNattSocketKeepalives \
      --rerun-until-failure 60000
Bug: 167332570
Change-Id: Ic7068ad3dc990e957c37b8d87d48ebb6469b101f
 2020-09-17 19:51:34 +08: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
Masaho Nishikawa
115e02818a 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
Change-Id: If1e6d2bf58de39c22caa901fcd90fb11f104d900
(cherry picked from commit b9beb0d1afda6327b1c7645ac20a016f08e5744e)
 2020-09-16 22:52:49 -07:00
Treehugger Robot
eca1afc382 Merge "Add action for Bluetooth tethering state changed" am: cf44a015e8 am: 773810d198 am: f03a18b7ab 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1422889

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

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

Change-Id: Iee41dc3a0540cfd39014a47db43e2ca2c1592e32
 2020-09-17 04:43:11 +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
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
Lucas Lin
ab666813e2 Merge "Rename mUserHandle to mUserId for better understanding" am: 8f10e0097b am: 5445a0f7ab 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426656

Change-Id: I2a97dd14b8534a634f8b260d8775abd64eace2d1
 2020-09-17 02:24:20 +00:00
Robert Chou
8e9f6c8db1 Merge "Ringtone uri should add type query" am: 96d98a9fad am: caf558ecdc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426651

Change-Id: I52e40353b3890676704884c5fd7fbe73016c9c3c
 2020-09-17 02:24:09 +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
a23339f3b7 [automerger skipped] Merge "Fixed that data connections not tearing down when APN set id changes" am: 2c3e56fce6 am: eeeb5b506f am: d397780a38 -s ours 
am skip reason: Change-Id I626f871b64d50127feece80f018272e51ad1c66c with SHA-1 715073fc69 is in history

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

Change-Id: Iad2e1a2c79337cd9ebdf112156f473867f92fd5b
 2020-09-16 23:34:42 +00:00
Amit Mahajan
d397780a38 Merge "Fixed that data connections not tearing down when APN set id changes" am: 2c3e56fce6 am: eeeb5b506f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1371060

Change-Id: I342f10760b799b934c5b33b1a0afb81816a312d2
 2020-09-16 22:58:32 +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
Nathan Harold
d37b9bff1e Deprecate CellLocation Classes 
All ways of getting CellLocation are deprecated.
Thus, we can deprecate the CellLocation classes
themselves.

Bug: 168710953
Test: make update-api && make offline-sdk-docs \
      && make; (no functional change)
Change-Id: I60aed126894d9b4bb495a24aeb8ffdd2af236809
 2020-09-16 14:26:28 -07: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
226c477959 Merge "ImageDecoder: Use AssetFileDescriptor's length" am: efca2d56f1 am: 3a62413c4f am: b9d7c9ec52 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426968

Change-Id: I4c704fd27885b0b7b0d62e4e4d29f89d461d879d
 2020-09-16 19:06:58 +00:00
Shuzhen Wang
477c23ed89 Camera: Clarify SCALER_CROP_REGION usage 
1. Document same SCALER_CROP_REGION may map to different aspect
ratio/output size for different sessions.
2. Remove the text in ZOOM_RATIO about using SCALER_CROP to change
aspect ratio.

Test: Build and read docs
Bug: 168493526
Change-Id: I405fe52d0e0a14e6a1cfbec169d33f20715fa4fb
 2020-09-16 11:53:38 -07:00
Brad Ebinger
ed0579f205 Fix a typo in service class 
Test: Manual
Change-Id: I96b39b2d31b07da30f60b8e28ff8bfd26cb277de
 2020-09-16 11:33:36 -07:00
Kikkawa Shohei
03a1471e1e Customize the service class for Call barring 
Add a new carrier config that changes the service class is used for Call
barring settings.

Test: manual
Bug: 161772958

Change-Id: Ibce22d0d340ce648c0b6df411266d1c4fe537013
 2020-09-16 11:09:46 -07:00
Leon Scroggins
b9d7c9ec52 Merge "ImageDecoder: Use AssetFileDescriptor's length" am: efca2d56f1 am: 3a62413c4f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426968

Change-Id: I85afba6ce0d53370031c089f30e2af69df02f8c9
 2020-09-16 17:01:31 +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
3ae8858d77 Merge "Update wifi OWNERS (base)" am: 630c5dd1c7 am: a3144f871b am: 71b958536e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1427553

Change-Id: Ic72ab456c694ceb230d091595161db5d615712e7
 2020-09-16 12:55:51 +00:00
Hungming Chen
782618033a Move BPF offload program from netd to mainline 
Test: as the follows.
$ adb shell ls sys/fs/bpf | grep offload
map_offload_tether_ingress_map
map_offload_tether_limit_map
map_offload_tether_stats_map
prog_offload_schedcls_ingress_tether_ether
prog_offload_schedcls_ingress_tether_rawip

$ adb shell dumpsys netd --short
  TetherController
    BPF ingress map: iif(iface) v6addr -> oif(iface) srcmac ..
      13(rmnet_data3) 2401:e180:8842:6e3:bc6a:2e45:c30:f418 -> ..
    BPF stats (downlink): iif(iface) -> packets bytes errors
      13(rmnet_data3) -> 7 488 0
    BPF limit: iif(iface) -> bytes
      13(rmnet_data3) -> 9223372036854775807

Log:
bpfloader: Loaded object: /apex/com.android.tethering/etc/bpf/offload.o

Change-Id: I71b7efb1f4bd6eb1cd469a0e1e4a56342dc6e579
 2020-09-16 20:38:14 +08:00
Michael Plass
71b958536e Merge "Update wifi OWNERS (base)" am: 630c5dd1c7 am: a3144f871b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1427553

Change-Id: I36c03a0f47db8616e7d811ca1235d316f48297a3
 2020-09-16 12:29:56 +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
dce36b5b50 Merge "Remove a useless method" am: 3edc1b50bf am: 77b171be6f am: 107dd4f936 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426655

Change-Id: I0d32f54bf0c10afa33d59292291806a482af159c
 2020-09-16 07:46:30 +00:00
Treehugger Robot
107dd4f936 Merge "Remove a useless method" am: 3edc1b50bf am: 77b171be6f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426655

Change-Id: Idbf3ffa12027bbfb3f68ad867f61eebbd54af9f5
 2020-09-16 07:17:46 +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
2f8cf2f852 Merge "Expose Telecom constants for use in Telephony" am: 9fcb2819d0 am: 1bf919f084 am: 5b6beb2fc0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1427473

Change-Id: Icd1e3d555c35652720cb724caf0311ebfab9df34
 2020-09-16 01:07:55 +00:00
Hall Liu
5b6beb2fc0 Merge "Expose Telecom constants for use in Telephony" am: 9fcb2819d0 am: 1bf919f084 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1427473

Change-Id: Ic2667293e9388b1bf29c8a38c89fa6b0925f27b0
 2020-09-16 00:37:59 +00: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
Charles Munger
3bec6b94fe Clarify docs for FLAG_SYSTEM 
Bug: 168557744
Change-Id: Ia27aaae7b4f60f843013bd629ebcce4c662828d2
 2020-09-15 18:46:49 +00:00