drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
624,331 Commits 1 Branch 0 Tags
Commit Graph

624331 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kalesh Singh
8ca81eef5b Merge "Provide an interface to query dmabuf GPU allocations" am: f403b56267 am: b79232ceb0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1575583

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I78a2ddafc83a235a2eccb90abb5e074132d96365
 2021-02-13 04:20:49 +00:00
Manish Singh
36723eae2e Merge "Pass the media capabilities uid when opening media" into sc-dev 2021-02-13 03:05:48 +00:00
Kalesh Singh
b79232ceb0 Merge "Provide an interface to query dmabuf GPU allocations" am: f403b56267 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1575583

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic48e5f3dbf971e0a786795867ea02667fc9ee568
 2021-02-13 02:57:13 +00:00
Suren Baghdasaryan
3e0c7c8231 Eliminate memtrack variability from the lost RAM calculation 
Modify lost RAM calculation to use total mapped dmabuf and private GPU
allocations instead of memtrack HAL's reported Graphics and GL values.
All of memtrack HAL's reported Graphics should be accounted for as part
of mapped dmabufs. In order to not count it twice and not to depend on
memtrack HAL's reported value we exclude it from total PSS calculation
and replace it with mapped dmabufs.
All of memtrack HAL's reported GL should be accounted for as part
of private GPU allocations. In order to not count it twice and not to
depend on memtrack HAL's reported value we exclude it from total PSS
calculation and add GPU private allocations to total kernel memory
usage.

Bug: 165832481
Test: dumpsys meminfo
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: I631488d95cfd91d5428c877b3a004215031dd223
Merged-In: I631488d95cfd91d5428c877b3a004215031dd223
 2021-02-13 02:36:13 +00:00
Kalesh Singh
f403b56267 Merge "Provide an interface to query dmabuf GPU allocations" 2021-02-13 02:35:06 +00:00
Bill Yi
57a62cee7c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I920db49c330b356d569f40a4d85303a67c15eb85
 2021-02-12 17:11:31 -08:00
Marco Ballesio
5426443555 ActivityManager: create process group in behalf of app zygote 
app zygotes don't run under system pid/gid, so they can't create groups for
processes they spawn. Use system_server to create the correct process groups

Bug: 168907513
Bug: 62435375
Test: verified that webview processes are migrated to their own groups
Change-Id: Ifb912b42bca4d7670e6bb15510484296b772bb86
 2021-02-13 01:06:19 +00:00
Jing Ji
505a982802 Fix formatting of the dumpsys activity output 
Bug: 162450085
Test: Manual - dumpsys activity -a
Change-Id: Ife1cd02d7791a4e5518a854042aba3640937c4c7
 2021-02-12 16:53:39 -08:00
Benedict Wong
ba5fbd7afa Merge "Lazy-create IpSecTunnelInterface" am: cefc4f6864 am: b8a2bb6a0c am: fc95150f12 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1582714

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9b4b8b715c9d6e65abe2aa8d84107c891b817b79
 2021-02-13 00:28:48 +00:00
Evan Rosky
94d7888516 [automerger skipped] Merge "Apply split-screen resize on sync queue" into rvc-qpr-dev am: e7dbe60d32 am: b760ad1f6e -s ours 
am skip reason: Change-Id I4d89be443af5616174ea44e62774133e3b99597c with SHA-1 0557739e43 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8b6f0e8275f3b363f2e0498abe41ff38cb8c73ba
 2021-02-13 00:28:24 +00:00
Benedict Wong
fc95150f12 Merge "Lazy-create IpSecTunnelInterface" am: cefc4f6864 am: b8a2bb6a0c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1582714

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I909388ece01647d89608bbaeb0aad3612118a080
 2021-02-13 00:25:20 +00:00
TreeHugger Robot
31cce824af Merge "media: add KEY_COLOR_TRANSFER_REQUEST" into sc-dev 2021-02-13 00:01:57 +00:00
Benedict Wong
b8a2bb6a0c Merge "Lazy-create IpSecTunnelInterface" am: cefc4f6864 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1582714

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id07712e3f5b9bbd7934209a7f9dc922acdb23b50
 2021-02-12 23:57:02 +00:00
Evan Rosky
b760ad1f6e Merge "Apply split-screen resize on sync queue" into rvc-qpr-dev am: e7dbe60d32 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13548127

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I987f95a8bbb7c56dbac7ac25437cbea43c945cda
 2021-02-12 23:56:45 +00:00
Evan Rosky
e7dbe60d32 Merge "Apply split-screen resize on sync queue" into rvc-qpr-dev 2021-02-12 23:42:44 +00:00
Benedict Wong
cefc4f6864 Merge "Lazy-create IpSecTunnelInterface" 2021-02-12 23:11:01 +00:00
Mark Renouf
fe27c4fe5a Merge "Revert "Add back gesture to scrolling screenshot"" into sc-dev 2021-02-12 23:09:18 +00:00
Mark Renouf
11b8be9e57 Revert "Add back gesture to scrolling screenshot" 
This reverts commit c6098c39c87519d1c981c21a6d831ecee7596f49.

