OSDN Git Service
Michael Wright [Wed, 30 Apr 2014 00:03:29 +0000 (00:03 +0000)]
am
8a02b20f: Merge "Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()"
* commit '
8a02b20f6f3fdd5baa5d22321769303ce76ba80a':
Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()
Michael Wright [Tue, 29 Apr 2014 23:58:16 +0000 (23:58 +0000)]
Merge "Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()"
Bill Yi [Tue, 29 Apr 2014 23:07:29 +0000 (16:07 -0700)]
Nick Kralevich [Tue, 29 Apr 2014 22:24:32 +0000 (22:24 +0000)]
am
af40649e: Merge "Set NO_NEW_PRIVS on zygote init"
* commit '
af40649e4ad506e312b53518cd2b9f2b58dee3ba':
Set NO_NEW_PRIVS on zygote init
Nick Kralevich [Tue, 29 Apr 2014 22:20:47 +0000 (22:20 +0000)]
Merge "Set NO_NEW_PRIVS on zygote init"
Nick Kralevich [Fri, 25 Apr 2014 22:01:24 +0000 (15:01 -0700)]
Set NO_NEW_PRIVS on zygote init
When app_process/zygote starts, make sure PR_SET_NO_NEW_PRIVS is set.
This prevents zygote spawned apps from acquiring new privileges
on exec.
In particular, this allows the CTS test
android.os.cts.SecurityFeaturesTest#testNoNewPrivs() to pass if ART is set
as the default runtime.
Change-Id: I81139cda999c7b1430242561aad28f566e9b6da0
Selim Gurun [Tue, 29 Apr 2014 18:45:53 +0000 (18:45 +0000)]
am
5c220cc4: (-s ours) Merge "DO NOT MERGE Add invokeFunctor stub"
* commit '
5c220cc4e4c0584a9083529b58e30e17ab7d2d9e':
DO NOT MERGE Add invokeFunctor stub
Selim Gurun [Tue, 29 Apr 2014 18:42:25 +0000 (18:42 +0000)]
Merge "DO NOT MERGE Add invokeFunctor stub"
Bo Liu [Tue, 29 Apr 2014 18:38:37 +0000 (11:38 -0700)]
DO NOT MERGE Add invokeFunctor stub
Change-Id: Ib7637d68c4f63065b909075a8f5d8cd1dd0674bd
Elliott Hughes [Tue, 29 Apr 2014 04:01:01 +0000 (04:01 +0000)]
am
10d57c4b: Merge "Fix two zygote imports."
* commit '
10d57c4bc7459d0c73b254af006a3528e9a0c33e':
Fix two zygote imports.
Elliott Hughes [Tue, 29 Apr 2014 03:56:19 +0000 (03:56 +0000)]
am
2e9d924d: Merge "Remove unused import."
* commit '
2e9d924d4f4275c72df4be28d85482064cee43f8':
Remove unused import.
Elliott Hughes [Tue, 29 Apr 2014 03:54:49 +0000 (03:54 +0000)]
Merge "Fix two zygote imports."
Elliott Hughes [Tue, 29 Apr 2014 03:53:52 +0000 (20:53 -0700)]
Fix two zygote imports.
Change-Id: I5eea2d9f48479c33e1594aaa259274e5e787a1df
Elliott Hughes [Tue, 29 Apr 2014 03:52:10 +0000 (03:52 +0000)]
Merge "Remove unused import."
Elliott Hughes [Tue, 29 Apr 2014 03:51:34 +0000 (20:51 -0700)]
Remove unused import.
Change-Id: I3f6a035cda55859a7a521f3117da72ee962beb63
Elliott Hughes [Tue, 29 Apr 2014 02:31:34 +0000 (02:31 +0000)]
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.
Elliott Hughes [Tue, 29 Apr 2014 02:28:06 +0000 (02:28 +0000)]
Merge "Move the Zygote off libcore.os and onto android.system."
Elliott Hughes [Tue, 29 Apr 2014 02:19:13 +0000 (19:19 -0700)]
Move the Zygote off libcore.os and onto android.system.
Change-Id: Iaa20e50b05fad355bdf15bcfdc58efc9941c400c
Elliott Hughes [Mon, 28 Apr 2014 19:45:06 +0000 (19:45 +0000)]
Elliott Hughes [Mon, 28 Apr 2014 19:41:24 +0000 (19:41 +0000)]
Merge "Fix build."
Elliott Hughes [Mon, 28 Apr 2014 19:40:12 +0000 (12:40 -0700)]
Fix build.
Change-Id: I0bd6e1aac19276bf664accd8d38f86d2cc7450cc
Elliott Hughes [Mon, 28 Apr 2014 18:17:06 +0000 (18:17 +0000)]
am
bbd87eb9: Merge "Track libcore.os\' move to android.system."
* commit '
bbd87eb9193e9730869171324ee4f5fc1abeae55':
Track libcore.os' move to android.system.
Elliott Hughes [Mon, 28 Apr 2014 18:13:59 +0000 (18:13 +0000)]
Merge "Track libcore.os' move to android.system."
Mathieu Chartier [Mon, 28 Apr 2014 18:13:07 +0000 (18:13 +0000)]
am
0cd623bb: Merge "Use Runtime.gc instead of System.gc for DDMS."
* commit '
0cd623bb9f832194cdd9c08625fa32583e947c76':
Use Runtime.gc instead of System.gc for DDMS.
Elliott Hughes [Mon, 28 Apr 2014 18:11:32 +0000 (11:11 -0700)]
Track libcore.os' move to android.system.
(This is partial, but should cover everything in AOSP master except
for the zygote.)
Change-Id: I1042c99245765746a744c44e714095cb2c6cb75d
Mathieu Chartier [Mon, 28 Apr 2014 18:10:41 +0000 (18:10 +0000)]
Merge "Use Runtime.gc instead of System.gc for DDMS."
Mathieu Chartier [Mon, 28 Apr 2014 17:16:17 +0000 (10:16 -0700)]
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
Wink Saville [Sat, 26 Apr 2014 00:20:02 +0000 (00:20 +0000)]
am
3f4867f4: Merge "Telephony: Add functionality to handle ICC IO error"
* commit '
3f4867f49d6c1932117e3519ce10d11f37829f19':
Telephony: Add functionality to handle ICC IO error
Wink Saville [Fri, 25 Apr 2014 23:58:11 +0000 (23:58 +0000)]
Merge "Telephony: Add functionality to handle ICC IO error"
Mark Salyzyn [Fri, 25 Apr 2014 22:03:20 +0000 (22:03 +0000)]
am
ac732708: Merge "EventLog: event log translation errors"
* commit '
ac7327082c411617f7937b87575c117bd63ad9df':
EventLog: event log translation errors
Mark Salyzyn [Fri, 25 Apr 2014 21:59:18 +0000 (21:59 +0000)]
Merge "EventLog: event log translation errors"
Mark Salyzyn [Fri, 25 Apr 2014 20:25:18 +0000 (13:25 -0700)]
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
Marco Nelissen [Fri, 25 Apr 2014 14:46:35 +0000 (14:46 +0000)]
am
adcf38c9: Merge "Release DrmManagerClient resources"
* commit '
adcf38c9936fa372309d413cec03a1413e797c7a':
Release DrmManagerClient resources
Marco Nelissen [Fri, 25 Apr 2014 14:42:02 +0000 (14:42 +0000)]
Merge "Release DrmManagerClient resources"
Selim Gurun [Fri, 25 Apr 2014 01:12:46 +0000 (01:12 +0000)]
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.
Selim Gurun [Fri, 25 Apr 2014 01:08:48 +0000 (01:08 +0000)]
Merge "Add a stub for forgotten callback to fix master-gpl."
Selim Gurun [Fri, 25 Apr 2014 01:04:04 +0000 (18:04 -0700)]
Add a stub for forgotten callback to fix master-gpl.
Change-Id: I375dba89403d09dc39f696de04e0811633ecc803
Selim Gurun [Fri, 25 Apr 2014 00:41:59 +0000 (00:41 +0000)]
am
adad989b: Merge "Add a stub to fix master-gpl"
* commit '
adad989b6a2c736f427526e747dcb89ed9762bab':
Add a stub to fix master-gpl
Selim Gurun [Fri, 25 Apr 2014 00:39:09 +0000 (00:39 +0000)]
Merge "Add a stub to fix master-gpl"
Selim Gurun [Fri, 25 Apr 2014 00:29:55 +0000 (17:29 -0700)]
Add a stub to fix master-gpl
Change-Id: I4cadd3a6e33843ccac4ef2eacbe508e40628367c
Elliott Hughes [Thu, 24 Apr 2014 23:55:09 +0000 (23:55 +0000)]
am
31a1dd2a: Merge "Use the suggested public API instead of libcore.os."
* commit '
31a1dd2a8f56b439861ee335b55f44323318830c':
Use the suggested public API instead of libcore.os.
Elliott Hughes [Thu, 24 Apr 2014 23:52:16 +0000 (23:52 +0000)]
Merge "Use the suggested public API instead of libcore.os."
Elliott Hughes [Thu, 24 Apr 2014 00:58:57 +0000 (17:58 -0700)]
Use the suggested public API instead of libcore.os.
Change-Id: Id392e4c36c5721ca609d88d9ec6b9340ce05274c
Mark Salyzyn [Thu, 24 Apr 2014 22:14:02 +0000 (22:14 +0000)]
am
c717179e: Merge "jni: android_util_Process 64 bit issues"
* commit '
c717179e4fec346334fe4bb8603184499b746179':
jni: android_util_Process 64 bit issues
Mark Salyzyn [Thu, 24 Apr 2014 22:10:22 +0000 (22:10 +0000)]
Merge "jni: android_util_Process 64 bit issues"
Mark Salyzyn [Thu, 24 Apr 2014 20:05:18 +0000 (13:05 -0700)]
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
Nick Kralevich [Thu, 24 Apr 2014 18:22:20 +0000 (18:22 +0000)]
am
84803849: Merge "Zygote: enable CAP_BLOCK_SUSPEND capability for system server"
* commit '
8480384986c314bd97b841cbf7f63acb7055ecef':
Zygote: enable CAP_BLOCK_SUSPEND capability for system server
Nick Kralevich [Thu, 24 Apr 2014 18:18:01 +0000 (18:18 +0000)]
Merge "Zygote: enable CAP_BLOCK_SUSPEND capability for system server"
Daniel Leung [Fri, 20 Dec 2013 18:37:35 +0000 (10:37 -0800)]
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>
Elliott Hughes [Thu, 24 Apr 2014 00:25:01 +0000 (00:25 +0000)]
am
dbb0de21: Merge "Fix a typo in an assertion."
* commit '
dbb0de21d35343504b096ae6cbf97d122ac410c9':
Fix a typo in an assertion.
Elliott Hughes [Wed, 23 Apr 2014 23:55:33 +0000 (23:55 +0000)]
Merge "Fix a typo in an assertion."
Elliott Hughes [Wed, 23 Apr 2014 23:54:33 +0000 (16:54 -0700)]
Fix a typo in an assertion.
Change-Id: I3e97bb3cb8070c0ec0c6b97769f1da3e7b4ef8f5
Neil Fuller [Wed, 23 Apr 2014 16:45:15 +0000 (16:45 +0000)]
am
683cf1bf: Merge "Changes to support asynchronous close interruption"
* commit '
683cf1bffe33f49f26d46201f96cd2eff60e8192':
Changes to support asynchronous close interruption
Neil Fuller [Wed, 23 Apr 2014 16:41:16 +0000 (16:41 +0000)]
Merge "Changes to support asynchronous close interruption"
Neil Fuller [Fri, 11 Apr 2014 16:29:54 +0000 (17:29 +0100)]
Changes to support asynchronous close interruption
This change contains fixes to base from libcore change
I37de3e7d1a005a73821221e6156d10b95c595d7a
Bug:
13927110
Change-Id: I2d96e50307611c269dcf47886cd4d976854da8fc
Deepanshu Gupta [Tue, 22 Apr 2014 23:10:40 +0000 (23:10 +0000)]
am
53b7df19: Merge "Add missing ICU_Delegate methods."
* commit '
53b7df19cf287ea48b2ce27ab9cd7ddbc3d04330':
Add missing ICU_Delegate methods.
Deepanshu Gupta [Tue, 22 Apr 2014 23:08:05 +0000 (23:08 +0000)]
Merge "Add missing ICU_Delegate methods."
Nick Kralevich [Tue, 22 Apr 2014 19:52:21 +0000 (19:52 +0000)]
am
d267c1a0: Merge "remove unneeded import statements."
* commit '
d267c1a06fc91dc300d5c5f8b7ef9bd44825c34e':
remove unneeded import statements.
Nick Kralevich [Tue, 22 Apr 2014 19:52:18 +0000 (19:52 +0000)]
am
a67d4a6e: Merge "remove unused import."
* commit '
a67d4a6e4da1eb02a15a1048a26329cfed312938':
remove unused import.
Nick Kralevich [Tue, 22 Apr 2014 19:24:47 +0000 (19:24 +0000)]
Merge "remove unneeded import statements."
Nick Kralevich [Tue, 22 Apr 2014 19:23:30 +0000 (19:23 +0000)]
Merge "remove unused import."
Nick Kralevich [Tue, 22 Apr 2014 19:17:51 +0000 (12:17 -0700)]
remove unneeded import statements.
Internal master is out of sync with AOSP. Resync.
Change-Id: Ia3105a4b6eb835f719471a26ae4cb33962c5b19e
Nick Kralevich [Tue, 22 Apr 2014 19:10:24 +0000 (12:10 -0700)]
remove unused import.
This change resynchronizes AOSP with internal master.
The import line is unused.
Change-Id: I98bef1f88dee758f5bdcec35fba204f793d4028e
Zach Swasey [Fri, 18 Apr 2014 00:49:35 +0000 (17:49 -0700)]
Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()
This fixes a bug where a View with filterTouchesWhenObscured will have
all touches filtered when in magnification accessibility mode. This is
due to magnification being a separate Window over top of the running
Activity. The method onFilterTouchEventForSecurity in View will then
always return false when filterTouchesWhenObscured is enabled on the
View. By adding the magnification Window to the list of Trusted Overlays
we can ensure that touches will work properly with this property enabled.
Change-Id: I07706588a625682d05da5cb19f401139eb08a54c
Deepanshu Gupta [Mon, 21 Apr 2014 21:33:33 +0000 (14:33 -0700)]
Add missing ICU_Delegate methods.
Update the ICU_Delegate to add methods originally added in
I5de58be7e8a701f2c40182ea54bceff85ec1aad2
Change-Id: I536834fe76cbc7dae05580182fee1bea956e3e77
Jesse Hall [Mon, 21 Apr 2014 19:41:29 +0000 (19:41 +0000)]
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.
Jesse Hall [Mon, 21 Apr 2014 19:38:45 +0000 (19:38 +0000)]
Merge "EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested."
Ying Wang [Mon, 21 Apr 2014 13:35:26 +0000 (13:35 +0000)]
am
2a52862d: Merge "Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs."
* commit '
2a52862db5257edcafa137276ce3d8dc54cd443e':
Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs.
Ying Wang [Sat, 19 Apr 2014 00:07:49 +0000 (00:07 +0000)]
Merge "Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs."
Ying Wang [Fri, 18 Apr 2014 01:14:50 +0000 (18:14 -0700)]
Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs.
Change-Id: Ibef01983891377b859d28cff801f48ef5d8eabb2
Elliott Hughes [Fri, 18 Apr 2014 23:20:21 +0000 (23:20 +0000)]
am
90840ec2: Merge "Fix warning introduced by recent psuedolocalizer change."
* commit '
90840ec29dec173f5fbc8197bcf1889bde5bd262':
Fix warning introduced by recent psuedolocalizer change.
Elliott Hughes [Fri, 18 Apr 2014 23:16:43 +0000 (23:16 +0000)]
Merge "Fix warning introduced by recent psuedolocalizer change."
Elliott Hughes [Fri, 18 Apr 2014 23:15:27 +0000 (16:15 -0700)]
Fix warning introduced by recent psuedolocalizer change.
Change-Id: I577caf6ca4261b3d044b18bc8c5915012168031d
Elliott Hughes [Fri, 18 Apr 2014 22:36:32 +0000 (22:36 +0000)]
am
92b2d5a6: Merge "Pseudolocalizer improvements."
* commit '
92b2d5a608f9fefc9a88eea03cd599a26c1b62ce':
Pseudolocalizer improvements.
Elliott Hughes [Fri, 18 Apr 2014 22:32:53 +0000 (22:32 +0000)]
Merge "Pseudolocalizer improvements."
Mark Salyzyn [Fri, 18 Apr 2014 15:02:48 +0000 (15:02 +0000)]
am
5a47a9f6: Merge "Native Runtime: Add LOG_ID_CRASH"
* commit '
5a47a9f62dd9bcb6573555b7a3ef4b1f5e485fc4':
Native Runtime: Add LOG_ID_CRASH
Mark Salyzyn [Fri, 18 Apr 2014 14:55:31 +0000 (14:55 +0000)]
Merge "Native Runtime: Add LOG_ID_CRASH"
Mark Salyzyn [Fri, 18 Apr 2014 00:43:36 +0000 (00:43 +0000)]
am
da93c60d: Merge "jni: binder ptrdiff_t compile issues"
* commit '
da93c60d8a5b79f90d44408d992fb532eaaf8fa7':
jni: binder ptrdiff_t compile issues
Mark Salyzyn [Fri, 18 Apr 2014 00:40:01 +0000 (00:40 +0000)]
Merge "jni: binder ptrdiff_t compile issues"
Mark Salyzyn [Fri, 18 Apr 2014 00:25:36 +0000 (17:25 -0700)]
jni: binder ptrdiff_t compile issues
Change-Id: Ibdd82479d3f9fb53cf1d6793c4f7353e8f1c3646
Mark Salyzyn [Thu, 17 Apr 2014 22:57:25 +0000 (22:57 +0000)]
am
73258630: Merge "jni: binder 64-bit compile issues"
* commit '
7325863013e5c34d493e4e92ecadf4fea87554e7':
jni: binder 64-bit compile issues
Mark Salyzyn [Thu, 17 Apr 2014 22:52:58 +0000 (22:52 +0000)]
Merge "jni: binder 64-bit compile issues"
Mark Salyzyn [Thu, 17 Apr 2014 22:40:01 +0000 (15:40 -0700)]
jni: binder 64-bit compile issues
Change-Id: I8a3083e7e9389bbb84c2dd061fef059e0595800d
Stephen Hines [Thu, 17 Apr 2014 18:20:47 +0000 (18:20 +0000)]
am
a4898534: Merge "Fix improper use of JNI_ABORT for operations where Java objects are written."
* commit '
a48985349cb26757b6c4be18acc496ab6d1110e5':
Fix improper use of JNI_ABORT for operations where Java objects are written.
Stephen Hines [Thu, 17 Apr 2014 18:15:37 +0000 (18:15 +0000)]
Merge "Fix improper use of JNI_ABORT for operations where Java objects are written."
Jason Sams [Thu, 17 Apr 2014 17:02:10 +0000 (17:02 +0000)]
am
112d1b94: Merge "Add BiCubic resize instrinsic"
* commit '
112d1b94ee8456dba16842e6b964eb35aef95818':
Add BiCubic resize instrinsic
Stephen Hines [Thu, 17 Apr 2014 08:02:42 +0000 (01:02 -0700)]
Fix improper use of JNI_ABORT for operations where Java objects are written.
In these RS API calls, it is possible (and very likely) that some Java objects
are written to via JNI calls into the RS driver. These writes can end up being
discarded if we specify JNI_ABORT, particularly if the Java object has been
moved due to GC. The change introduces a readonly mode for some macro calls
and updates other JNI callers to appropriately skip JNI_ABORT.
Change-Id: I8c5f2ae959b3fbc9008c9d2ac4542f2ebab29b06
Jason Sams [Thu, 17 Apr 2014 01:22:18 +0000 (01:22 +0000)]
Merge "Add BiCubic resize instrinsic"
Jason Sams [Thu, 17 Apr 2014 00:13:09 +0000 (17:13 -0700)]
Add BiCubic resize instrinsic
Change-Id: Iafec3f4260bb5d3a3133b034e42dfb0a94ae9f81
Mark Salyzyn [Wed, 16 Apr 2014 19:42:11 +0000 (19:42 +0000)]
am
5788722d: Merge "frameworks: 64 bit compile issues"
* commit '
5788722df7b73f1eff3edb95f2ead83d19603926':
frameworks: 64 bit compile issues
Mark Salyzyn [Wed, 16 Apr 2014 19:21:44 +0000 (19:21 +0000)]
Merge "frameworks: 64 bit compile issues"
Mark Salyzyn [Wed, 16 Apr 2014 17:28:37 +0000 (10:28 -0700)]
frameworks: 64 bit compile issues
ToDo: core/jni/com_android_internal_net_NetworkStatsFactory.cpp (merge issues)
Change-Id: I5cf0bbb868e6c18e86c97c6491b6ee983a8ee1a2
Mark Salyzyn [Wed, 9 Apr 2014 14:39:15 +0000 (07:39 -0700)]
Native Runtime: Add LOG_ID_CRASH
Change-Id: I4e3a82636901c5169cc6b714a4fec815cd757c58
Dmitriy Ivanov [Tue, 15 Apr 2014 19:23:20 +0000 (19:23 +0000)]
am
0d54e471: Merge "Remove code markers"
* commit '
0d54e471fa90c2759e86dc47c642f7af277a50f0':
Remove code markers
Dmitriy Ivanov [Tue, 15 Apr 2014 19:19:53 +0000 (19:19 +0000)]
Merge "Remove code markers"
Dmitriy Ivanov [Tue, 15 Apr 2014 15:30:57 +0000 (08:30 -0700)]
Remove code markers
Change-Id: I2defbdeddca39685194751022e6dcb5f1a48a0e9
Mattias Nilsson [Wed, 26 Mar 2014 12:38:34 +0000 (13:38 +0100)]
Release DrmManagerClient resources
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
Jin Zhebin [Tue, 21 Jan 2014 07:27:20 +0000 (15:27 +0800)]
EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested.
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>
Narayan Kamath [Mon, 14 Apr 2014 08:41:42 +0000 (08:41 +0000)]
am
aa19a2f6: Merge "Don\'t compare String8s to NULL."
* commit '
aa19a2f69c33fdb6499d0bc1cfafced9f572da5b':
Don't compare String8s to NULL.
Narayan Kamath [Mon, 14 Apr 2014 08:18:24 +0000 (08:18 +0000)]
Merge "Don't compare String8s to NULL."