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

659703 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vince Harron
6e008cbb2a Merge "BSD grep doesn't support -P" am: 3ad0c61146 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1891500

Change-Id: Ib7267a0b908187432d1b7cd753ca27e707a2a2f1
 2021-11-18 21:59:12 +00:00
Vince Harron
3ad0c61146 Merge "BSD grep doesn't support -P" 2021-11-18 21:34:19 +00:00
Xin Li
8fb8921a5d Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master 2021-11-18 21:28:55 +00:00
Keith Mok
1b9106268f Merge "Improper EINTR handling logic" am: bd0a86f9d7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1891585

Change-Id: I3037743d6b8e09252d37f92b1de1907fa19898a1
 2021-11-18 17:27:13 +00:00
Keith Mok
bd0a86f9d7 Merge "Improper EINTR handling logic" 2021-11-18 17:11:15 +00:00
Xin Li
10d9972786 Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 
Bug: 205056467
Merged-In: I13199bc39e9445929195f3d15579cbffe94e92b0
Change-Id: I35fa3c6c2abf679c51033f1395a08d511ed8739f
 2021-11-18 17:00:37 +00:00
Yi Kong
d353c81c5c Merge "profcollect: trace on background thread" am: f8eb7b136c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1894997

Change-Id: Ib0fa8116de75f3f2282e4ef53a9f26b67edd29de
 2021-11-18 09:12:49 +00:00
Yi Kong
f8eb7b136c Merge "profcollect: trace on background thread" 2021-11-18 08:53:52 +00:00
Gopalakrishnan Nallasamy
6e5f8b40b3 Merge "MediaCodecInfo: Add constant for YUVP010 color format" am: 0781fcf7da 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1894738

Change-Id: I78b78832b68114966fe9afd02dcfa4407dddfad6
 2021-11-18 08:41:28 +00:00
Gopalakrishnan Nallasamy
0781fcf7da Merge "MediaCodecInfo: Add constant for YUVP010 color format" 2021-11-18 08:21:35 +00:00
Gopalakrishnan Nallasamy
f71f4089d8 MediaCodecInfo: Add constant for YUVP010 color format 
Bug: 206456921

Test: atest android.media.cts.ImageReaderDecoderTest
Change-Id: Ia93bd25ede40b39d6b799990c01e35b90a8ad8d4
 2021-11-18 08:19:32 +00:00
Treehugger Robot
b74f548024 Merge changes I044d0363,I0be3b802,Ib584ea57,I92291023 am: 10640379e4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1888339

Change-Id: Ie6ea902d71f69457ddc85b5be41c9dbc7086dfbd
 2021-11-18 08:12:33 +00:00
Treehugger Robot
10640379e4 Merge changes I044d0363,I0be3b802,Ib584ea57,I92291023 
* changes:
  bpf is required so /sys/fs/bpf/map_netd_app_uid_stats_map always exists
  bpf is required - remove mUseBpfTrafficStats field
  bpf is required - remove checkBpfStatsEnable()
  remove qtaguid parsing
 2021-11-18 07:52:14 +00:00
Treehugger Robot
2cbfa143b6 Merge "health: BatteryService etc. use health AIDL HAL" am: 104adeeb75 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1883551

Change-Id: Icd85791dc6b57f8993f500306ed1e7a9f86fd218
 2021-11-18 06:36:34 +00:00
Yi Kong
092c15cfd9 profcollect: trace on background thread 
trace is a blocking event, needs to be moved off from the main thread.

Test: build
Bug: 206893189
Change-Id: Iead5a8f2471c2c0dbe0903294b7dcaf0b810256d
 2021-11-18 14:24:59 +08:00
Treehugger Robot
104adeeb75 Merge "health: BatteryService etc. use health AIDL HAL" 2021-11-18 06:20:40 +00:00
Maciej Żenczykowski
1af65153da bpf is required so /sys/fs/bpf/map_netd_app_uid_stats_map always exists 
(we cannot just remove the argument, since the test code path still
 goes via the legacy xt_qtaguid code paths with sample data)

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I044d0363aaab0dbbb90c40ca466cc48f169d649a
 2021-11-18 06:11:00 +00:00
Maciej Żenczykowski
c9b46078fc bpf is required - remove mUseBpfTrafficStats field 
Test: git grep mUseBpfTrafficStats
  TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I0be3b802e2ebd175b2a58061bf821aba02a8ec8a
 2021-11-18 06:10:46 +00:00
