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

4382 Commits

Author SHA1 Message Date
Adam Lesinski
625fa573b4 am 9438ad15: am e580d661: am e89a2865: Merge changes If2c7e09f,Ie21f227c 
* commit '9438ad1599716176fb6c593e77a2e93b265bbcb5':
  RRO idmap: pad with 0xffffffff, not 0x00000000
  RRO: reintroduce lost ResTable insert of assets
 2014-12-03 00:30:56 +00:00
Adam Lesinski
9438ad1599 am e580d661: am e89a2865: Merge changes If2c7e09f,Ie21f227c 
* commit 'e580d6617f67a1db5eff7ffe5450684cfc7e1a2b':
  RRO idmap: pad with 0xffffffff, not 0x00000000
  RRO: reintroduce lost ResTable insert of assets
 2014-12-02 23:07:43 +00:00
Adam Lesinski
e89a286541 Merge changes If2c7e09f,Ie21f227c 
* changes:
  RRO idmap: pad with 0xffffffff, not 0x00000000
  RRO: reintroduce lost ResTable insert of assets
 2014-12-02 22:52:37 +00:00
Jesse Hall
c46ac588e3 am 954b325b: am 9dec9e9d: am 1ee37776: Merge "Avoid overwriting EGL14.EGL_NO_SURFACE" 
* commit '954b325bc3e30a08f41117d85aea4b7f802401f4':
  Avoid overwriting EGL14.EGL_NO_SURFACE
 2014-12-02 01:25:27 +00:00
Jesse Hall
954b325bc3 am 9dec9e9d: am 1ee37776: Merge "Avoid overwriting EGL14.EGL_NO_SURFACE" 
* commit '9dec9e9d65c9f70b7a45fb3ad8f3f752b7b35fdf':
  Avoid overwriting EGL14.EGL_NO_SURFACE
 2014-12-02 00:48:33 +00:00
Jesse Hall
1ee377764a Merge "Avoid overwriting EGL14.EGL_NO_SURFACE" 2014-12-02 00:35:12 +00:00
Eric Laurent
539d57aaf0 am 41b2381d: am 981951e4: am 563e61f5: Merge "AudioRecord JNI: pass attributes to native AudioRecord." into lmp-mr1-dev 
* commit '41b2381db7225f7ff11c523662de6cfb47fc7c85':
  AudioRecord JNI: pass attributes to native AudioRecord.
 2014-11-27 00:08:51 +00:00
Eric Laurent
41b2381db7 am 981951e4: am 563e61f5: Merge "AudioRecord JNI: pass attributes to native AudioRecord." into lmp-mr1-dev 
* commit '981951e4f9bae85dcf6f717023596c08dc245ee7':
  AudioRecord JNI: pass attributes to native AudioRecord.
 2014-11-27 00:01:23 +00:00
Eric Laurent
4c3fc59b4d AudioRecord JNI: pass attributes to native AudioRecord. 
Bug: 16006090.
Change-Id: Ic6448dda0de65dada3a195cfc2ec73698b04b7b2
 2014-11-26 09:46:44 -08:00
Elliott Hughes
1f7b3b5c7d am 1fae0991: am f67cc149: am 2657717f: Merge "We have POSIX clocks." 
* commit '1fae0991326fbaac8a11ae972f0da2bbc50be429':
  We have POSIX clocks.
 2014-11-25 23:35:47 +00:00
Elliott Hughes
1fae099132 am f67cc149: am 2657717f: Merge "We have POSIX clocks." 
* commit 'f67cc149982cefdcf9f8697c9966c710f6512d23':
  We have POSIX clocks.
 2014-11-25 23:29:14 +00:00
Elliott Hughes
42c569224a We have POSIX clocks. 
Change-Id: I70f82074f8c14a26c4ed7eb912ddf6d7da44c168
 2014-11-25 15:11:59 -08:00
