Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
401,346 Commits 3 Branches 0 Tags
fe1cdd047f5b002ed19aa0609afa9f76f34ac972
Go to file
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
Dan Albert fe1cdd047f resolve merge conflicts of fb54fde402 to master 
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I7256999a13b713607cfb4c844bf1bc7b37b827a7
2019-01-24 14:46:02 -08:00
apct-tests/perftests
Migrate frameworks/base/apct-tests/perftests/core to androidx.test
2019-01-08 11:33:52 +00:00
api
resolve merge conflicts of fb54fde402 to master
2019-01-24 14:46:02 -08:00
cmds
Merge "Define Nfc statistic data atoms" am: 961a43eae2
2019-01-24 13:07:37 -08:00
config
Merge "Implementation of Remote-SIM." am: 9f7bc7d616 am: 0fd63d542d
2019-01-23 21:50:17 -08:00
core
resolve merge conflicts of fb54fde402 to master
2019-01-24 14:46:02 -08:00
data
Adding READ_PRECISE_CALL_STATE permission in phone app.
2019-01-22 21:53:16 +00:00
docs
Added support for additional Blend Modes
2018-12-10 15:38:59 -08:00
drm
Allow https URIs in convertUriToPath
2019-01-09 06:57:13 +00:00
graphics
Merge "Don't assume all FP16 bitmaps are linearly encoded."
2019-01-24 16:32:31 +00:00
keystore
Limit access to suspected false positives.
2018-12-28 11:50:04 +00:00
libs
Merge "Increase ShaderCache max size to accomodate Vulkan pipeline cache"
2019-01-24 21:49:44 +00:00
location
Merge "Add location settings piercing in emergencies"
2019-01-23 00:26:52 +00:00
lowpan
Migrate frameworks/base/lowpan/tests to androidx.test
2018-12-17 18:49:19 -08:00
media
Merge changes from topic "media-apex"
2019-01-24 08:45:07 +00:00
native
Add setColor, setColorAlpha, and setColorDataspace to ASurfaceControl
2019-01-23 12:12:27 -08:00
nfc-extras
Update signature files to the new format
2019-01-19 12:07:50 -08:00
obex
Update signature files to the new format
2019-01-19 12:07:50 -08:00
opengl/java
Make EGL15 class final
2018-10-24 09:25:55 -06:00
packages
Merge "Fix inconsistent data usage cycle start time."
2019-01-24 22:29:05 +00:00
proto
Merge "Add g/setScore and g/setEntityTypes to TextClassifierEvent"
2019-01-24 21:23:13 +00:00
rs
Add @UnsupportedAppUsage annotations
2018-08-02 14:46:03 +01:00
samples/training/network-usage
…
sax
Move XML object factory logic to libcore
2018-07-11 13:50:42 +01:00
services
resolve merge conflicts of fb54fde402 to master
2019-01-24 14:46:02 -08:00
startop
Fix OWNERS sorting
2019-01-23 10:15:20 -08:00
telecomm
Merge "Add nuisance call reporting API to Telecom."
2019-01-23 21:50:49 +00:00
telephony
Merge "Update EuiccManager APIs used for eSIM activation flow"
2019-01-24 21:35:47 +00:00
test-base
Update signature files to the new format
2019-01-19 12:07:50 -08:00
test-legacy
Change the impl lib name of java_sdk_library
2019-01-17 09:43:25 +09:00
test-mock
API Compatibility: Fix incompatible abstract methods on Context
2019-01-22 16:58:56 +01:00
test-runner
Update signature files to the new format
2019-01-19 12:07:50 -08:00
tests
resolve merge conflicts of fb54fde402 to master
2019-01-24 14:46:02 -08:00
tools
Merge "Replace annotation_processors with plugins"
2019-01-24 17:57:17 +00:00
wifi
Merge "WifiConfiguration: App attribution for suggestion/request"
2019-01-24 18:31:42 +00:00
.gitignore
Ignore /.idea and *.iml files
2018-12-05 16:31:53 +00:00
Android.bp
Merge "Include OrgApacheHttpLegacyUpdater unconditionally" am: 87c1081c42 am: 34269e4b74
2019-01-24 04:12:06 -08:00
Android.mk
hiddenapi: Expect public/private API as CSV
2019-01-19 15:57:36 +00:00
CleanSpec.mk
Move default sounds to /product
2019-01-07 14:16:56 +00:00
jarjar_rules_hidl.txt
jarjar hidl core libs.
2019-01-22 21:11:25 +00:00
MODULE_LICENSE_APACHE2
…
NOTICE
…
pathmap.mk
…
PREUPLOAD.cfg
Merge changes from topic "libcore-remaining-hiddenapi" am: 74c171b4da am: a51da7d3be
2018-11-29 08:34:17 -08:00
Description
No description provided
21 GiB
Languages
Java 73.7%
Kotlin 14%
PowerBuilder 5.8%
C++ 5.2%
AIDL 1%