Maciej Żenczykowski
068d57a579 bpf is required - remove checkBpfStatsEnable() 
Test: git grep 'nativeGetTotalStat|nativeGetIfaceStat|nativeGetUidStat'
    - shows all locations have been updated
  git grep 'checkBpfStatsEnable'
    - find nothings relevant (just services/art-profile)
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ib584ea57c39d5ab0605787b05133097fd2c82a39
 2021-11-18 06:10:35 +00:00
Maciej Żenczykowski
536a03632e remove qtaguid parsing 
This removes the legacy (and untested) xt_qtaguid
non-ebpf code path (ie. dead code).

Test: git grep 'QTAGUID_IFACE_STATS|QTAGUID_UID_STATS|parseIfaceStats|parseUidStats'
  finds nothing
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I922910238474f2cfb74eba19b219bc792ce4abc3
 2021-11-18 06:10:14 +00:00
Yifan Hong
999f26ca03 health: BatteryService etc. use health AIDL HAL 
Also add tests to ensure that HealthServiceWrapper.create
prioritize using the AIDL HAL, and service callbacks are
working.

Test: frameworks test
Test: install HAL on cuttlefish then boot
Bug: 177269435

Change-Id: Ic667a49528c63343fe602f193c0958f2ee57c04e
 2021-11-18 04:48:07 +00:00
Treehugger Robot
7e0aeb84b0 Merge "SystemPreparer: remove support for FDE devices" am: 98f0a11a8a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1889876

Change-Id: I4041e5e2945fae7ec8551afcef5a0fb671414628
 2021-11-17 23:01:06 +00:00
Treehugger Robot
98f0a11a8a Merge "SystemPreparer: remove support for FDE devices" 2021-11-17 22:48:27 +00:00
Vince Harron
b3a17c77be BSD grep doesn't support -P 
Test: New grep command tested on Linux and macOS
Bug: b/206150971
Change-Id: I9f1684298672fee1561166a03392bd07be8c5cd6
 2021-11-17 22:32:57 +00:00
Treehugger Robot
9966ff4bc5 Merge "[PeopleService] Catch exception when failed to query call log." am: 9220245e47 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1878225

Change-Id: Iedf435a92edc51083030b44c4a7bc3fa293efa8b
 2021-11-17 22:20:18 +00:00
Treehugger Robot
9220245e47 Merge "[PeopleService] Catch exception when failed to query call log." 2021-11-17 21:59:43 +00:00
Daniel Norman
9370336358 Merge "PackageManagerService: Check for duplicate inactive factory packages" am: 2df3d4e066 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1894442

Change-Id: I36a956ea64b64855bb1b2c22430008dad6264b00
 2021-11-17 21:38:44 +00:00
Daniel Norman
2df3d4e066 Merge "PackageManagerService: Check for duplicate inactive factory packages" 2021-11-17 21:24:28 +00:00
Jeff Sharkey
0229c828ef Merge "Add OWNERS file for AttestationVerificationTest" am: 1716adec5c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1895603

Change-Id: I4f2482fdec4d81c2e1688625e48b9115bca43591
 2021-11-17 21:13:48 +00:00
Jeff Sharkey
1716adec5c Merge "Add OWNERS file for AttestationVerificationTest" 2021-11-17 20:50:58 +00:00
Keith Mok
639e93ee9c Improper EINTR handling logic 
When EINTR received,
we should just continue the loop
without update the byte counte and pointer
Use TEMP_FAILURE_RETRY for that

Test: CtsPrintTestCases
Bug: 206810144
Change-Id: Ia8b580ed0e3af00e9a2afefe554b81cbe014054b
 2021-11-17 19:52:16 +00:00
Marcus Hagerott
36f5ca1920 Merge "Allow ContactsProvider to use compat change framework" am: 911df4f515 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1894075

Change-Id: I8768bb082094d4062491becc4232ae35907dfc49
 2021-11-17 19:36:36 +00:00
Dave McCloskey
c9d71ec0f4 Add OWNERS file for AttestationVerificationTest 
Change-Id: Ic8400aa7c7e4506f57e6ce50dd5856692108385d
 2021-11-17 19:22:52 +00:00