chh
1d5f99b973 am d7572b84: am 3ec380d3: am fc545733: Merge "Remove unused variables and functions, don\'t warn about unused parameters" 
* commit 'd7572b84efdb694618fca550a3fb5ccc4a7ccd5f':
  Remove unused variables and functions, don't warn about unused parameters
 2014-11-25 19:57:42 +00:00
chh
d7572b84ef am 3ec380d3: am fc545733: Merge "Remove unused variables and functions, don\'t warn about unused parameters" 
* commit '3ec380d365cbe5fac23ff19897512cf492a7a8a4':
  Remove unused variables and functions, don't warn about unused parameters
 2014-11-25 19:04:05 +00:00
Bo Liu
2b5edf651a am 88309159: am 38134303: am 84be180e: Merge "Fix crash in getNativeCanvas when canvasHandle is NULL" into lmp-mr1-dev 
* commit '88309159a53ceb4f34fe01056521e4b84e848ef7':
  Fix crash in getNativeCanvas when canvasHandle is NULL
 2014-11-25 18:51:37 +00:00
Bo Liu
88309159a5 am 38134303: am 84be180e: Merge "Fix crash in getNativeCanvas when canvasHandle is NULL" into lmp-mr1-dev 
* commit '3813430367591efcf925b2baebc50a99a7666644':
  Fix crash in getNativeCanvas when canvasHandle is NULL
 2014-11-25 18:46:04 +00:00
Sangkyu Lee
c56c7013e3 Avoid overwriting EGL14.EGL_NO_SURFACE 
(This is an update after the generator update.)

Both EGL14 and EGLExt have the same initialization codes for
EGL14.EGL_NO_SURFACE, EGL14.EGL_NO_CONTEXT and EGL14.EGL_NO_DISPLAY.
Since EGLExt is initialized later, they are overwritten by EGLExt's
initialization codes.
Therefore, EGL_NO_SURFACE returned by methods in EGL14 is not
actually EGL14.EGL_NO_SURFACE object and it makes several problems in
handling error cases.
For instance, "Let's fish" game application cannot be run on L.

To solve the problem, this patch makes EGL14.EGL_NO_SURFACE,
EGL14.EGL_NO_CONTEXT and EGL14.EGL_NO_DISPLAY initialized just once.

Change-Id: Icce878164ff0b715ad2b5a2cd038a9616c7cf1e9
 2014-11-25 10:45:19 +09:00
Bo Liu
de92f4c72b Fix crash in getNativeCanvas when canvasHandle is NULL 
BUG: 18261928
Change-Id: I01a5af201fe829d5752433e1bb0db7edc01733d4
 2014-11-24 11:25:45 -08:00
Bernhard Rosenkränzer
4048a4bcb1 Remove unused variables and functions, don't warn about unused parameters 
Remove unused variables and static functions clang complains about,
disable warnings about unused parameters (needed for clang and for gcc
with -Wextra enabled)

Change-Id: I76a22cd0158b3c7375c54e3d4d15bc1ac448591e
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
 2014-11-23 22:24:32 +01:00
Chih-hung Hsieh
3643f92882 am 29d1b12d: am 05f7c39e: am fc4a7538: Merge "Revert "Frameworks/base: Mask Skia warning in GraphicsJNI"" 
* commit '29d1b12ddae8950ee7d2a8f31a040340185a331e':
  Revert "Frameworks/base: Mask Skia warning in GraphicsJNI"
 2014-11-22 01:23:53 +00:00
John Reck
82cb15199a am cbee971a: resolved conflicts for merge of 08372601 to lmp-mr1-dev-plus-aosp 
* commit 'cbee971a105adcf071b89838818f31b37388e9b9':
  It's super critical to call nStart
 2014-11-22 01:14:12 +00:00
Ian Rogers
fa1ae7dbb8 Merge branch 'lmp-mr1-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-dev-plus-aosp 2014-11-22 01:09:59 +00:00
Chih-hung Hsieh
29d1b12dda am 05f7c39e: am fc4a7538: Merge "Revert "Frameworks/base: Mask Skia warning in GraphicsJNI"" 
* commit '05f7c39eb45854f8d2a8a2aabb9ad9a4f9b867c1':
  Revert "Frameworks/base: Mask Skia warning in GraphicsJNI"
 2014-11-22 01:08:42 +00:00
