summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 3f4867f4: Merge "Telephony: Add functionality to handle ICC IO error"Wink Saville2014-04-263-2/+16
|\ | | | | | | | | * commit '3f4867f49d6c1932117e3519ce10d11f37829f19': Telephony: Add functionality to handle ICC IO error
| * Merge "Telephony: Add functionality to handle ICC IO error"Wink Saville2014-04-253-2/+16
| |\
| | * Telephony: Add functionality to handle ICC IO errorRakesh Pallerla2014-03-123-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | At present in Android all ICC Card states other than ICC PRESENT are treated as ICC ABSENT.Adding functionality to handle ICC IO error card state. Change-Id: I229bd80cb5e487f4345bef9fb7fee60850f085d9 Bug: 10643652
* | | am ac732708: Merge "EventLog: event log translation errors"Mark Salyzyn2014-04-251-7/+17
|\ \ \ | |/ / | | | | | | | | | * commit 'ac7327082c411617f7937b87575c117bd63ad9df': EventLog: event log translation errors
| * | Merge "EventLog: event log translation errors"Mark Salyzyn2014-04-251-7/+17
| |\ \
| | * | EventLog: event log translation errorsMark Salyzyn2014-04-251-7/+17
| |/ / | | | | | | | | | | | | | | | - Deal with L using v3 event log format, or K using v1 or v2 event log format Change-Id: Id4fb205f51b7e506135888d565acf1604497b91f
* | | am adcf38c9: Merge "Release DrmManagerClient resources"Marco Nelissen2014-04-251-0/+13
|\ \ \ | |/ / | | | | | | | | | * commit 'adcf38c9936fa372309d413cec03a1413e797c7a': Release DrmManagerClient resources
| * | Merge "Release DrmManagerClient resources"Marco Nelissen2014-04-251-0/+13
| |\ \
| | * | Release DrmManagerClient resourcesMattias Nilsson2014-04-151-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Call release for DrmManagerClient to avoid resource leaks Introduced by following commit (5d143ad4a8f...), "Media scanner support for FL(Forward Lock) DRM file types" Change-Id: Ic3c458579f4e99b3b072a2e13362d1996b982589
* | | | am 8c2d70f5: Merge "Add a stub for forgotten callback to fix master-gpl."Selim Gurun2014-04-251-0/+24
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '8c2d70f5e8dfe64213f44c29562fe4240779b68b': Add a stub for forgotten callback to fix master-gpl.
| * | | Merge "Add a stub for forgotten callback to fix master-gpl."Selim Gurun2014-04-251-0/+24
| |\ \ \
| | * | | Add a stub for forgotten callback to fix master-gpl.Selim Gurun2014-04-241-0/+24
| | | | | | | | | | | | | | | | | | | | Change-Id: I375dba89403d09dc39f696de04e0811633ecc803
* | | | | am adad989b: Merge "Add a stub to fix master-gpl"Selim Gurun2014-04-251-0/+80
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'adad989b6a2c736f427526e747dcb89ed9762bab': Add a stub to fix master-gpl
| * | | | Merge "Add a stub to fix master-gpl"Selim Gurun2014-04-251-0/+80
| |\ \ \ \ | | |/ / /
| | * | | Add a stub to fix master-gplSelim Gurun2014-04-241-0/+80
| | | | | | | | | | | | | | | | | | | | Change-Id: I4cadd3a6e33843ccac4ef2eacbe508e40628367c
* | | | | am 31a1dd2a: Merge "Use the suggested public API instead of libcore.os."Elliott Hughes2014-04-242-20/+18
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '31a1dd2a8f56b439861ee335b55f44323318830c': Use the suggested public API instead of libcore.os.
| * | | | Merge "Use the suggested public API instead of libcore.os."Elliott Hughes2014-04-242-20/+18
| |\ \ \ \
| | * | | | Use the suggested public API instead of libcore.os.Elliott Hughes2014-04-242-20/+18
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id392e4c36c5721ca609d88d9ec6b9340ce05274c
* | | | | | am c717179e: Merge "jni: android_util_Process 64 bit issues"Mark Salyzyn2014-04-241-16/+17
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'c717179e4fec346334fe4bb8603184499b746179': jni: android_util_Process 64 bit issues
| * | | | | Merge "jni: android_util_Process 64 bit issues"Mark Salyzyn2014-04-241-16/+17
| |\ \ \ \ \
| | * | | | | jni: android_util_Process 64 bit issuesMark Salyzyn2014-04-241-16/+17
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - critical issue with using %lld to scanf into a jlong - subsidiary issues with mix jint, jsize and jlong printing Change-Id: I77c6b3d3a202fec741cacc540fc39ad6cba25f52
* | | | | | am 84803849: Merge "Zygote: enable CAP_BLOCK_SUSPEND capability for system ↵Nick Kralevich2014-04-241-0/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | server" * commit '8480384986c314bd97b841cbf7f63acb7055ecef': Zygote: enable CAP_BLOCK_SUSPEND capability for system server
| * | | | | Merge "Zygote: enable CAP_BLOCK_SUSPEND capability for system server"Nick Kralevich2014-04-241-0/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Zygote: enable CAP_BLOCK_SUSPEND capability for system serverDaniel Leung2014-04-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | am dbb0de21: Merge "Fix a typo in an assertion."Elliott Hughes2014-04-241-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'dbb0de21d35343504b096ae6cbf97d122ac410c9': Fix a typo in an assertion.
| * | | | | Merge "Fix a typo in an assertion."Elliott Hughes2014-04-231-1/+1
| |\ \ \ \ \
| | * | | | | Fix a typo in an assertion.Elliott Hughes2014-04-231-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | Change-Id: I3e97bb3cb8070c0ec0c6b97769f1da3e7b4ef8f5
* | | | | | am 683cf1bf: Merge "Changes to support asynchronous close interruption"Neil Fuller2014-04-232-1/+9
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '683cf1bffe33f49f26d46201f96cd2eff60e8192': Changes to support asynchronous close interruption
| * | | | | Merge "Changes to support asynchronous close interruption"Neil Fuller2014-04-232-1/+9
| |\ \ \ \ \
| | * | | | | Changes to support asynchronous close interruptionNeil Fuller2014-04-232-1/+9
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change contains fixes to base from libcore change I37de3e7d1a005a73821221e6156d10b95c595d7a Bug: 13927110 Change-Id: I2d96e50307611c269dcf47886cd4d976854da8fc
* | | | | | am 53b7df19: Merge "Add missing ICU_Delegate methods."Deepanshu Gupta2014-04-221-0/+10
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '53b7df19cf287ea48b2ce27ab9cd7ddbc3d04330': Add missing ICU_Delegate methods.
| * | | | | Merge "Add missing ICU_Delegate methods."Deepanshu Gupta2014-04-221-0/+10
| |\ \ \ \ \
| | * | | | | Add missing ICU_Delegate methods.Deepanshu Gupta2014-04-211-0/+10
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the ICU_Delegate to add methods originally added in I5de58be7e8a701f2c40182ea54bceff85ec1aad2 Change-Id: I536834fe76cbc7dae05580182fee1bea956e3e77
* | | | | | am d267c1a0: Merge "remove unneeded import statements."Nick Kralevich2014-04-221-2/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'd267c1a06fc91dc300d5c5f8b7ef9bd44825c34e': remove unneeded import statements.
| * | | | | Merge "remove unneeded import statements."Nick Kralevich2014-04-221-2/+0
| |\ \ \ \ \
| | * | | | | remove unneeded import statements.Nick Kralevich2014-04-221-2/+0
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Internal master is out of sync with AOSP. Resync. Change-Id: Ia3105a4b6eb835f719471a26ae4cb33962c5b19e
* | | | | | am a67d4a6e: Merge "remove unused import."Nick Kralevich2014-04-221-1/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'a67d4a6e4da1eb02a15a1048a26329cfed312938': remove unused import.
| * | | | | Merge "remove unused import."Nick Kralevich2014-04-221-1/+0
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | remove unused import.Nick Kralevich2014-04-221-1/+0
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change resynchronizes AOSP with internal master. The import line is unused. Change-Id: I98bef1f88dee758f5bdcec35fba204f793d4028e
* | | | | am fc3c6a0e: Merge "EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested."Jesse Hall2014-04-211-2/+6
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'fc3c6a0ef36cc4969aa7d8e160cc55f30c653325': EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested.
| * | | | Merge "EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested."Jesse Hall2014-04-211-2/+6
| |\ \ \ \
| | * | | | EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested.Jin Zhebin2014-04-151-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OpenGL ES have 3 configuration: 1(EGL10.EGL_RENDERABLE_TYPE), 2(EGL_OPENGL_ES2_BIT), 3(EGL_OPENGL_ES3_BIT_KHR). The driver should be get the according configuration parameter. Now 1 is set to driver when Configuration 3 is set from user. Specification EGL_OPENGL_ES3_BIT_KHR is set to driver when a OpenGL ES 3 context is requested in setEGLContextClientVersion(). Change-Id: I980d9d8dbe5754295f8329fcf9378962d669fa89 Signed-off-by: Jin Zhebin <zhebinx.jin@intel.com> Signed-off-by: bdeng3X <bingx.deng@intel.com>
* | | | | | am 2a52862d: Merge "Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs."Ying Wang2014-04-212-2/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '2a52862db5257edcafa137276ce3d8dc54cd443e': Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs.
| * | | | | Merge "Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs."Ying Wang2014-04-192-2/+2
| |\ \ \ \ \
| | * | | | | Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs.Ying Wang2014-04-182-2/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | Change-Id: Ibef01983891377b859d28cff801f48ef5d8eabb2
* | | | | | am 90840ec2: Merge "Fix warning introduced by recent psuedolocalizer change."Elliott Hughes2014-04-181-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '90840ec29dec173f5fbc8197bcf1889bde5bd262': Fix warning introduced by recent psuedolocalizer change.
| * | | | | Merge "Fix warning introduced by recent psuedolocalizer change."Elliott Hughes2014-04-181-1/+1
| |\ \ \ \ \
| | * | | | | Fix warning introduced by recent psuedolocalizer change.Elliott Hughes2014-04-181-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | Change-Id: I577caf6ca4261b3d044b18bc8c5915012168031d
* | | | | | am 92b2d5a6: Merge "Pseudolocalizer improvements."Elliott Hughes2014-04-189-105/+336
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '92b2d5a608f9fefc9a88eea03cd599a26c1b62ce': Pseudolocalizer improvements.
| * | | | | Merge "Pseudolocalizer improvements."Elliott Hughes2014-04-189-105/+336
| |\ \ \ \ \
generated by cgit v1.1 at 2025-02-03 18:18:13 +0000