Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
614,897 Commits 3 Branches 0 Tags
30f8a371b73d2ad9abcc088e78a6726ed2efc082
Go to file
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
Treehugger Robot 30f8a371b7 Merge "Revert "Revert "Keystore 2.0 SPI: Move keymint spec to security ..."" am: dd8891acbe am: 4ac4916c8d am: cf7203f5d3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1525189

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I024a2f38dfd2432ae77d6a032c27fc8389cf62dc
2020-12-12 01:07:05 +00:00
.prebuilt_info
…
apct-tests/perftests
Merge "Update BlobStorePerfTests test config."
2020-12-10 20:27:24 +00:00
apex
Merge "Revert "Split getInstance and createInstance in AppSearchImpl""
2020-12-11 23:59:13 +00:00
api
Merge "Unbundle i18n API from android-non-updatable" am: 17e6d5b6a3 am: 3322b2800a am: f358ccece0
2020-12-11 10:50:29 +00:00
cmds
resolve merge conflicts of 358f0d4fc8 to master
2020-12-08 11:01:05 -07:00
config
resolve merge conflicts of 358f0d4fc8 to master
2020-12-08 11:01:05 -07:00
core
Merge "Revert "Revert "Keystore 2.0 SPI: Move keymint spec to security ..."" am: dd8891acbe am: 4ac4916c8d am: cf7203f5d3
2020-12-12 01:07:05 +00:00
data
Merge "Added MANAGE_USERS to CarProvision."
2020-12-12 00:54:56 +00:00
docs
…
drm
Improve OWNERS coverage across frameworks/base/. am: fab0ab3c9c
2020-12-08 16:01:16 +00:00
errorprone
resolve merge conflicts of 358f0d4fc8 to master
2020-12-08 11:01:05 -07:00
graphics
Merge "Add more OWNERS coverages" am: 32ff0144bf am: 60f676c7d6 am: 926aa8da2c
2020-12-11 17:15:02 +00:00
identity
…
keystore
Merge "Revert "Revert "Keystore 2.0 SPI: Move keymint spec to security ..."" am: dd8891acbe am: 4ac4916c8d am: cf7203f5d3
2020-12-12 01:07:05 +00:00
libs
Merge "Provide vsync id for all animation transactions (except PIP)"
2020-12-11 18:28:23 +00:00
location
Merge "Restore get/setExtras per API council feedback"
2020-12-11 20:57:15 +00:00
lowpan
…
media
Merge "Midi: Use exceptionCode instead of transactionError"
2020-12-12 00:22:06 +00:00
mime
Merge "Add mobi extensions to known mime types" am: 806aa0b377 am: 08715462b9 am: 5848bfa206
2020-12-09 20:46:37 +00:00
mms
…
native
resolve merge conflicts of 358f0d4fc8 to master
2020-12-08 11:01:05 -07:00
nfc-extras
…
obex
…
opengl/java
Improve OWNERS coverage across frameworks/base/.
2020-12-08 08:36:27 -07:00
packages
Merge "Fix padding in QQS so tiles only move vertically in portrait"
2020-12-11 20:19:38 +00:00
proto
Revert "Temporarily replace "android.com" accounts."
2020-12-09 11:06:28 -07:00
rs
Add maxTargetSdk restriction to unused APIs.
2020-11-04 09:45:53 +00:00
samples
resolve merge conflicts of 358f0d4fc8 to master
2020-12-08 11:01:05 -07:00
sax
…
services
Merge "Move permission methods in PackageManager to PermissionManager."
2020-12-11 23:24:05 +00:00
startop
Merge "Cleanup some SystemService.onUser...() comments"
2020-12-10 10:03:34 +00:00
telecomm
resolve merge conflicts of 358f0d4fc8 to master
2020-12-08 11:01:05 -07:00
telephony
Merge "Supported IWLAN Fail Cause" am: 32e1818fb1 am: bd1ec8809f am: 3ccb112354
2020-12-12 00:53:01 +00:00
test-base
…
test-legacy
…
test-mock
Add async version of "uncanonicalize"
2020-10-28 17:27:27 -07:00
test-runner
Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
2020-08-31 21:21:38 -07:00
tests
Merge "Adding Natanieljr@ to flicker owners" am: 51fa9312f4 am: 36a33d2e04 am: 1d746f6ece
2020-12-11 12:40:47 +00:00
tools
resolve merge conflicts of 358f0d4fc8 to master
2020-12-08 11:01:05 -07:00
wifi
Merge "Allow setup wizard to call carrier selection APIs"
2020-12-11 01:51:20 +00:00
.clang-format
…
.gitignore
…
.mailmap
…
Android.bp
[CEC Configuration] Move master configuration from '/product/etc' to '/system/etc'
2020-12-10 16:14:14 +01:00
Android.mk
Remove always-empty variable
2020-07-15 13:02:35 +01:00
ApiDocs.bp
Merge "Unbundle i18n API from android-non-updatable" am: 17e6d5b6a3 am: 3322b2800a am: f358ccece0
2020-12-11 10:50:29 +00:00
BATTERY_STATS_OWNERS
Add OWNERS for BatteryStats related files
2020-12-10 10:53:07 -08:00
CleanSpec.mk
…
framework-jarjar-rules.txt
Revert "Add updatable-media jarjar rules to framework-all"
2020-09-07 15:08:06 +00:00
METADATA
…
MODULE_LICENSE_APACHE2
…
NOTICE
…
OWNERS
OWNERS: exempt current.txt files
2020-12-11 16:14:44 +01:00
OWNERS.md
Additional per-file OWNERS for shared directories.
2020-12-10 08:37:23 -07:00
pathmap.mk
…
PREUPLOAD.cfg
Allow creating child surfaces from BlastBufferQueue
2020-10-22 18:03:22 -07:00
StubLibraries.bp
Merge "Unbundle i18n API from android-non-updatable" am: 17e6d5b6a3 am: 3322b2800a am: f358ccece0
2020-12-11 10:50:29 +00:00
TEST_MAPPING
…
ZYGOTE_OWNERS
Improve OWNERS coverage across frameworks/base/.
2020-12-08 08:36:27 -07:00
Description
No description provided
21 GiB
Languages
Java 73.7%
Kotlin 14%
PowerBuilder 5.8%
C++ 5.2%
AIDL 1%