John Reck
cbee971a10 resolved conflicts for merge of 08372601 to lmp-mr1-dev-plus-aosp 
Change-Id: I86b78ada4f30c23ae1232ac5a509986d5b8dc546
 2014-11-21 17:07:17 -08:00
Chih-hung Hsieh
fc4a7538a6 Merge "Revert "Frameworks/base: Mask Skia warning in GraphicsJNI"" 2014-11-22 00:24:39 +00:00
John Reck
418c8549dc Merge "It's super critical to call nStart" into lmp-mr1-dev 2014-11-21 23:32:08 +00:00
John Reck
72d6e4facb It's super critical to call nStart 
Bug: 18204974

Even if we are canceling or ending an animation
nStart() *must* be called, otherwise the native-side listener
is not attached (lazy-attached for JNI cyclic reference reasons),
and then Animator::callOnFinishedListener() no-ops as there's
no listener set

Add a lifecycle verifier to ensure that nStart is always
called on animators that are attached and get finished

Change-Id: Ibc345b5be97b6d3f95a11c361ebe020d030fd3b6
 2014-11-21 14:27:21 -08:00
Chris Craik
90102e1009 am 1ae8a98e: am 29dc496a: Merge "Revert "Add a way to override Xfermode DO NOT MERGE"" into lmp-mr1-dev 
* commit '1ae8a98e8a6ba82396955c0b6ab0e02568a3494b':
  Revert "Add a way to override Xfermode DO NOT MERGE"
 2014-11-21 22:21:02 +00:00
Chris Craik
6bcf223bf6 Merge "Revert "Add a way to override Xfermode"" 2014-11-21 22:11:14 +00:00
Chris Craik
29dc496a42 Merge "Revert "Add a way to override Xfermode DO NOT MERGE"" into lmp-mr1-dev 2014-11-21 22:11:13 +00:00
Chris Craik
da3198a550 Revert "Add a way to override Xfermode" 
Feature no longer needed.

bug:18448377

This reverts commit c495e611b9fa1fc6b47a647c714bbbf94dd63461.

Change-Id: Ia3e37f06953ffd81ca3fac367ee790d26b1b5d29
 2014-11-21 22:05:46 +00:00
Chris Craik
69e65019b0 Revert "Add a way to override Xfermode DO NOT MERGE" 
Feature no longer needed.

bug:18448377

This reverts commit 4678dcc5524258908eadc5fe1e5e1874768967eb.

Change-Id: Ib0a19946e966a54857165555827b5fa7b34b6bea
 2014-11-21 22:05:33 +00:00
Andreas Gampe
158b6c9850 resolve merge conflicts of 7d13d9d to master. 
Change-Id: I4d8a7ec4a25471565859050939ec05b0c1261627
 2014-11-21 14:05:11 -08:00
Chih-hung Hsieh
9ebffb40d8 Revert "Frameworks/base: Mask Skia warning in GraphicsJNI" 
Should be unnecessary after c/115476.
This reverts commit ba823cee8bafff98640408a777fe105a72fcea0d.

Change-Id: I3ef4d3e04805e450038d469d9672dc064f729b0f
 2014-11-21 18:54:15 +00:00
Andreas Gampe
7d13d9db1e resolved conflicts for merge of 3fc5e3ca to lmp-mr1-dev-plus-aosp 
Change-Id: Id8286e5a4381315a6060251a8055b0f1d1a96019
 2014-11-21 10:36:14 -08:00
Andreas Gampe
f17c1d7db1 am 0da1cbaa: am e042791e: Merge "Frameworks/base: Remove unused header" 
automerge: 55dbf00

* commit '55dbf00fd8f3931c41b580c7a6b78bf6c2a64de3':
  Frameworks/base: Remove unused header
 2014-11-21 18:21:41 +00:00
