Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
113,232 Commits 3 Branches 0 Tags
a7cda03a4747bd224cd304324abc270fa1609bbc
Go to file
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
Adam Skory a7cda03a47 resolved conflicts for merge of 7d17de35 to master 
Conflicts:
	core/res/res/values/public.xml

Change-Id: I14b4e332be7ef27e76a2773a504cb942bd0642ef
2013-09-11 16:16:19 +01:00
api
resolved conflicts for merge of 7d17de35 to master
2013-09-11 16:16:19 +01:00
cmds
Add #! to 'am' shell script
2013-09-04 15:39:51 -07:00
core
resolved conflicts for merge of 7d17de35 to master
2013-09-11 16:16:19 +01:00
data
am 7b4f60de: Merge "Special case game controller fallback keys for Japan" into klp-dev
2013-09-06 19:05:44 -07:00
docs
am b096bee1: am dd93ae32: Doc change: fix typo.
2013-09-09 10:45:57 -07:00
drm
Revert "Enhancement for OnInfo callback on DRM Framework"
2013-09-03 10:13:17 -07:00
graphics
am 8eb3ece8: am 1d2daa78: Merge "Remove FD optimization case for decodeStream" into klp-dev
2013-09-10 09:31:04 -07:00
include
Clearly separate consumer and producer interfaces
2013-08-06 13:07:42 -07:00
keystore
Add argument to binder call to check key types
2013-09-05 13:27:00 -07:00
libs
am 53760b4a: am 874ae2ad: Merge "Fix scissor for functor invocation" into klp-dev
2013-09-10 14:08:12 -07:00
location
Incorporate new API council comments
2013-09-05 09:45:03 -07:00
media
am 487a8fc9: am 82d11f8e: Merge "MediaMuxer: Add setLocation API" into klp-dev
2013-09-10 12:48:13 -07:00
native
Move input library code to frameworks/native.
2013-07-01 20:11:42 -07:00
nfc-extras
Clean up dist files.
2013-05-21 12:38:22 -07:00
obex
Bluetooth MAP profile - sms and mms support initial check-in
2013-08-09 15:01:07 -07:00
opengl/java
Merge "Fix wrapper equals()"
2013-06-24 17:42:25 +00:00
packages
am a339f2e5: am 1434a407: Merge "More tweaks to match UX spec." into klp-dev
2013-09-10 21:23:08 -07:00
policy
Fix deadlock by keeping local copy of currentUserId
2013-09-06 15:43:23 -07:00
samples/training/network-usage
cherrypick from ics-mr1 docs: source for nw app Change-Id: If50f407a0e56fa802fe9beedaa650e3a131872b2
2012-08-08 11:27:09 -07:00
sax
…
services
resolved conflicts for merge of 7d17de35 to master
2013-09-11 16:16:19 +01:00
telephony/java
For NETWORK_MODE_LTE_CMDA_EVDO_GSM_WCDMA default to PHONE_TYPE_GSM
2013-09-07 10:03:02 -07:00
test-runner
Work on issue #10130785: Restore silence and vibrate settings...
2013-09-06 16:39:59 -07:00
tests
resolved conflicts for merge of 09ed0720 to master
2013-09-04 17:19:44 -07:00
wifi/java/android/net/wifi
Fix a few synchronization issues in WifiMonitor.
2013-09-11 13:00:01 +00:00
Android.mk
Fix broken javadocs
2013-09-05 15:58:24 -07:00
CleanSpec.mk
am add9898c: am 7314eb08: Merge "Fix broken copy of kl/kcm/idc files to system image" into klp-dev
2013-09-05 15:36:38 -07:00
MODULE_LICENSE_APACHE2
…
NOTICE
…
preloaded-classes
am c40e46e8: am bfe1b801: Merge "Update preloaded-classes"
2013-07-30 14:10:43 -07:00
Description
No description provided
21 GiB
Languages
Java 73.7%
Kotlin 14%
PowerBuilder 5.8%
C++ 5.2%
AIDL 1%