drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
166,583 Commits 1 Branch 0 Tags
Go to file
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
Adam Lesinski 3fd340028f Merge commit '78be0498' into manualmerge 
Conflicts:
	libs/androidfw/ResourceTypes.cpp
	tools/aapt/Android.mk
	tools/aapt/StringPool.cpp
	tools/aapt/StringPool.h

Change-Id: I9d69efdfb892032895ace12159d193304f02dc6c
2014-11-03 18:06:22 -08:00
api
Merge "Split Telecom PhoneAccount registration permissions." into lmp-mr1-dev
2014-11-03 07:54:05 +00:00
cmds
am 984cf41a: Merge "Have Pm return the correct code" into lmp-mr1-dev
2014-10-31 20:22:15 +00:00
core
am d00ced98: am b0cb0734: Merge "Track change to Conscrypt"
2014-11-03 18:50:21 +00:00
data
am 99cc35bb: Merge "Add Cutive Mono as serif monospace font for captioning" into lmp-dev
2014-10-11 00:24:03 +00:00
docs
am 1c337a11: am 2cc032d5: am badfcbec: am 4f8399c7: am eff5efac: Merge "docs: Update Android Dashboard for November 2014" into lmp-docs
2014-11-03 22:31:38 +00:00
drm
…
graphics
am 182f0a13: Merge "Crash apps that print malformed or password protected PDFs." into lmp-mr1-dev
2014-11-01 00:27:30 +00:00
include
Merge "Fix issues that will be present in C++11" into lmp-mr1-dev
2014-11-03 23:38:43 +00:00
keystore
Correct test data size in keystore signing and verification tests.
2014-09-14 17:09:47 +00:00
libs
Merge commit '78be0498' into manualmerge
2014-11-03 18:06:22 -08:00
location
am 36ae48a8: am d83e9e42: am 0761b1b5: am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev
2014-10-10 04:26:40 +00:00
media
am 664eddfd: am 4dd56c93: TIF: Add more documentation on start/end time of TvContract.Program
2014-11-03 04:19:40 +00:00
native
…
nfc-extras
…
obex
…
opengl/java
Re-allow suppressing onDetachedFromWindow
2014-10-01 10:38:07 -07:00
packages
Merge "Only hide sensitive content when Keyguard is showing" into lmp-mr1-dev automerge: 3c7efdc
2014-11-04 00:05:04 +00:00
policy
am 808fe6f9: Merge "Fix colored status bar panning issues" into lmp-mr1-dev
2014-11-03 15:48:21 +00:00
rs
…
samples/training/network-usage
…
sax
…
services
am 946863b6: Merge "Fix USB audio disconnect logic" into lmp-mr1-dev
2014-11-03 18:45:52 +00:00
telecomm/java
Merge "Even, Even more telecom javadoc." into lmp-mr1-dev
2014-11-03 07:53:40 +00:00
telephony/java
am 30e51130: Merge "Improve a calculation method for LTE antenna reception level" into lmp-mr1-dev
2014-10-31 22:41:09 +00:00
test-runner
am 73577862: am b1346d78: Merge "Change boot screen title to "Android is starting" when not upgrading." into lmp-mr1-dev
2014-10-30 23:44:09 +00:00
tests
am d00ced98: am b0cb0734: Merge "Track change to Conscrypt"
2014-11-03 18:50:21 +00:00
tools
Merge commit '78be0498' into manualmerge
2014-11-03 18:06:22 -08:00
wifi/java/android/net/wifi
am f2a598e4: am 074c5b5b: Merge "Don\'t drop WifiConfiguration\'s ephemeral bit on copy/parcel." into lmp-mr1-dev
2014-10-15 15:58:47 +00:00
Android.mk
Docs: Add TOC page for Wearable samples
2014-10-23 09:29:05 -07:00
CleanSpec.mk
Renaming Telecomm to Telecom.
2014-09-12 22:16:17 -07:00
MODULE_LICENSE_APACHE2
…
NOTICE
…
preloaded-classes
Revert "Revert "Frameworks/base: Update to preloaded-classes""
2014-10-02 19:05:44 -07:00
Description
No description provided
5.1 GiB
Languages
Java 77.3%
Kotlin 9.2%
PowerBuilder 6.6%
C++ 5.5%
AIDL 1%