Andreas Gampe
2c596a5334 Merge "Frameworks/base: Consistency in core/jni" 2014-11-21 18:18:36 +00:00
Andreas Gampe
ed6b9dff56 Frameworks/base: Consistency in core/jni 
Make consistent use of core_jni_helpers for registration.

Translate some #ifdefs into const bools.

Change-Id: I37639aa053dd50f003a552cbd8550dddecc811c5
 2014-11-21 10:15:08 -08:00
Andreas Gampe
55dbf00fd8 am 0da1cbaa: am e042791e: Merge "Frameworks/base: Remove unused header" 
* commit '0da1cbaaabbe85e140dabf3fa2b289431c9d3910':
  Frameworks/base: Remove unused header
 2014-11-21 17:47:57 +00:00
Andreas Gampe
e042791e75 Merge "Frameworks/base: Remove unused header" 2014-11-21 17:38:07 +00:00
Andreas Gampe
c1b5483a60 Frameworks/base: Remove unused header 
android_nfc.h is used nowhere.

Change-Id: I3009b3eb122674d3fe7ddb201bac18368b78bc02
 2014-11-20 16:11:57 -08:00
Dan Albert
4bac6e11ae am 3a091b79: resolved conflicts for merge of 8e0cfe7c to lmp-mr1-dev-plus-aosp 
* commit '3a091b79978caa9b5d58ae19f693279e5a717c2a':
  Fix clang warnings in core/jni.
 2014-11-20 23:47:07 +00:00
Dan Albert
3a091b7997 resolved conflicts for merge of 8e0cfe7c to lmp-mr1-dev-plus-aosp 
Change-Id: I068d2a0fb118d4e2b4c1e546bebfcbc2cb120d36
 2014-11-20 15:41:25 -08:00
Dan Albert
47249598cb am 582bdf9a: am d8c169fe: am 0c437fd3: Merge "Add appropriate casts for char16_t." 
* commit '582bdf9a5961a32de27556832e23e0611c4d1cbb':
  Add appropriate casts for char16_t.
 2014-11-20 23:19:06 +00:00
Dan Albert
582bdf9a59 am d8c169fe: am 0c437fd3: Merge "Add appropriate casts for char16_t." 
* commit 'd8c169fedf883491e46b354484909694fd52cfaf':
  Add appropriate casts for char16_t.
 2014-11-20 23:00:56 +00:00
Dan Albert
8e357bf541 Merge "Fix clang warnings in core/jni." 2014-11-20 22:58:47 +00:00
Eric Laurent
9f7fbcc3a5 am 112437d9: am a582bd4b: Merge "AudioSystem JNI: fix AudioPortConfig mask usage" into lmp-mr1-dev automerge: 4624080 
* commit '112437d9d65722ecdf83238a8736543e5dfe484d':
  AudioSystem JNI: fix AudioPortConfig mask usage
 2014-11-20 21:19:22 +00:00
Eric Laurent
112437d9d6 am a582bd4b: Merge "AudioSystem JNI: fix AudioPortConfig mask usage" into lmp-mr1-dev 
automerge: 4624080

* commit '46240800f19b11bb3635a1d8c00a5c7584c0e556':
  AudioSystem JNI: fix AudioPortConfig mask usage
 2014-11-20 21:11:58 +00:00
Dan Albert
6698749dd4 Add appropriate casts for char16_t. 
C++11 defines a real char16_t, which is not implicitly convertible to
uint16_t (and by extension jchar). Add casts as needed.

Bug: 18300613
Change-Id: I00752002ef2e938bdb57f70947e8fd53ec103293
 2014-11-20 11:47:40 -08:00
Dan Albert
46d8444631 Fix clang warnings in core/jni. 
There are a few bugs in here too (mostly people expecting + to
concatenate C strings) :(

Change-Id: I0a243c05c4ea8b56e84896f37814d0fbea4c39d5
 2014-11-20 11:47:00 -08:00