Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
155,933 Commits 3 Branches 0 Tags
02e3979d62bf4b85fe7dedeefa357748419db992
Go to file
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
Wink Saville 02e3979d62 Merge commit 'e58e59cc' into fix-merge-conflict 
* commit 'e58e59cc':
  ksd to lmp-sprout-dev

Conflicts:
	core/java/android/provider/CallLog.java
	telephony/java/android/telephony/SubInfoRecord.java
	telephony/java/android/telephony/SubscriptionManager.java
	telephony/java/android/telephony/TelephonyManager.java
	telephony/java/com/android/internal/telephony/ISub.aidl
	telephony/java/com/android/internal/telephony/TelephonyIntents.java

Change-Id: I2b892b692743a7ccde55185a2b90135bf28408cd
2014-09-15 12:40:02 -07:00
api
Merge "GMSCore and Finsky are fixed. Revert "Revert "Set up final resource identifiers.""" into lmp-dev
2014-09-14 02:53:32 +00:00
cmds
Merge "Bring install and install-multiple into parity." into lmp-dev
2014-09-12 18:16:52 +00:00
core
Merge commit 'e58e59cc' into fix-merge-conflict
2014-09-15 12:40:02 -07:00
data
Map KEY_VOICECOMMAND to KEYCODE_VOICE_ASSIST
2014-09-05 17:45:26 -07:00
docs
am b331a753: am 85c953ef: am 41b12f29: am 02480cbf: am 1b12b1dc: Merge "docs: remove bad link in the quick view box for TV Recommendations #2" into klp-modular-docs
2014-09-13 02:37:24 +00:00
drm
…
graphics
am 3512e8d6: am 1e8bb662: Merge "Apply VectorDrawable color filter at draw time" into lmp-dev
2014-09-13 02:35:14 +00:00
include
am a38e59b1: am 683872af: Merge "Clean entire arg block when setting process name." into lmp-dev
2014-09-12 05:45:07 +00:00
keystore
Correct test data size in keystore signing and verification tests.
2014-09-14 17:09:47 +00:00
libs
am b5f00ba9: am cceffe72: Merge "Correctly initialize animator asynchronousity" into lmp-dev
2014-09-13 03:13:01 +00:00
location
am 345926e6: am 4290fb7b: Merge "Handle user privacy properly during network initiated requests. Bug: 16131208" into lmp-dev
2014-09-13 02:30:28 +00:00
media
TIF: Turn debugging off
2014-09-14 10:30:05 -07:00
native
Sensor related changes for NDK.
2014-08-05 19:34:04 -07:00
nfc-extras
…
obex
Bluetooth: Support MAP Client role on Bluedroid.
2014-07-01 18:01:27 +00:00
opengl/java
Fix onTrimMemory for HardwareRenderer
2014-06-30 16:36:26 -07:00
packages
am 98ae236f: am 026a5154: Aggressive tuning of recents memory usage
2014-09-15 09:39:41 +00:00
policy
am 51bf4916: am 86a3adca: Merge "Magic null-background filling for PhoneWindows" into lmp-dev
2014-09-14 23:21:09 +00:00
rs
resolved conflicts for merge of 5a2d0432 to lmp-dev-plus-aosp
2014-08-21 23:20:32 -07:00
samples/training/network-usage
…
sax
…
services
am 1c217c6a: am 2e33bd88: Merge "Fix cyclic mute" into lmp-dev
2014-09-15 13:06:21 +00:00
telecomm/java
Pipe TelephonyManager.getCallState through TelecommManager
2014-09-14 09:54:23 -07:00
telephony/java
Merge commit 'e58e59cc' into fix-merge-conflict
2014-09-15 12:40:02 -07:00
test-runner
Remove package level intent forwarding.
2014-09-11 15:42:13 +01:00
tests
Merge "Add root alpha and animation to (Animated)VectorDrawable" into lmp-dev
2014-09-12 22:12:03 +00:00
tools
am 1c1683a3: am 1ddb7a6b: Merge "Saver: PowerManager call to set low power mode." into lmp-dev
2014-09-14 20:09:39 +00:00
wifi/java/android/net/wifi
am c3eea0ee: am a203fbc8: Merge "Allow creating EAP_TLS network without specifying Phase2.None" into lmp-dev
2014-09-15 01:42:04 +00:00
Android.mk
Renaming Telecomm to Telecom.
2014-09-12 22:16:17 -07:00
CleanSpec.mk
Renaming Telecomm to Telecom.
2014-09-12 22:16:17 -07:00
MODULE_LICENSE_APACHE2
…
NOTICE
…
preloaded-classes
Remove WebView library preloading mechanism.
2014-07-17 09:18:43 -07:00
Description
No description provided
21 GiB
Languages
Java 73.7%
Kotlin 14%
PowerBuilder 5.8%
C++ 5.2%
AIDL 1%