Marcus Hagerott
911df4f515 Merge "Allow ContactsProvider to use compat change framework" 2021-11-17 19:19:21 +00:00
Maciej Żenczykowski
0700ad89f8 Merge "switch to using OWNERS from master branch of Connectivity module" am: b86ab4ae44 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1894917

Change-Id: I5507d2ee171dd529d18486847cb56e80dba0e1b9
 2021-11-17 18:42:42 +00:00
Maciej Żenczykowski
b86ab4ae44 Merge "switch to using OWNERS from master branch of Connectivity module" 2021-11-17 18:20:59 +00:00
Eric Biggers
de6e672d6a SystemPreparer: remove support for FDE devices 
Bug: 191796797
Change-Id: I82fd9aeb5330444436f004e8971066c253ede0cf
 2021-11-17 17:29:11 +00:00
Nicolas Geoffray
a54de89cf0 Merge "Remove obsolete files on preloaded classes." am: 637477eb87 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1885635

Change-Id: Ie1763534a12744cab0afc5fb7f9f48a73251958e
 2021-11-17 10:58:40 +00:00
Nicolas Geoffray
637477eb87 Merge "Remove obsolete files on preloaded classes." 2021-11-17 10:36:58 +00:00
Bernardo Rufino
87b6f365d3 Merge "Deprecate unsafe parcel APIs" am: 9f8b914c9f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1890540

Change-Id: I27a79a0f04d5cf99d9b8efb56fcc32a6dd43c108
 2021-11-17 10:09:27 +00:00
Bernardo Rufino
9f8b914c9f Merge "Deprecate unsafe parcel APIs" 2021-11-17 09:43:11 +00:00
Maciej Żenczykowski
7069443319 switch to using OWNERS from master branch of Connectivity module 
Test: N/A
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ifa4a38522ac3aa830e2a7f8b23ad190a334458bc
 2021-11-17 00:37:40 -08:00
Yifan Hong
45ddf12cbc Merge "Add ServiceManager.registerForNotifications" am: ce80de5db0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1883550

Change-Id: I65215f414aced825be29e036c378057d9c861138
 2021-11-17 05:23:59 +00:00
Yifan Hong
ce80de5db0 Merge "Add ServiceManager.registerForNotifications" 2021-11-17 05:02:35 +00:00
qinyige1
28367ba78a [PeopleService] Catch exception when failed to query call log. 
It's unnecessary to throw exception when failed to query call
log in PeopleService. So catch this exception to avoid system
server crash.

Bug: 204923224
Test: PeopleServiceTest
Change-Id: I77ee31ff456455721c3401f36d4a79390db2f9b5
 2021-11-17 10:10:26 +08:00
Marcus Hagerott
6c681056bb Allow ContactsProvider to use compat change framework 
BUG=188347648
Test: m droid

Change-Id: Ifb6675777c76ca1c44af96ceb02a6207d28bd045
 2021-11-16 13:40:41 -08:00
Sanjana Sunil
cdaa918edc PackageManagerService: Check for duplicate inactive factory packages 
If after a factory reset, APEX modules are updated, duplicate package
names are returned from the API - factory packages are added first and
then inactive factory packages leading to duplication.

After updating APEX modules, inactive factory packages would always be a
subset of factory packages. The fix adds inactive packages only if there
was no factory reset done.

Bug: 200519752
Bug: 200120056
Test: atest 'PackageManagerTest#testGetInstalledPackages_WithFactoryFlag_ContainsNoDuplicates'
Change-Id: I5b5469fc6879bbeee4dc2ea47b2046ab011a65ce
Merged-In: I5b5469fc6879bbeee4dc2ea47b2046ab011a65ce
 2021-11-16 13:20:33 -08:00
Keith Mok
80b29f8241 Merge "Fix EINTR handling" am: 7d0bdd39fd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1891496

Change-Id: I02d1281a2789b6554432a0e852e713af503bc5c8
 2021-11-16 19:54:22 +00:00
Hunsuk Choi
267ee57f27 Merge "Add ImsStateCallback" am: b636aacf1d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1892996

Change-Id: Ie21d1b5d249e5d0801468f0a3ee42e382242e11c
 2021-11-16 19:53:46 +00:00
Keith Mok
7d0bdd39fd Merge "Fix EINTR handling" 2021-11-16 19:43:29 +00:00