Commit Graph

106542 Commits

Author SHA1 Message Date
Automerger Merge Worker
402f7eb3fb Merge "Use write_buffer_to_statsd within StatsLog_write" am: 634f6969c4 am: 4f32e393d0
Change-Id: Ie91b0cceab48051c53f8e7270a5a267c5778a82d
2019-12-20 00:24:50 +00:00
Muhammad Qureshi
4f32e393d0 Merge "Use write_buffer_to_statsd within StatsLog_write"
am: 634f6969c4

Change-Id: Iddc845d267e8bd5b54bd95caa184fb27bbdab606
2019-12-19 16:04:27 -08:00
Nathan Harold
be34c7019a Merge "Expose PreciseDataConnectionState to Public API" into qt-qpr1-dev-plus-aosp 2019-12-19 23:40:18 +00:00
Treehugger Robot
634f6969c4 Merge "Use write_buffer_to_statsd within StatsLog_write" 2019-12-19 23:31:48 +00:00
Automerger Merge Worker
4ae6995e92 Merge "Introduce telecom api to launch emeregency dialer." am: c55310438b am: 52432f5737
Change-Id: Ibb17c03a6c43bd654f36705cdac093b94fea9c16
2019-12-19 22:48:28 +00:00
Fan Zhang
52432f5737 Merge "Introduce telecom api to launch emeregency dialer."
am: c55310438b

Change-Id: I2b4d4d6b160afab0e97600b057367b2b889a795a
2019-12-19 14:12:36 -08:00
Fan Zhang
c55310438b Merge "Introduce telecom api to launch emeregency dialer." 2019-12-19 22:07:42 +00:00
Automerger Merge Worker
cc628869ff Merge changes from topic "ion memory accounting" am: 5ded8c130c am: 3c4624dcc2
Change-Id: I6620e200357ddcc46557f149e17fcad25e7c57c4
2019-12-19 21:51:13 +00:00
Automerger Merge Worker
e588ba41e9 Update Ranking's equal method [DO NOT MERGE] am: 172e20fa16
Change-Id: Ie752b4b52ad53cbdbab0a4330deb15f84dfb9e12
2019-12-19 21:50:52 +00:00
Nathan Harold
c95b4e5421 Expose PreciseDataConnectionState to Public API
1) Remove Unused Parameters for onDataConnectionState:
The data connection state broadcast includes a number of
parameters that are never used anywhere. To prepare for
updated code that relies on PreciseDataConnectionState,
remove the unused parameters that were internal-only and
included in the broadcast.

-LinkProperties
-NetworkCapabilities
-DataRoaming
-DataAllowed
-Interface name

2) Add Disconnecting State for Data Connections

Add a disconnecting state to correct a mismatch
between the internal and externally visible enums.

This will allow apps to know when connections are
in the process of being torn down, which in the case
of radio link issues could be as much as 15 seconds.

3) Expose PreciseDataConnection for Carrier Apps

Exposes the PSL for PreciseDataConnectionState along
with existing fields in the PreciseDataConnectionState
class.

-Make PreciseDataConnectionState public along with some
 of its fields.
-Expose onPreciseDataConnectionStateChanged.
-Add onPreciseDataConnectionStatesChanged to provide PDCS
 for all APNs in one cohesive batch.

4) Cache PreciseDataConnectionState by APN Type

In telephony registry, multiple different APN types
are all piped through the same cache entry, so every
time any APN changes relative to the previous type,
it triggers an update. This also means that when
a registrant requests the data connection state, only
the most recent type's state is updated.

This change caches entries in TelephonyRegistry based
on the APN's type (specifically the type among types
which triggered the change).

Bug: 143083105
Test: make update-api && make offline-sdk-docs
      (no functional change in this CL).
Test: atest FrameworksTelephonyTests

Merged-In: Ib6a769f5a0cae923ca47a842733bd28755a90ed5
Change-Id: Ib6a769f5a0cae923ca47a842733bd28755a90ed5
(cherry picked from commit 4d340f12c9)
2019-12-19 13:40:02 -08:00
Suren Baghdasaryan
3c4624dcc2 Merge changes from topic "ion memory accounting"
am: 5ded8c130c

