drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
118,424 Commits 1 Branch 0 Tags
Commit Graph

118424 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Elliott Hughes
fff28619d8 am f4a7ac00: Merge "Move the Zygote off libcore.os and onto android.system." 
* commit 'f4a7ac00a734343b8d2760def352cbdf99fa08c7':
  Move the Zygote off libcore.os and onto android.system.
 2014-04-29 02:31:34 +00:00
Elliott Hughes
f4a7ac00a7 Merge "Move the Zygote off libcore.os and onto android.system." 2014-04-29 02:28:07 +00:00
Elliott Hughes
860c5911a2 Move the Zygote off libcore.os and onto android.system. 
Change-Id: Iaa20e50b05fad355bdf15bcfdc58efc9941c400c
 2014-04-28 19:19:13 -07:00
Elliott Hughes
12928a07c5 am 2336c4ec: Merge "Fix build." 
* commit '2336c4ecc5735eb374e5c804b1fe863650c24d7f':
  Fix build.
 2014-04-28 19:45:06 +00:00
Elliott Hughes
2336c4ecc5 Merge "Fix build." 2014-04-28 19:41:24 +00:00
Elliott Hughes
9790190fee Fix build. 
Change-Id: I0bd6e1aac19276bf664accd8d38f86d2cc7450cc
 2014-04-28 12:40:12 -07:00
Elliott Hughes
685a0a72d4 am bbd87eb9: Merge "Track libcore.os\' move to android.system." 
* commit 'bbd87eb9193e9730869171324ee4f5fc1abeae55':
  Track libcore.os' move to android.system.
 2014-04-28 18:17:06 +00:00
Elliott Hughes
bbd87eb919 Merge "Track libcore.os' move to android.system." 2014-04-28 18:14:00 +00:00
Mathieu Chartier
18582a827c am 0cd623bb: Merge "Use Runtime.gc instead of System.gc for DDMS." 
* commit '0cd623bb9f832194cdd9c08625fa32583e947c76':
  Use Runtime.gc instead of System.gc for DDMS.
 2014-04-28 18:13:07 +00:00
Elliott Hughes
34385d352d Track libcore.os' move to android.system. 
(This is partial, but should cover everything in AOSP master except
for the zygote.)

Change-Id: I1042c99245765746a744c44e714095cb2c6cb75d
 2014-04-28 11:11:32 -07:00
Mathieu Chartier
0cd623bb9f Merge "Use Runtime.gc instead of System.gc for DDMS." 2014-04-28 18:10:42 +00:00
Mathieu Chartier
83f7d0d67f Use Runtime.gc instead of System.gc for DDMS. 
System.gc doesn't always do a GC unless to attempt to run the
finalizers after you call System.gc.

Bug: 14325353
Change-Id: Iebed7fad5576d610cea13a86e7d3d46652c67478
 2014-04-28 11:07:22 -07:00
Wink Saville
1c1827a640 am 3f4867f4: Merge "Telephony: Add functionality to handle ICC IO error" 
* commit '3f4867f49d6c1932117e3519ce10d11f37829f19':
  Telephony: Add functionality to handle ICC IO error
 2014-04-26 00:20:02 +00:00
Wink Saville
3f4867f49d Merge "Telephony: Add functionality to handle ICC IO error" 2014-04-25 23:58:11 +00:00
Mark Salyzyn
dfdeabf9ba am ac732708: Merge "EventLog: event log translation errors" 
* commit 'ac7327082c411617f7937b87575c117bd63ad9df':
  EventLog: event log translation errors
 2014-04-25 22:03:20 +00:00
Mark Salyzyn
ac7327082c Merge "EventLog: event log translation errors" 2014-04-25 21:59:19 +00:00
Mark Salyzyn
747802f8aa EventLog: event log translation errors 
- Deal with L using v3 event log format, or K using v1 or v2 event log format

Change-Id: Id4fb205f51b7e506135888d565acf1604497b91f
 2014-04-25 13:45:03 -07:00
