Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
84,638 Commits 3 Branches 0 Tags
749728e39134eeafe5054edefabc36cfdd8632b8
Go to file
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
Irfan Sheriff 749728e391 Merge commit '949dcad8' into manualmerge 
Conflicts:
	services/java/com/android/server/ConnectivityService.java

Change-Id: I02fee6839c2a8879fb6e885d8fc8483f17d655c2
2012-08-27 23:03:50 -07:00
api
Merge commit '949dcad8' into manualmerge
2012-08-27 23:03:50 -07:00
cmds
Merge "Use new surface flinger API." into jb-mr1-dev
2012-08-27 17:15:25 -07:00
core
Merge commit '949dcad8' into manualmerge
2012-08-27 23:03:50 -07:00
data
Fix installing applications from non-primary users.
2012-08-27 15:16:33 -07:00
docs
am 004b2661: am 14b83959: am 2f1ec0db: am cf9e9d62: Design doc change: Update download zips for design bundle and Roboto.
2012-08-24 14:49:46 -07:00
drm
Merge "Let getOriginalMimeType() take a fd passed from drm java applications" into jb-mr1-dev
2012-08-22 14:50:27 -07:00
graphics
Add plumbing for new surface flinger display API.
2012-08-27 14:34:54 -07:00
icu4j
Refactor Styled utility functions into reusable objects.
2010-04-07 14:54:51 -07:00
include
Add plumbing for new surface flinger display API.
2012-08-27 14:34:54 -07:00
keystore
Always-on VPN.
2012-08-27 12:35:05 -07:00
libs
Fix glyph cropping bug
2012-08-17 16:03:27 -07:00
location
Fix some location issues exposed by CTS.
2012-08-21 16:26:26 -07:00
media
Merge "Add plumbing for new surface flinger display API." into jb-mr1-dev
2012-08-27 17:16:53 -07:00
native
Add plumbing for new surface flinger display API.
2012-08-27 14:34:54 -07:00
nfc-extras
Fix BasicNfcEeTest java package.
2011-12-09 14:35:32 -08:00
obex
Add NOTICE and MODULE_LICENSE_BSD_LIKE for obex
2012-04-06 14:04:31 -07:00
opengl/java
Rename UserId to UserHandle.
2012-08-16 12:46:38 -07:00
packages
Import translations. DO NOT MERGE
2012-08-27 13:45:03 -07:00
policy
Make it easier to create asynchronous Handlers.
2012-08-25 13:40:26 -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
Re-arrange android-common so framework no longer links with it.
2010-02-25 11:39:33 -08:00
services
Captive portal handling
2012-08-27 22:27:06 -07:00
telephony/java
am 4e9c7e3f: am 5a60f058: am 13ab2c9f: Merge "Telephony: Add ICC_UNKNOWN intent"
2012-08-24 07:30:15 -07:00
test-runner
Keep track of whether an app is installed for each user.
2012-08-24 13:53:13 -07:00
tests
Merge "Fix bug in grain." into jb-mr1-dev
2012-08-21 17:09:56 -07:00
tools
Keep track of whether an app is installed for each user.
2012-08-24 13:53:13 -07:00
voip
Use audio_channel_mask_t more consistently
2012-07-03 08:40:46 -07:00
wifi/java/android/net/wifi
Captive portal handling
2012-08-27 22:27:06 -07:00
Android.mk
am 510aa89c: am 9f814ac5: Merge "Remove obsolete variables." into jb-mr1-dev
2012-08-22 15:27:43 -07:00
CleanSpec.mk
Telephony: Move AdnRecord.aidl into opt/telephony
2012-08-03 16:47:51 -07:00
MODULE_LICENSE_APACHE2
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
NOTICE
Original DnsSd TxtRecord file
2012-04-04 11:37:35 -07:00
preloaded-classes
Update preloaded-classes for JB
2012-08-12 19:46:51 +09:00
Description
No description provided
21 GiB
Languages
Java 73.7%
Kotlin 14%
PowerBuilder 5.8%
C++ 5.2%
AIDL 1%