Change-Id: I23271d3d84b18411672230e6e80ef534e0066996
2019-12-19 13:35:27 -08:00
Muhammad Qureshi
bc1002d520 Use write_buffer_to_statsd within StatsLog_write
This CL is a partial cherrypick of ag/9686088. This is needed because new
changes to libstatssocket (that need to be cherrypicked into AOSP) wrap
#write_to_statsd() with #write_buffer_to_statsd().

Bug: 143978873
Test: m -j
Test: flashes successfully
Test: DocumentsUI(a Mainline module) is able to successfully log to statsd
Change-Id: I886331f728ccaa3d281b5683eb89179aa73596b6
Merged-In: I9cdc6151d8feb29a712532e50f143af9d52c8d94
2019-12-19 21:27:18 +00:00
Fan Zhang
2b2458e094 Introduce telecom api to launch emeregency dialer.
Test: manual
Bug: 136194151
Change-Id: I5c9732062e5123539343843fb9a9ae3ca7111890
Merged-In: I5c9732062e5123539343843fb9a9ae3ca7111890
2019-12-19 20:50:31 +00:00
Beverly
172e20fa16 Update Ranking's equal method [DO NOT MERGE]
[Cherry picked from master]

Include check for whether mVisuallyInterruptive has changed

Test: atest BubbleDataTest
Change-Id: I5c4706667e6ca4cde44ef3671daa24afaf2b14f3
(cherry picked from commit e1541e7ec9)
2019-12-19 12:29:09 -08:00
Suren Baghdasaryan
40899ad1e6 Improve cached kernel memory accounting using meminfo KReclaimable field
KReclaimable field from /proc/meminfo is designed to represent total amount
of memory that kernel can reclaim when needed. This includes reclaimable
memory consumed by slab and reported in SReclaimable field as well as ION
pools. By using KReclaimable instead of SReclaimable we will account for
ION pools currently reported under "Lost RAM" category in dumpsys meminfo
report.

Bug: 138148041
Test: dumpsys meminfo
Change-Id: Ifdea234d05639db93074ab598b81db5ff5b43612
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
2019-12-19 19:49:05 +00:00
Suren Baghdasaryan
5911b9ef0a Add JNI API to query sizes of ION heaps, pools and mapped part of the heaps
Provide means for system_server to query ION memory usage. The new API
allows to get total size of ION heaps, pools and part of ION heaps that
is mapped into user space.

Bug: 138148041
Test: dumpsys meminfo
Change-Id: I6d76d534bbab5ee1646e8e3e3fe5210dcf76bc23
Merged-In: I6d76d534bbab5ee1646e8e3e3fe5210dcf76bc23
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
2019-12-19 19:48:42 +00:00
Automerger Merge Worker
b4e26195e3 Merge "Delete VINTF compatibility checks during OTA." am: bdc465991f am: 8ca8a6d00d
Change-Id: I9d0a3698b096ec66604403f405d73c4f112f689e
2019-12-19 19:16:28 +00:00
Yifan Hong
8ca8a6d00d Merge "Delete VINTF compatibility checks during OTA."
am: bdc465991f

Change-Id: I96dc350718baa45682ac0abd5d877160232db07c
2019-12-19 11:02:07 -08:00
Yifan Hong
bdc465991f Merge "Delete VINTF compatibility checks during OTA." 2019-12-19 18:56:13 +00:00
Automerger Merge Worker
7fabca1b35 Merge "Expose ModemActivitiyInfo to system API" am: 5910f6dd65 am: 340397814a
Change-Id: I5ec18c82caa066e2aced3432756cd0811ff4a9cb
2019-12-19 18:42:52 +00:00
Chen Xu
340397814a Merge "Expose ModemActivitiyInfo to system API"
am: 5910f6dd65