Reason for revert: breaks all touch input

Change-Id: I37c94d73b7413f930ab421c9dbffe284e6d536d4
 2021-02-12 22:46:34 +00:00
Yan Yan
e2703bbab6 Merge changes Ifc8ad902,I6d1b8d0e am: 8d659bb1ec am: bdaf1de829 am: cca000ac52 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1453730

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6f3235dd38e4c4912f986cbb27867ff14fe38e81
 2021-02-12 22:46:32 +00:00
Yan Yan
cca000ac52 Merge changes Ifc8ad902,I6d1b8d0e am: 8d659bb1ec am: bdaf1de829 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1453730

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If7bedd741266a08bf2eef515f1fb72a9aebc74e3
 2021-02-12 22:12:07 +00:00
Curtis Belmonte
53928f8bed Merge "Split acquire messages for face auth and enrollment" into sc-dev 2021-02-12 21:59:06 +00:00
Yan Yan
bdaf1de829 Merge changes Ifc8ad902,I6d1b8d0e am: 8d659bb1ec 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1453730

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I12bd81925142b20a04448952de67cb72d77b4ccd
 2021-02-12 21:41:59 +00:00
Rubin Xu
7ce00e0a16 Centralise logic for setting credential manager app 
Bug: 179180345
Test: atest KeyChainTests
Test: m RunKeyChainRoboTests
Change-Id: I4290bccf5ae04de0d84c7091729e86704b937295
Merged-In: I4290bccf5ae04de0d84c7091729e86704b937295
 2021-02-12 21:35:33 +00:00
Rubin Xu
ac5ee32091 Add DPM.getKeyPairGrants() 
(Trimmed down version)

Bug: 179180345
Test: atest
com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testKeyManagement
Test: atest
com.android.cts.devicepolicy.MixedDeviceOwnerTest#testDelegatedCertInstallerDirectly
Test: atest android.admin.cts.DevicePolicyManagerTest
Change-Id: Ieee1048b145fb8400eccbf32c054afc64b5d90c0
Merged-In: Ieee1048b145fb8400eccbf32c054afc64b5d90c0

Change-Id: Id1ab42ddbf04a3f6874ba5ce7eb937114d2194ef
 2021-02-12 21:35:33 +00:00
Rubin Xu
0aa18af47d Add KeyChainService credential management app APIs 
(Trimmed down version)

Bug: 179180345
Test: Manual Testing
      atest com.android.keychain.KeyChainServiceRoboTest

Change-Id: I00b7df27a92f6ee4f74546f892c83290fead1112
Merged-In: I00b7df27a92f6ee4f74546f892c83290fead1112
 2021-02-12 21:35:33 +00:00
Rubin Xu
fd4c56d4d3 add MANAGE_CREDENTIALS appop 
This is part of the work to support
a credential management app on
unmanaged devices.

Bug: 179180345
Test: atest android.appsecurity.cts.AppOpsTest

Merged-In: Ifd87b5e38f341db4b34bf9f61480e29e49148846
Change-Id: Ifd87b5e38f341db4b34bf9f61480e29e49148846
 2021-02-12 21:34:53 +00:00
Dmitri Plotnikov
248ade5460 Convert WakelockPowerCalculator to work with BatteryUsageStats 
Test: atest FrameworksCoreTests:com.android.internal.os.WakelockPowerCalculatorTest

Bug: 158137862
Change-Id: I485bdb1f7dc6622fdf30ddae6d6872f2455f36ad
 2021-02-12 13:30:43 -08:00
Yan Yan
8d659bb1ec Merge changes Ifc8ad902,I6d1b8d0e 
* changes:
  [API] Expose IpSecTunnelInterface#setUnderlyingNetwork
  Update underlying network of IpSecTunnelInterface
 2021-02-12 21:23:29 +00:00
Beth Thibodeau
e580944462 Merge "Use system colors for media" into sc-dev 2021-02-12 20:58:36 +00:00
Manish Singh
2ca39c020f Pass the media capabilities uid when opening media 
FileSystemProvider should pass the uid of the calling app by setting
the EXTRA_MEDIA_CAPABILITIES_UID when opening a media, so that
TranscodeHelper can make decision to transcode or not transcode based on
the calling uid, and not based upon the Provider's uid.

BUG=176157500
Test: manual testing.

Change-Id: Ie08b94cf79c86e9f87639e4fbdd82b2732771187
 2021-02-12 20:49:02 +00:00
TreeHugger Robot
c7e7d693ae Merge "Add dump logs for WiFi Network capabilities changes" into sc-dev 2021-02-12 20:33:55 +00:00
TreeHugger Robot
0a03c59a10 Merge "Fix the read out for InternetTile" into sc-dev 2021-02-12 20:33:19 +00:00
Brad Ebinger
0b318990b3 [automerger skipped] Merge "Add the ability to send the feature tags associated with IMS registration" am: dd170ee3f3 am: 79bba23280 am: db3dd2d54b -s ours 
am skip reason: Change-Id Id730e5e0c9322c2a845523f3b3901f3d899c3f1c with SHA-1 571acd857b is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id906f8233f464b294a21465513f37654e3e65bee
 2021-02-12 20:09:07 +00:00