Marco Nelissen
eded9e3b7f am adcf38c9: Merge "Release DrmManagerClient resources" 
* commit 'adcf38c9936fa372309d413cec03a1413e797c7a':
  Release DrmManagerClient resources
 2014-04-25 14:46:35 +00:00
Marco Nelissen
adcf38c993 Merge "Release DrmManagerClient resources" 2014-04-25 14:42:02 +00:00
Selim Gurun
e3fc307382 am 8c2d70f5: Merge "Add a stub for forgotten callback to fix master-gpl." 
* commit '8c2d70f5e8dfe64213f44c29562fe4240779b68b':
  Add a stub for forgotten callback to fix master-gpl.
 2014-04-25 01:12:46 +00:00
Selim Gurun
8c2d70f5e8 Merge "Add a stub for forgotten callback to fix master-gpl." 2014-04-25 01:08:48 +00:00
Selim Gurun
4e48f40b03 Add a stub for forgotten callback to fix master-gpl. 
Change-Id: I375dba89403d09dc39f696de04e0811633ecc803
 2014-04-24 18:04:04 -07:00
Selim Gurun
f7a191731f am adad989b: Merge "Add a stub to fix master-gpl" 
* commit 'adad989b6a2c736f427526e747dcb89ed9762bab':
  Add a stub to fix master-gpl
 2014-04-25 00:41:59 +00:00
Selim Gurun
adad989b6a Merge "Add a stub to fix master-gpl" 2014-04-25 00:39:10 +00:00
Selim Gurun
85b89bf7a3 Add a stub to fix master-gpl 
Change-Id: I4cadd3a6e33843ccac4ef2eacbe508e40628367c
 2014-04-24 17:31:07 -07:00
Elliott Hughes
5f5ca3bc98 am 31a1dd2a: Merge "Use the suggested public API instead of libcore.os." 
* commit '31a1dd2a8f56b439861ee335b55f44323318830c':
  Use the suggested public API instead of libcore.os.
 2014-04-24 23:55:09 +00:00
Elliott Hughes
31a1dd2a8f Merge "Use the suggested public API instead of libcore.os." 2014-04-24 23:52:16 +00:00
Elliott Hughes
cacbe1b1ef Use the suggested public API instead of libcore.os. 
Change-Id: Id392e4c36c5721ca609d88d9ec6b9340ce05274c
 2014-04-24 16:19:27 -07:00
Mark Salyzyn
eacaa353e8 am c717179e: Merge "jni: android_util_Process 64 bit issues" 
* commit 'c717179e4fec346334fe4bb8603184499b746179':
  jni: android_util_Process 64 bit issues
 2014-04-24 22:14:02 +00:00
Mark Salyzyn
c717179e4f Merge "jni: android_util_Process 64 bit issues" 2014-04-24 22:10:22 +00:00
Mark Salyzyn
c6a410164e jni: android_util_Process 64 bit issues 
- critical issue with using %lld to scanf into a jlong
- subsidiary issues with mix jint, jsize and jlong printing

Change-Id: I77c6b3d3a202fec741cacc540fc39ad6cba25f52
 2014-04-24 13:09:15 -07:00
Nick Kralevich
140dc63f4f am 84803849: Merge "Zygote: enable CAP_BLOCK_SUSPEND capability for system server" 
* commit '8480384986c314bd97b841cbf7f63acb7055ecef':
  Zygote: enable CAP_BLOCK_SUSPEND capability for system server
 2014-04-24 18:22:20 +00:00
Nick Kralevich
8480384986 Merge "Zygote: enable CAP_BLOCK_SUSPEND capability for system server" 2014-04-24 18:18:02 +00:00
Daniel Leung
49cbafad9b Zygote: enable CAP_BLOCK_SUSPEND capability for system server 
Starting from kernel 3.6, it requires processes to have the capability
CAP_BLOCK_SUSPEND to set/unset wake locks. Adds CAP_BLOCK_SUSPEND
to the list of capabilities for system server, so that PowerManager
can set wake locks.