Change-Id: Iaec1dc20a01c5a061d3835a8a82f6d2c205aa004
2019-12-19 10:08:19 -08:00
Chen Xu
5910f6dd65 Merge "Expose ModemActivitiyInfo to system API" 2019-12-19 18:01:46 +00:00
Automerger Merge Worker
420f048022 Merge "Do not call to SecureElement Service if device does not support any OMAPI readers" am: 98a96a40c6 am: 4d7d5c2c24
Change-Id: Ia5c252c4a7a52cdbb4e751076e1de6e924d07dff
2019-12-19 12:17:37 +00:00
Jack Yu
4d7d5c2c24 Merge "Do not call to SecureElement Service if device does not support any OMAPI readers"
am: 98a96a40c6

Change-Id: I94d624418afcf27a4c3fad02d19f94c5da7d6123
2019-12-19 04:03:10 -08:00
Treehugger Robot
98a96a40c6 Merge "Do not call to SecureElement Service if device does not support any OMAPI readers" 2019-12-19 11:29:08 +00:00
Automerger Merge Worker
6366a55ac8 Merge "Revert "Fix drag and drop (1/3)"" into qt-qpr1-dev am: e0f4421f23
Change-Id: I297d79d8f5262e68df0c294c938646a0acacbce8
2019-12-19 10:45:31 +00:00
Automerger Merge Worker
ae6c84fcb2 Merge "Add LinkProperties methods to system APIs" am: 4dba00e007 am: 8d2b81869c
Change-Id: Ie0a102ceb853c9f61d3e1deb369938a48edcdcac
2019-12-19 08:22:11 +00:00
Aaron Huang
8d2b81869c Merge "Add LinkProperties methods to system APIs"
am: 4dba00e007

Change-Id: Ib6cc8dff09ed97bdcf8504f8318461e742c34f7a
2019-12-19 00:06:31 -08:00
Aaron Huang
4dba00e007 Merge "Add LinkProperties methods to system APIs" 2019-12-19 08:01:58 +00:00
TreeHugger Robot
e0f4421f23 Merge "Revert "Fix drag and drop (1/3)"" into qt-qpr1-dev 2019-12-19 07:49:32 +00:00
Automerger Merge Worker
d23e6f7b09 Merge "Include KReclaimable meminfo field into getMemInfo results" am: f61d2347c0 am: 215e1d5e27
Change-Id: I7a5b775b93ce3c345d376b4c2e9dfa6ebde31848
2019-12-19 06:22:00 +00:00
Suren Baghdasaryan
215e1d5e27 Merge "Include KReclaimable meminfo field into getMemInfo results"
am: f61d2347c0

Change-Id: I9ee7de7b744100409475e7401a6ddede1c1cdbad
2019-12-18 22:03:31 -08:00
Suren Baghdasaryan
f61d2347c0 Merge "Include KReclaimable meminfo field into getMemInfo results" 2019-12-19 05:25:38 +00:00
Automerger Merge Worker
091f1d790c Merge "Fix parceling of LinkProperties Inet6Addr" am: 7382f03d58 am: 50fb44e776
Change-Id: Ie5b7782d788717dd1cc440e502d6cdf2d1c18eaa
2019-12-19 03:29:50 +00:00
Remi NGUYEN VAN
50fb44e776 Merge "Fix parceling of LinkProperties Inet6Addr"
am: 7382f03d58

Change-Id: I7e4de0ecf06d34f050a881250755c8c0456269fc
2019-12-18 19:12:04 -08:00
Remi NGUYEN VAN
7382f03d58 Merge "Fix parceling of LinkProperties Inet6Addr" 2019-12-19 03:07:43 +00:00
Automerger Merge Worker
7b1b93935e DO NOT MERGE: Allow nearby sharing to substitute name & icon in chip am: c5dffc9a4a
Change-Id: I71f241c27feff278d71b4d70751ce94378eb37a6
2019-12-19 03:02:24 +00:00
Dan Sandler
c5dffc9a4a DO NOT MERGE: Allow nearby sharing to substitute name & icon in chip
meta-data bundle keys (values are resids):

    CHIP_LABEL_METADATA_KEY = "android.service.chooser.chip_label"
    CHIP_ICON_METADATA_KEY = "android.service.chooser.chip_icon"