Ned Burns
536adc2c53 Merge "Create LogBuffers with LogBufferFactory" into sc-dev 2021-02-12 19:24:14 +00:00
Brad Ebinger
db3dd2d54b Merge "Add the ability to send the feature tags associated with IMS registration" am: dd170ee3f3 am: 79bba23280 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1584226

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icb09eacd1a2022d597510510195f4d6a67d76d95
 2021-02-12 19:22:31 +00:00
Ryan Mitchell
19fd30e96e Revert enable exclusive in category atomic API 
A test is failing after converting the enable-exclusive shell command
to use the atomic API. Revert the shell command changes for now.

Bug: 180016597
Test: com.android.launcher3.memory.MemoryTests#testActivityRecreation
Change-Id: I6d84d3d155d8ce3a0bdd25d1afa491dbbd94d960
 2021-02-12 19:15:01 +00:00
Ryan Mitchell
febbc33e9b Remove duplicate idmap classes from services.jar 
The idmap aidl classes are linked into the framework.jar. They do not
need to be linked into the services.jar as well. Remove them.

Bug: 180067820
Test: forrest
Change-Id: Ic8637794cd3a2ea39bad7c0aa6596ca9fe30c45a
 2021-02-12 11:13:41 -08:00
Ryan Mitchell
aea4b53e14 Revert "Fix enable-exclusive atomic api" 
This reverts commit 867aa53e7fed3b4851161de6aa6499e1fe097aad.

Bug: 180016597
Change-Id: Idd304f56340369457d98b94e151a9306b7fa1e60
 2021-02-12 11:13:41 -08:00
TreeHugger Robot
e33b00efb5 Merge "MeasuredEnergy comment cleanup" into sc-dev 2021-02-12 19:12:57 +00:00
TreeHugger Robot
e2c749b69e Merge "Fix domain collection for wildcards" into sc-dev 2021-02-12 18:56:47 +00:00
Brad Ebinger
79bba23280 Merge "Add the ability to send the feature tags associated with IMS registration" am: dd170ee3f3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1584226

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3b5155eb127bfedd6931ebac231691da33e5e2bb
 2021-02-12 18:50:44 +00:00
Brad Ebinger
dd170ee3f3 Merge "Add the ability to send the feature tags associated with IMS registration" 2021-02-12 18:35:13 +00:00
TreeHugger Robot
a5a543f82c Merge "Camera: Switch the reader callback when the sequence ends" into sc-dev 2021-02-12 18:28:17 +00:00
TreeHugger Robot
8bccfe33af Merge "Run H264 instead of Youtube perf for presubmit" into sc-dev 2021-02-12 18:22:31 +00:00
Julia Reynolds
e05bc9a0d5 Merge "Allow NLSes to supply a default notif type filter" into sc-dev 2021-02-12 18:16:36 +00:00
Kalesh Singh
1a8d198b5b Provide an interface to query dmabuf GPU allocations 
The DMA buffers mapped by GPU device(s) are already accounted for
in the total exported dmabuf size (ionHeap) size.

To remove GPU memory from lost RAM, provide an API to get only the
DMA buf memory mapped by the GPU device(s).

Bug: 176477627
Test: adb shell dumpsys meminfo
Change-Id: Ie72f46c8de026b143629406714f413677ce6693b
Merged-In: Ie72f46c8de026b143629406714f413677ce6693b
 2021-02-12 10:07:30 -08:00
Julia Reynolds
b6c718c9b8 Allow NLSes to supply a default notif type filter 
Test: atest, cts verifier
Bug: 173052211
Change-Id: I06a110679c1c9c1de8d0e3f45a2b69c040e538f6
 2021-02-12 12:55:02 -05:00
Anthony Stange
8b97ec7957 Add owners for contexthub framework code 
Bug: 166846988
Change-Id: Id2b82d4df8083d4b70be2e27d31e32ead7ce7c75
Test: presubmits
 2021-02-12 17:43:07 +00:00
Michael Groover
87d49d2f27 Merge "Include knownCerts in Parcels for PermissionInfo and ParsedPermission" into sc-dev 2021-02-12 17:31:45 +00:00
Rafal Slawik
a11e5bf809 [automerger skipped] Merge "Do not keep the input array with CPU times" into rvc-qpr-dev am: 5db3029c29 am: 996b59a24c -s ours 
am skip reason: Change-Id Icda6a71f558e582c5d5b497e2cca1d84deed8b99 with SHA-1 f44fe9c4b6 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8ec9aada923ef9aa948db01db31b89fb60f632d0
 2021-02-12 17:30:16 +00:00