Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
509,654 Commits 3 Branches 0 Tags
847cfb2230b7692f99521ba58d644ffbea397a97
Go to file
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
Bill Yi 847cfb2230 [automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 5b49c68d11 am: 1848cf03d8 -s ours 
am skip reason: Change-Id Id04ea331831e8b26ba99478848392b40a92548d5 with SHA-1 c54ab73ef9 is in history

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

Change-Id: I4a14d0f2ef305f4f564e7e38134763a85fd09ad3
2020-09-19 05:50:36 +00:00
.prebuilt_info
Drop prebuilt files to android source tree.
2020-05-19 11:19:13 +00:00
apct-tests/perftests
Merge "Add collector library in multi user per test apk." into rvc-dev am: 3ed037cb40
2020-06-20 15:51:14 +00:00
apex
Merge "Replace 'whitelist' with 'allowlist'" am: 8ac6819c0e am: 3563eeb4ae
2020-09-14 21:27:14 +00:00
api
Merge "Customize the service class for Call barring"
2020-09-17 20:42:02 +00:00
cmds
Additional LMK diagnostic information
2020-09-11 12:37:05 +01:00
config
resolve merge conflicts of 525ed1c275 to rvc-dev-plus-aosp
2020-08-24 09:07:41 +00:00
core
Merge "Clarify docs for FLAG_SYSTEM" am: 40dcbcad28 am: b4ff7c066f
2020-09-17 21:06:52 +00:00
data
Merge "Add KEYCODE_PROG_{BLUE,RED,GREEN,YELLOW} mappings to LKC equivalents" am: 4ec7604b48 am: ab5d157062
2020-08-07 17:31:17 +00:00
docs
…
drm
Merge "Update language to comply with Android's inclusive language guidance" am: f98e615b6d am: 9016cc88e3
2020-08-14 01:25:12 +00:00
errorprone
Use AutoValue from external/auto
2020-06-26 11:20:26 -07:00
graphics
Merge "ImageDecoder: Use AssetFileDescriptor's length" am: efca2d56f1 am: 3a62413c4f
2020-09-16 17:01:31 +00:00
identity
Identity: Update for changes to ISO 18013-5.
2020-06-24 10:21:55 -04:00
keystore
Merge "Adding TEST_MAPPING to frameworks/base/keystore" am: 5dd8206c04 am: 844ceb6d89
2020-08-24 11:29:04 +00:00
libs
Merge "Make configs differing only in density siblings" am: db0a92a881 am: 93cd93c3b1
2020-09-17 20:48:17 +00:00
location
DO NOT MERGE: Always return non null from getGpsStatus
2020-07-15 13:12:54 -07:00
lowpan
Convert lowpan/tests/Android.mk file to Android.bp
2020-05-19 18:04:09 -07:00
media
Merge "Revert "Ringtone uri should add type query"" am: 56da278127 am: 7a5e865a80
2020-09-17 19:13:46 +00:00
mime
Add additional optional audio/x-mpeg MIME type to MIME type map
2020-06-17 23:39:06 +01:00
mms
Remove Mainline APIs for MmsManger and TelephonyManager
2020-03-31 12:47:46 -07:00
native
Merge "Remove libandroid_trace" am: 242c212b80 am: 7d36816ecd
2020-05-15 16:30:14 +00:00
nfc-extras
…
non-updatable-api
Merge "Customize the service class for Call barring"
2020-09-17 20:42:02 +00:00
obex
…
opengl/java
…
packages
Merge "Move BPF offload program from netd to mainline" am: c26848e7bd am: ca5a85bcb0
2020-09-18 04:56:57 +00:00
proto
Merge "Set min_sdk_version to be part of mainline modules" am: 7bca9bf7de am: e4fe4b211d
2020-06-18 17:18:10 +00:00
rs
Merge "Use jni_headers instead of JNI_H_INCLUDE" am: 75a5b44258 am: b842272135
2020-07-06 09:59:48 +00:00
samples
Add sample app for haptic assessment.
2020-06-02 13:36:45 +00:00
sax
…
services
Merge "Bluetooth: log who changes adapter name" am: 78f92ef7fa am: 8e139a82cd
2020-09-17 12:17:54 +00:00
startop
Merge "IorapForwardingService: Suppress error log" am: c20242f7e6 am: 3e1b131387
2020-08-19 22:58:14 +00:00
telecomm
Expose Telecom constants for use in Telephony
2020-09-14 18:37:44 -07:00
telephony
Merge "Customize the service class for Call barring"
2020-09-17 20:42:02 +00:00
test-base
Update JavaDoc reference to AndroidX Test
2020-07-06 22:19:59 +00:00
test-legacy
…
test-mock
Don't use impl lib of android.test.[mock|base|runners]
2020-06-26 01:39:20 +00:00
test-runner
Merge "Fix typo "thew" -> "threw" in AndroidTestRunner" am: 0b778939c7 am: 3f1247e91b
2020-08-04 15:06:45 +00:00
tests
Merge "Notify the keepalive is stopped after the slot has been released" am: 6d7c1854a8 am: b5e1feccbe
2020-08-28 11:09:43 +00:00
tools
Merge "Ignore resources from unknown types"
2020-09-17 17:52:13 +00:00
wifi
Update wifi OWNERS (base)
2020-09-15 08:02:51 -07:00
.clang-format
Enable clang-format for frameworks/base
2020-07-17 18:43:18 -07:00
.gitignore
…
.mailmap
…
Android.bp
Merge the framework-defaults into framework-minus-apex am: 3e20672380
2020-09-08 13:39:54 +00:00
Android.mk
Remove always-empty variable
2020-07-15 13:02:35 +01:00
ApiDocs.bp
Remove create_stubs: false from droiddoc
2020-08-03 14:48:04 -07: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
Add METADATA to base: Apache2+CC-BY+BSD is NOTICE
2020-05-05 07:12:30 -07:00
MODULE_LICENSE_APACHE2
…
NOTICE
…
pathmap.mk
…
PREUPLOAD.cfg
Enable clang-format for frameworks/base
2020-07-17 18:43:18 -07:00
StubLibraries.bp
Merge "Compose the main stubs jars from module stubs"
2020-08-18 15:18:07 +00:00
TEST_MAPPING
…
Description
No description provided
21 GiB
Languages
Java 73.7%
Kotlin 14%
PowerBuilder 5.8%
C++ 5.2%
AIDL 1%