Change-Id: I3246e6f6e6cb8f0bedb1c0417ed07085ee1f3aaa
Signed-off-by: Daniel Leung <daniel.leung@intel.com>
 2014-04-24 19:12:38 +01:00
Elliott Hughes
8d47f23e43 am dbb0de21: Merge "Fix a typo in an assertion." 
* commit 'dbb0de21d35343504b096ae6cbf97d122ac410c9':
  Fix a typo in an assertion.
 2014-04-24 00:25:01 +00:00
Elliott Hughes
dbb0de21d3 Merge "Fix a typo in an assertion." 2014-04-23 23:55:33 +00:00
Elliott Hughes
6bd762289b Fix a typo in an assertion. 
Change-Id: I3e97bb3cb8070c0ec0c6b97769f1da3e7b4ef8f5
 2014-04-23 16:54:33 -07:00
Neil Fuller
caf6497b9a am 683cf1bf: Merge "Changes to support asynchronous close interruption" 
* commit '683cf1bffe33f49f26d46201f96cd2eff60e8192':
  Changes to support asynchronous close interruption
 2014-04-23 16:45:15 +00:00
Neil Fuller
683cf1bffe Merge "Changes to support asynchronous close interruption" 2014-04-23 16:41:17 +00:00
Neil Fuller
43582df3db Changes to support asynchronous close interruption 
This change contains fixes to base from libcore change
I37de3e7d1a005a73821221e6156d10b95c595d7a

Bug: 13927110

Change-Id: I2d96e50307611c269dcf47886cd4d976854da8fc
 2014-04-23 16:40:35 +00:00
Deepanshu Gupta
cf5c3fc70d am 53b7df19: Merge "Add missing ICU_Delegate methods." 
* commit '53b7df19cf287ea48b2ce27ab9cd7ddbc3d04330':
  Add missing ICU_Delegate methods.
 2014-04-22 23:10:40 +00:00
Deepanshu Gupta
53b7df19cf Merge "Add missing ICU_Delegate methods." 2014-04-22 23:08:06 +00:00
Nick Kralevich
5246f4599a am d267c1a0: Merge "remove unneeded import statements." 
* commit 'd267c1a06fc91dc300d5c5f8b7ef9bd44825c34e':
  remove unneeded import statements.
 2014-04-22 19:52:21 +00:00
Nick Kralevich
3ab7882a57 am a67d4a6e: Merge "remove unused import." 
* commit 'a67d4a6e4da1eb02a15a1048a26329cfed312938':
  remove unused import.
 2014-04-22 19:52:18 +00:00
Nick Kralevich
d267c1a06f Merge "remove unneeded import statements." 2014-04-22 19:24:47 +00:00
Nick Kralevich
a67d4a6e4d Merge "remove unused import." 2014-04-22 19:23:30 +00:00
Nick Kralevich
c826257bf3 remove unneeded import statements. 
Internal master is out of sync with AOSP. Resync.

Change-Id: Ia3105a4b6eb835f719471a26ae4cb33962c5b19e
 2014-04-22 12:17:51 -07:00
Nick Kralevich
8cb5abcfde remove unused import. 
This change resynchronizes AOSP with internal master.
The import line is unused.

Change-Id: I98bef1f88dee758f5bdcec35fba204f793d4028e
 2014-04-22 12:10:24 -07:00
Deepanshu Gupta
e2b67777ad Add missing ICU_Delegate methods. 
Update the ICU_Delegate to add methods originally added in
I5de58be7e8a701f2c40182ea54bceff85ec1aad2

Change-Id: I536834fe76cbc7dae05580182fee1bea956e3e77
 2014-04-21 14:33:33 -07:00
Jesse Hall
650a8860d9 am fc3c6a0e: Merge "EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested." 
* commit 'fc3c6a0ef36cc4969aa7d8e160cc55f30c653325':
  EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested.
 2014-04-21 19:41:29 +00:00