Test: manual, confirm that correct name & icon are used
      and that custom icon is tinted in light/dark theme
      (and that the copy chip is tinted right, too!)
Bug: 144290152
Change-Id: I57157e07630fa8bec3057e6d18336c59944fcb4f
2019-12-19 01:43:51 +00:00
Yifan Hong
12ebf362b4 Delete VINTF compatibility checks during OTA.
Such checks uses old libvintf to parse new VINTF metadata, which is not
supported. The check is now moved to OTA package build time, so there is
no need to check it on the device.

Test: builds
Bug: 139300422
Change-Id: Ifaec06b5298f698958e5727316bf661d1960d0aa
2019-12-18 16:30:07 -08:00
Suren Baghdasaryan
5f8e17b3ef Include KReclaimable meminfo field into getMemInfo results
With new KReclaimable stat available in /proc/meminfo include it in
getMemInfo results so that it can be accounted in dumpsys meminfo reports.

Bug: 138148041
Test: dumpsys meminfo
Change-Id: Id475fcc0a63c6fc12ea64e08cec5cd24c83848a5
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
2019-12-18 14:55:41 -08:00
Chen Xu
9663781a86 Expose ModemActivitiyInfo to system API
ModemActivityInfo is used for batteryStatusService which is part of
system service. To prepare telephony to be an mainline module, we
should expose ModemActivityInfo to systemAPI

1. remove getConsumedPower API as we are missing modem support, API
today only report 0
2. isValid API is introduced to cover modem issues before. Do not
expose this for now.

Bug: 140908357
Test: Build
Change-Id: I6e1b0daa2e0ce23b9fd55f0dd7037631b93eb7a5
(cherry picked from commit 7322e4a7ce)
Merged-in: I6e1b0daa2e0ce23b9fd55f0dd7037631b93eb7a5
2019-12-18 10:45:00 -08:00
Automerger Merge Worker
16257918c9 Merge "Fix android.util.CloseGuard sample usage" am: 7381525076 am: 66b0e7d150
Change-Id: Ieec4a553744be7148938ee19cce23371597985e6
2019-12-18 18:35:59 +00:00
David Su
66b0e7d150 Merge "Fix android.util.CloseGuard sample usage"
am: 7381525076

Change-Id: I4e69d9638ca69be5896bfeb0c3d950d340294cb5
2019-12-18 10:26:02 -08:00
David Su
7381525076 Merge "Fix android.util.CloseGuard sample usage" 2019-12-18 18:19:58 +00:00
Automerger Merge Worker
d7c79c3a2c Merge "Do not restart activity when pinned set changes - just re-sort." into qt-qpr1-dev am: 0416784c2e
Change-Id: I094be054c2a0be923714cc2cee54a95aced84bf8
2019-12-18 16:01:15 +00:00
Alison Cichowlas
0416784c2e Merge "Do not restart activity when pinned set changes - just re-sort." into qt-qpr1-dev 2019-12-18 15:41:33 +00:00
Remi NGUYEN VAN
f705ea69dc Fix parceling of LinkProperties Inet6Addr
IPv6 addresses parceled for DNS servers, private DNS servers, PCSCF
servers were parceled without the scope. This causes issues with
link-local DNS servers.

Test: atest FrameworksNetTests
Bug: 145181158
Change-Id: I0ed24e51d4d0656f4a1f932b5e9f646b35b4b971
2019-12-18 19:52:30 +09:00
Automerger Merge Worker
197079ffdb Merge "vibrator: Support Always-On Effects" am: 65303aa385 am: 5d97061d0b
Change-Id: I1a83e4190a404b94653da68762c2c8acfa8078b9
2019-12-18 06:35:31 +00:00
Harpreet \"Eli\" Sangha
5d97061d0b Merge "vibrator: Support Always-On Effects"
am: 65303aa385

Change-Id: I3421d02508a1dda6960bcc307c4ff1f0343937f6
2019-12-17 22:18:07 -08:00
Treehugger Robot
65303aa385 Merge "vibrator: Support Always-On Effects" 2019-12-18 06:10:18 +00:00