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

118382 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jesse Hall
fc3c6a0ef3 Merge "EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested." 2014-04-21 19:38:45 +00:00
Ying Wang
9df9ad7e29 am 2a52862d: Merge "Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs." 
* commit '2a52862db5257edcafa137276ce3d8dc54cd443e':
  Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs.
 2014-04-21 13:35:26 +00:00
Ying Wang
2a52862db5 Merge "Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs." 2014-04-19 00:07:49 +00:00
Ying Wang
38250d9b84 Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs. 
Change-Id: Ibef01983891377b859d28cff801f48ef5d8eabb2
 2014-04-18 16:39:47 -07:00
Elliott Hughes
cf4d85e478 am 90840ec2: Merge "Fix warning introduced by recent psuedolocalizer change." 
* commit '90840ec29dec173f5fbc8197bcf1889bde5bd262':
  Fix warning introduced by recent psuedolocalizer change.
 2014-04-18 23:20:21 +00:00
Elliott Hughes
90840ec29d Merge "Fix warning introduced by recent psuedolocalizer change." 2014-04-18 23:16:44 +00:00
Elliott Hughes
0a1eed394f Fix warning introduced by recent psuedolocalizer change. 
Change-Id: I577caf6ca4261b3d044b18bc8c5915012168031d
 2014-04-18 16:15:27 -07:00
Elliott Hughes
ec42199a71 am 92b2d5a6: Merge "Pseudolocalizer improvements." 
* commit '92b2d5a608f9fefc9a88eea03cd599a26c1b62ce':
  Pseudolocalizer improvements.
 2014-04-18 22:36:32 +00:00
Elliott Hughes
92b2d5a608 Merge "Pseudolocalizer improvements." 2014-04-18 22:32:53 +00:00
Mark Salyzyn
649da9b505 am 5a47a9f6: Merge "Native Runtime: Add LOG_ID_CRASH" 
* commit '5a47a9f62dd9bcb6573555b7a3ef4b1f5e485fc4':
  Native Runtime: Add LOG_ID_CRASH
 2014-04-18 15:02:48 +00:00
Mark Salyzyn
5a47a9f62d Merge "Native Runtime: Add LOG_ID_CRASH" 2014-04-18 14:55:32 +00:00
Mark Salyzyn
7423510c5a am da93c60d: Merge "jni: binder ptrdiff_t compile issues" 
* commit 'da93c60d8a5b79f90d44408d992fb532eaaf8fa7':
  jni: binder ptrdiff_t compile issues
 2014-04-18 00:43:36 +00:00
Mark Salyzyn
da93c60d8a Merge "jni: binder ptrdiff_t compile issues" 2014-04-18 00:40:01 +00:00
Mark Salyzyn
5b6da1aee8 jni: binder ptrdiff_t compile issues 
Change-Id: Ibdd82479d3f9fb53cf1d6793c4f7353e8f1c3646
 2014-04-17 17:25:36 -07:00
Mark Salyzyn
4037847c02 am 73258630: Merge "jni: binder 64-bit compile issues" 
* commit '7325863013e5c34d493e4e92ecadf4fea87554e7':
  jni: binder 64-bit compile issues
 2014-04-17 22:57:25 +00:00
Mark Salyzyn
7325863013 Merge "jni: binder 64-bit compile issues" 2014-04-17 22:52:58 +00:00
Mark Salyzyn
cfd91e7852 jni: binder 64-bit compile issues 
Change-Id: I8a3083e7e9389bbb84c2dd061fef059e0595800d
 2014-04-17 15:40:01 -07:00
Stephen Hines
f0aa4cc0f2 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.
 2014-04-17 18:20:47 +00:00
Stephen Hines
a48985349c Merge "Fix improper use of JNI_ABORT for operations where Java objects are written." 2014-04-17 18:15:38 +00:00
Jason Sams
a4af5726c4 am 112d1b94: Merge "Add BiCubic resize instrinsic" 
* commit '112d1b94ee8456dba16842e6b964eb35aef95818':
  Add BiCubic resize instrinsic
 2014-04-17 17:02:10 +00:00
Stephen Hines
414fa2c93a 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
 2014-04-17 01:02:42 -07:00
