Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
373,875 Commits 3 Branches 0 Tags
f8d22dec8788d18c5b37adf3b4710691d5d347ed
Go to file
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
David Brazdil f8d22dec87 resolve merge conflicts of 6e3c86c8ed to stage-aosp-master 
BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ide3c4e229b47e4242cacafc04b70d8b392712cc8
2018-07-11 11:56:34 +01:00
apct-tests/perftests
Merge "Convert to Soong" am: acbd94d76f
2018-05-15 15:06:19 -07:00
api
Merge "Type Allocation Code & Manufacturer Code"
2018-07-06 12:06:39 -07:00
cmds
Merge "Disable statsd and make StatsLog no-op if ro.statsd.enable=false" into pi-dev
2018-06-07 14:53:43 -07:00
config
Merge "Add filter for NoPreloadHolders" am: 88ee5c93bb
2018-06-07 21:14:59 -07:00
core
Merge "Java side setup and access to Binder Proxy Tracking"
2018-07-10 16:24:47 +00:00
data
Merge changes from topic "audio-package-update"
2018-06-08 17:11:41 -07:00
docs
Camera: update tonemap image in html doc
2018-06-07 10:42:39 -07:00
drm
Stop using Arrays.checkOffsetAndCount.
2018-05-16 07:11:54 -07:00
graphics/java/android
Ensure picture isn't recording in createBitmap
2018-06-01 12:55:13 -07:00
keystore
Improve KeyChain documentation
2018-06-04 17:12:41 +01:00
libs
Merge "Remove CSV support"
2018-07-09 14:41:03 -07:00
location
Merge "Build com.android.location.provider with java_sdk_library"
2018-06-14 21:59:40 -07:00
lowpan
Merge "Remove duplicate definitions of utility variables" am: 8d5a39ac62
2018-04-04 17:56:57 -07:00
media
Add field to set A2DP device volume on connect (1/2)
2018-06-07 22:32:24 +00:00
native
Merge "Work around b/24465209, do not pack relocation table." am: d01890df3c
2018-05-24 14:44:52 -07:00
nfc-extras
Add api txt files for nfc-extras
2018-05-12 22:36:10 +09:00
obex
Build java.obex with java_sdk_library
2018-05-30 00:19:01 +00:00
opengl/java
remove unused private field
2017-05-01 10:22:44 -04:00
packages
Merge "Remove unusual static method call"
2018-07-05 05:24:39 -07:00
proto
New Autofill field: FIELD_AUTOFILL_SESSION_ID
2018-05-25 06:22:25 +00:00
rs
Merge "docs: fixing bug 36982027 and 30636712, typos" into oc-mr1-dev
2018-03-23 22:11:38 +00:00
samples/training/network-usage
…
sax
frameworks/base: Set LOCAL_SDK_VERSION where possible.
2018-02-28 15:13:23 +00:00
services
Merge "Java side setup and access to Binder Proxy Tracking"
2018-07-10 16:24:47 +00:00
telecomm
Merge "Ensure self-managed calls use voip audio mode." am: b62aa315d1
2018-06-06 16:33:19 -07:00
telephony
Merge "Type Allocation Code & Manufacturer Code"
2018-07-06 12:06:39 -07:00
test-base
Merge "Compile android.test.*.stubs into dex"
2018-07-11 09:18:15 +00:00
test-legacy
Build android.test.base/legacy against SDK
2018-02-18 21:47:42 +09:00
test-mock
resolve merge conflicts of 6e3c86c8ed to stage-aosp-master
2018-07-11 11:56:34 +01:00
test-runner
resolve merge conflicts of 6e3c86c8ed to stage-aosp-master
2018-07-11 11:56:34 +01:00
tests
Merge "Add in-app tracepoints to TouchLatency app."
2018-07-02 17:57:29 -07:00
tools
Fix ManifestMerger issues
2018-06-15 23:03:46 +00:00
vr
Mark installable jars with installable: true
2018-07-10 14:30:07 -07:00
wifi
Merge "WifiManager: add call to see if apband conversion is required" into pi-dev
2018-06-06 09:51:50 -07:00
Android.bp
Mark installable jars with installable: true
2018-07-10 14:30:07 -07:00
Android.mk
Build dark greylist from public + light grey API
2018-05-30 14:13:52 +01:00
CleanSpec.mk
Merge "Build com.android.future.usb.accessory with java_sdk_library"
2018-06-28 20:38:09 -07:00
MODULE_LICENSE_APACHE2
…
NOTICE
…
pathmap.mk
Remove Support Library from frameworks/base pathmap.mk
2018-02-15 11:37:52 -05:00
PREUPLOAD.cfg
Add presubmit hook for hidden API lists.
2018-05-08 10:29:50 +01:00
Description
No description provided
21 GiB
Languages
Java 73.7%
Kotlin 14%
PowerBuilder 5.8%
C++ 5.2%
AIDL 1%