Julien Desprez
8ae5fd7f1c
Merge "attempt to run protologtool-tests as unit tests" am: f9e2a9c55a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1601194
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1ab6d11a665cc671eb22dda389ed44aa0366e343
2021-02-27 01:01:29 +00:00
Julien Desprez
f9e2a9c55a
Merge "attempt to run protologtool-tests as unit tests"
2021-02-27 00:41:48 +00:00
Connor O'Brien
9267c31a1c
Merge "Revert "Revert "Clear BPF data in KernelCpuUidTimeReader.removeUid()""" am: a0bbd188e4
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1602665
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I31e00f5aa8eec8fb3246a375f002820338d4572f
2021-02-27 00:27:16 +00:00
Christian Wailes
4eb5f086d4
Merge "Add LocalManagerRegistry inside system server." am: 76348ffadf
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607280
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I06a3a499afba0b7a20b8b474393aa68cffb4fd23
2021-02-27 00:23:21 +00:00
Connor O'Brien
a0bbd188e4
Merge "Revert "Revert "Clear BPF data in KernelCpuUidTimeReader.removeUid()"""
2021-02-27 00:04:47 +00:00
Christian Wailes
76348ffadf
Merge "Add LocalManagerRegistry inside system server."
2021-02-26 23:26:38 +00:00
Brad Ebinger
f92683b7d1
Merge "[RCS UCE] Define a new ACCESS_RCS_USER_CAPABILITY_EXCHANGE permission for associated RCS UCE APIs" am: 44d6bdc332
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1555055
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I62579792679ebb079d9fd2f97720a66d1d5aec3f
2021-02-26 20:54:10 +00:00
Evgenii Stepanov
ac811c4025
Merge "Implement memtagMode and nativeHeapZeroInit manifest attrs." am: d600f5067a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556655
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9c84f162736af927f6cac041f4200dc3ab2b8efa
2021-02-26 20:50:30 +00:00
Brad Ebinger
44d6bdc332
Merge "[RCS UCE] Define a new ACCESS_RCS_USER_CAPABILITY_EXCHANGE permission for associated RCS UCE APIs"
2021-02-26 20:45:18 +00:00
Evgenii Stepanov
d600f5067a
Merge "Implement memtagMode and nativeHeapZeroInit manifest attrs."
2021-02-26 20:11:10 +00:00
Suren Baghdasaryan
355bd7d9b8
Merge "Fix total memtrack Graphics and GL calculations" am: d061730dae
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1604881
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2b6ebf686a92e6f2dd00691e5d2d4900dd871c99
2021-02-26 19:02:10 +00:00
Treehugger Robot
b05555721c
Merge "Rename the font file with PostScript name based file name" am: 5cc4c3ff91
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1606551
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I489457c48373a037712c67363d5a1dd8597c0bf6
2021-02-26 18:59:15 +00:00
Suren Baghdasaryan
d061730dae
Merge "Fix total memtrack Graphics and GL calculations"
2021-02-26 18:59:10 +00:00
Suren Baghdasaryan
1ec9894cd6
Fix total memtrack Graphics and GL calculations
...
Some execution paths do not account memtrack reported Graphics and GL
values in the calculations of memtrack total memory consumption.
Fix this by adding the missing parts.
Bug: 174546244
Signed-off-by: Suren Baghdasaryan <surenb@google.com >
Change-Id: I77f06322fbb06ffa33115c1469aba80e59247904
Merged-In: I77f06322fbb06ffa33115c1469aba80e59247904
2021-02-26 18:59:01 +00:00
Hunter Knepshield
b79c80ba78
Merge "[API review] Additional detail in BugreportCallback javadoc." am: 39742a519c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607112
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id0c2b746e1be4944a6caa05c6764f37cf960bace
2021-02-26 18:52:56 +00:00
Treehugger Robot
5cc4c3ff91
Merge "Rename the font file with PostScript name based file name"
2021-02-26 18:38:22 +00:00
Winson Chiu
b87d41ab87
Merge "Add OWNERS for pm.verify.domain" am: 1736ad8bfe
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1606753
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2cc5663bb712bcf4f8a2fd8c6a335bc5a4a50946
2021-02-26 18:36:42 +00:00
Hunter Knepshield
39742a519c
Merge "[API review] Additional detail in BugreportCallback javadoc."
2021-02-26 18:31:22 +00:00
Winson Chiu
1736ad8bfe
Merge "Add OWNERS for pm.verify.domain"
2021-02-26 17:49:47 +00:00
Andrei-Valentin Onea
0f53ddc205
Merge "Fix deadlock on CompatConfig.mChanges" am: eaf3fd59ff
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605516
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id3b58c1aa33e9ff8692370e701d258b391eb563e
2021-02-26 16:58:48 +00:00
Andrei-Valentin Onea
eaf3fd59ff
Merge "Fix deadlock on CompatConfig.mChanges"
2021-02-26 16:26:21 +00:00
Vladimir Marko
e70dab7633
Merge "Change dirty-image-objects file format." am: 523e3b9b79
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1606454
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5641323dfc73d02993a3904596330743df209d34
2021-02-26 11:33:57 +00:00
Junyu Lai
32e8e9eb24
Merge "[FUI08] Create NeworkStateSnapshot" am: 702ca13a66
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536328
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If6f0e981228ef886496f55626b499f9c487af320
2021-02-26 11:30:53 +00:00
Vladimir Marko
523e3b9b79
Merge "Change dirty-image-objects file format."
2021-02-26 11:08:46 +00:00
Junyu Lai
702ca13a66
Merge "[FUI08] Create NeworkStateSnapshot"
2021-02-26 10:53:36 +00:00
James Lin
2f9c50d50a
Merge "Update the UCE OPTIONS API" am: a2d03f9eec
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605096
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id8f417912930dd3b5087f2f9b3d9ee081cbdac6a
2021-02-26 10:01:32 +00:00
James Lin
a2d03f9eec
Merge "Update the UCE OPTIONS API"
2021-02-26 09:49:57 +00:00
Zoey Chen
ce04917626
Merge "[Telephony] Implement onDataEnabled callback" am: c8057ecd1c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1608055
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iac56b19c16cfa22f833fdff5cac79002f1030e06
2021-02-26 09:47:40 +00:00
Zoey Chen
c8057ecd1c
Merge "[Telephony] Implement onDataEnabled callback"
2021-02-26 09:30:44 +00:00
Almaz Mingaleev
c76d1a4c26
Merge "Re-throw system server exception." am: 112cd8df86
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1608233
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I39697856d7fee18200e7405d84a45add58d60921
2021-02-26 09:19:15 +00:00
Dmitry Dementyev
26085ee2ff
Merge "Migrate recoverablekeystore to KeyStore V2." am: dbf8a7c1bd
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1603470
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7f96343c65df7accaae3fb5032771dbcd05191f5
2021-02-26 09:14:43 +00:00
Almaz Mingaleev
112cd8df86
Merge "Re-throw system server exception."
2021-02-26 08:42:36 +00:00
Dmitry Dementyev
dbf8a7c1bd
Merge "Migrate recoverablekeystore to KeyStore V2."
2021-02-26 06:13:35 +00:00
junyulai
c6ddf7afbc
[FUI08] Create NeworkStateSnapshot
...
Since NetworkState has UnsupportedAppUsage APIs that cannot
be changed, create another class for follow-up patches
to expose as system API.
Test: NetworkStateSnapshotTest
Bug: 174123988
Change-Id: I54ef872847f34166aa34a79f6178c90ac12b6c72
2021-02-26 11:57:06 +08:00
Junyu Lai
9044d1e472
Merge "Fix copyright license of VpnTransportInfo" am: 594e8def4c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607313
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ifed529b4a91bb3c52acb3d1ce708a5999a2bb595
2021-02-26 03:56:16 +00:00
Janis Danisevskis
6413a11508
Merge "Keystore 2.0: Clear Uid/Namesapce" am: a51a74a8c5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1604089
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1457c57433442dfa02810b7253682f6f8c9344f2
2021-02-26 03:39:27 +00:00
Junyu Lai
594e8def4c
Merge "Fix copyright license of VpnTransportInfo"
2021-02-26 03:38:59 +00:00
Daniel Bright
9c4102e2a1
Merge "Revert^2 "Add CAPABILITY_ALLOWED_NETWORK_TYPES_USED"" am: cc318221a5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1606546
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5d895a966dfc6501435503516f08c1b7c5a73f17
2021-02-26 03:35:59 +00:00
Remi NGUYEN VAN
04dd0eb01a
Merge "Fix CaptivePortalDataTest on R" am: fada307ddf
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605013
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ifbfed272ece8e1f4c437281fc6ca46de793520fe
2021-02-26 03:25:46 +00:00
Remi NGUYEN VAN
25a7767cc7
Merge "Add public alternative for protectFromVpn" am: 2c49d21ce1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605094
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I759af534bdf50f647351056275857c056998bf14
2021-02-26 03:22:03 +00:00
Janis Danisevskis
a51a74a8c5
Merge "Keystore 2.0: Clear Uid/Namesapce"
2021-02-26 03:04:30 +00:00
Daniel Bright
cc318221a5
Merge "Revert^2 "Add CAPABILITY_ALLOWED_NETWORK_TYPES_USED""
2021-02-26 02:34:42 +00:00
Remi NGUYEN VAN
fada307ddf
Merge "Fix CaptivePortalDataTest on R"
2021-02-26 01:51:14 +00:00
Remi NGUYEN VAN
2c49d21ce1
Merge "Add public alternative for protectFromVpn"
2021-02-26 01:50:32 +00:00
Dmitry Dementyev
16491e1316
Migrate recoverablekeystore to KeyStore V2.
...
Test: manual
Bug: 171305545
Change-Id: Id415be48cab6852df155b5b2dbaf941ef54cd5a4
2021-02-25 16:42:15 -08:00
Calin Juravle
5383d7a776
Merge "Migrate deleteOdex functionality to DexManager" am: 41207e284c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1591851
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5c9b75a7d254c2140ad7ff2b04191a877bee57ad
2021-02-26 00:30:58 +00:00
Hai Zhang
aee41a9ac9
Add LocalManagerRegistry inside system server.
...
This is similar to LocalServices, but dedicated to module API in the
same process.
Bug: 158736025
Test: presubmit
Merged-In: Ib9f14070a665ebd8c582376d7ea044d9b945b6b0
Change-Id: Ib9f14070a665ebd8c582376d7ea044d9b945b6b0
2021-02-25 15:55:58 -08:00
Tianjie Xu
afb76f685c
Merge "Fix a typo for the server blob timeout" am: 5c9ebe31ab
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607353
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8344f14a1cc68a5bbf743a7f42ed1db1ccf4b174
2021-02-25 23:48:00 +00:00
Calin Juravle
41207e284c
Merge "Migrate deleteOdex functionality to DexManager"
2021-02-25 23:42:53 +00:00
Evgenii Stepanov
15cce113f7
Implement memtagMode and nativeHeapZeroInit manifest attrs.
...
memtagMode allows an app to opt in to MTE in either sync or async mode.
nativeHeapZeroInit enables automatic initialization of heap memory.
Both attributes default to off and can be specified at either
application or process level.
Bug: 135772972
Bug: 177438394
Bug: 178038272
Test: CtsTaggingHostTestCases
Change-Id: I6a481a9d2363997bf954f248d08224c79f0c2afb
Merged-In: I6a481a9d2363997bf954f248d08224c79f0c2afb
2021-02-25 23:38:33 +00:00