Jason Sams
112d1b94ee Merge "Add BiCubic resize instrinsic" 2014-04-17 01:22:19 +00:00
Jason Sams
464af41b28 Add BiCubic resize instrinsic 
Change-Id: Iafec3f4260bb5d3a3133b034e42dfb0a94ae9f81
 2014-04-16 17:13:09 -07:00
Mark Salyzyn
936e87e12d am 5788722d: Merge "frameworks: 64 bit compile issues" 
* commit '5788722df7b73f1eff3edb95f2ead83d19603926':
  frameworks: 64 bit compile issues
 2014-04-16 19:42:11 +00:00
Mark Salyzyn
5788722df7 Merge "frameworks: 64 bit compile issues" 2014-04-16 19:21:44 +00:00
Mark Salyzyn
853940331f frameworks: 64 bit compile issues 
ToDo: core/jni/com_android_internal_net_NetworkStatsFactory.cpp (merge issues)

Change-Id: I5cf0bbb868e6c18e86c97c6491b6ee983a8ee1a2
 2014-04-16 10:43:48 -07:00
Mark Salyzyn
69eb6f57e3 Native Runtime: Add LOG_ID_CRASH 
Change-Id: I4e3a82636901c5169cc6b714a4fec815cd757c58
 2014-04-15 15:22:23 -07:00
Dmitriy Ivanov
6ced3b34f0 am 0d54e471: Merge "Remove code markers" 
* commit '0d54e471fa90c2759e86dc47c642f7af277a50f0':
  Remove code markers
 2014-04-15 19:23:20 +00:00
Dmitriy Ivanov
0d54e471fa Merge "Remove code markers" 2014-04-15 19:19:53 +00:00
Dmitriy Ivanov
b8fdf8421e Remove code markers 
Change-Id: I2defbdeddca39685194751022e6dcb5f1a48a0e9
 2014-04-15 12:11:39 -07:00
Jin Zhebin
28a5c59357 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>
 2014-04-15 05:11:58 +08:00
Narayan Kamath
549ae32724 am aa19a2f6: Merge "Don\'t compare String8s to NULL." 
* commit 'aa19a2f69c33fdb6499d0bc1cfafced9f572da5b':
  Don't compare String8s to NULL.
 2014-04-14 08:41:42 +00:00
Narayan Kamath
aa19a2f69c Merge "Don't compare String8s to NULL." 2014-04-14 08:18:25 +00:00
Narayan Kamath
90c75cf02e Don't compare String8s to NULL. 
Use String8::isEmpty instead. Note that this code path is hit
only if the zygote calls ::exit, and that never happens unless
the VM invocation fails.

Change-Id: I0e7d3a86a79b12b2174ca3bf0dbe1904e33c041a
 2014-04-12 12:25:50 +01:00
Narayan Kamath
97953b308f am 4f4892d0: Merge "Workaround 64 bit devices that don\'t have zygotes yet." 
* commit '4f4892d00aab13975a8aed000f84ae0320355fd7':
  Workaround 64 bit devices that don't have zygotes yet.
 2014-04-11 18:33:00 +00:00
Narayan Kamath
4f4892d00a Merge "Workaround 64 bit devices that don't have zygotes yet." 2014-04-11 18:29:55 +00:00
Narayan Kamath
2d84a406bf Workaround 64 bit devices that don't have zygotes yet. 
This can be fixed by tweaking their BoardConfig as well,
but that leads to all sorts of other problems.

For now, fall back to the primary zygote if the secondary
is unavailable. This will fail if shared libraries for the
primary zygote ABI are unavailable, but that won't be the
case just yet.

bug: 13970103
Change-Id: Ifa107e43ca95023d57a0d9c641e4fddaccd9a888
 2014-04-11 19:24:53 +01:00
Elliott Hughes
70bba904fc am b093e485: Merge "generateProjectThumbnail can fail to close output stream" 
* commit 'b093e485bbd790cc4d9678451c8cce4d361c2cf2':
  generateProjectThumbnail can fail to close output stream
 2014-04-11 17:41:44 +00:00
Elliott Hughes
b093e485bb Merge "generateProjectThumbnail can fail to close output stream" 2014-04-11 17:37:54 +00:00
Elliott Hughes
1ea1857de9 am 8cd319b8: Merge "Add additional languages to be accepted by the NumberPicker input filter" 
* commit '8cd319b84635454746803b0eed7e2626d7945a09':
  Add additional languages to be accepted by the NumberPicker input filter
 2014-04-11 17:33:15 +00:00