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

6706 Commits

Author SHA1 Message Date
Dan Willemsen
83533a235c am 13786e28: am 60dd5d59: Merge "Remove USE_MINGW, whitelist windows modules" 
* commit '13786e281e4d67b9e2ff549fee34ddb3e82e0325':
  Remove USE_MINGW, whitelist windows modules
 2015-09-01 16:51:05 +00:00
Dan Willemsen
13786e281e am 60dd5d59: Merge "Remove USE_MINGW, whitelist windows modules" 
* commit '60dd5d5966ebe993f5a81c46d9dea62c207abfd3':
  Remove USE_MINGW, whitelist windows modules
 2015-09-01 16:37:10 +00:00
Dan Willemsen
4aa679ff96 Remove USE_MINGW, whitelist windows modules 
Bug: 23566667
Change-Id: Ie6b8c51e2b6d6273f99f4e361c440136d7c6915c
 2015-08-28 15:28:26 -07:00
Chris Craik
7da9d7fae6 am 9c45aa8f: am ca3c865d: am 892768fb: am 0b804542: Merge "Constrain drawBitmap matrix-to-rect optimization" into mnc-dev 
* commit '9c45aa8f0db8e3c5370172018e162b7ecaf9ea4a':
  Constrain drawBitmap matrix-to-rect optimization
 2015-08-19 01:43:41 +00:00
Chris Craik
fc7f6197cb am 0b804542: Merge "Constrain drawBitmap matrix-to-rect optimization" into mnc-dev 
* commit '0b8045425ff58f992046ff2be35bc91001dabf7b':
  Constrain drawBitmap matrix-to-rect optimization
 2015-08-19 01:41:25 +00:00
Chris Craik
892768fb3e am 0b804542: Merge "Constrain drawBitmap matrix-to-rect optimization" into mnc-dev 
* commit '0b8045425ff58f992046ff2be35bc91001dabf7b':
  Constrain drawBitmap matrix-to-rect optimization
 2015-08-19 00:54:00 +00:00
Chris Craik
e688bf7203 Constrain drawBitmap matrix-to-rect optimization 
bug:22962165

Optimization is not valid if matrix would flip image.

Change-Id: Ieee42390517bd3466b7d94596f0fbbe192ab757e
 2015-08-18 14:53:47 -07:00
Chris Craik
e3f0a881c2 Merge "Make the value for shadowRadius less than 1.0 work" 2015-08-14 22:02:19 +00:00
Dan Albert
598319d017 am 16e5aba9: am 4a2a890b: Merge "Fix mismatched new[]/delete." 
* commit '16e5aba9c8157b3ffdcdceda378896a43f074748':
  Fix mismatched new[]/delete.
 2015-08-14 21:43:19 +00:00
Dan Albert
f13f1efab2 am 16e5aba9: am 4a2a890b: Merge "Fix mismatched new[]/delete." 
* commit '16e5aba9c8157b3ffdcdceda378896a43f074748':
  Fix mismatched new[]/delete.
 2015-08-14 21:43:16 +00:00
Dan Albert
8dc8313c3e Fix mismatched new[]/delete. 
The new clang will emit a warning for this.

Change-Id: Ie0edc46461eb5edb2a7ad33a3a7f6cef2d825c36
 2015-08-14 14:12:29 -07:00
Andreas Gampe
ea30eb29f8 Hwui: Remove unused variables 
For build-system CFLAGS clean-up, remove unused variables.

Bug: 18632512

(cherry picked from commit cb4af9b10ab17187288d8f5ccb4cc1e465be9a51)

Change-Id: Ic58bedc84234325512193991fc64315e3aad6f9e
 2015-08-12 18:05:35 -07:00
Andreas Gampe
3255e2f961 Merge "Hwui: Remove unused variables" into mnc-dev-plus-aosp 2015-08-12 23:31:25 +00:00
Andreas Gampe
fea85a33b7 Hwui: Remove unused variables 
For build-system CFLAGS clean-up, remove unused variables.

Bug: 18632512

(cherry picked from commit cb4af9b10ab17187288d8f5ccb4cc1e465be9a51)

Change-Id: Ic58bedc84234325512193991fc64315e3aad6f9e
 2015-08-12 16:30:32 -07:00
Elliott Hughes
344d347af2 am 39669d7f: am 6fdc6333: Merge "Lose HAVE_ANDROID_OS from frameworks/base." 
* commit '39669d7f6b8fedef3468ab3d417c93a21df528af':
  Lose HAVE_ANDROID_OS from frameworks/base.
 2015-08-12 23:28:30 +00:00
Elliott Hughes
17b4be07fe am 39669d7f: am 6fdc6333: Merge "Lose HAVE_ANDROID_OS from frameworks/base." 
* commit '39669d7f6b8fedef3468ab3d417c93a21df528af':
  Lose HAVE_ANDROID_OS from frameworks/base.
 2015-08-12 23:21:56 +00:00
Elliott Hughes
ba3fe56edc Lose HAVE_ANDROID_OS from frameworks/base. 
Change-Id: I713881fdbaec7cbbb5e7f2f4be6f9b8be3d2ca4e
 2015-08-12 14:49:53 -07:00
Yusuke Sato
3a4d02220f am 61234dea: am bd4c482b: Merge "Clean up AssetManager::scanAndMergeZipLocked" 
* commit '61234deafe78ded05569edfab24536cdb4bd7720':
  Clean up AssetManager::scanAndMergeZipLocked
 2015-08-06 01:40:24 +00:00
Yusuke Sato
e15a5871bd am 61234dea: am bd4c482b: Merge "Clean up AssetManager::scanAndMergeZipLocked" 
* commit '61234deafe78ded05569edfab24536cdb4bd7720':
  Clean up AssetManager::scanAndMergeZipLocked
 2015-08-06 01:39:44 +00:00
Yusuke Sato
bd4c482be9 Merge "Clean up AssetManager::scanAndMergeZipLocked" 2015-08-05 22:15:50 +00:00
Yusuke Sato
c1efd41f3f Fix build breakage caused by I5ebe0438019958d883a7fda6bd92ea4484211d23 (AOSP) 
Change-Id: Icea0ac00c56b5c8aa21134fc49b518cda4759e36
 2015-08-05 14:41:52 -07:00
Yusuke Sato
ead2088efe Fix build breakage caused by r.android.com/162907 
Change-Id: Ifeb7b57ce79f3d8c0edadf03d14853e72840d49e
 2015-08-05 13:14:53 -07:00
Yusuke Sato
3251f2aab7 am 3383b141: am a024acb8: Merge "Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files" 
* commit '3383b141c3ac4426279e649ebcee535890203c3f':
  Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files
 2015-08-05 19:09:41 +00:00
Yusuke Sato
eb24da62ac am 3383b141: am a024acb8: Merge "Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files" 
* commit '3383b141c3ac4426279e649ebcee535890203c3f':
  Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files
 2015-08-05 19:05:17 +00:00
Yusuke Sato
a024acb8ba Merge "Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files" 2015-08-05 17:46:18 +00:00
John Reck
17dafd6033 am 906c8dea: am bc04d3ac: Merge "animateNoDamage failed to remove from current frame list" 
* commit '906c8dea2ec6ae404ae6d7870c0a0cb2289f3d04':
  animateNoDamage failed to remove from current frame list
 2015-08-04 21:14:45 +00:00
John Reck
d56554e82b am 906c8dea: am bc04d3ac: Merge "animateNoDamage failed to remove from current frame list" 
* commit '906c8dea2ec6ae404ae6d7870c0a0cb2289f3d04':
  animateNoDamage failed to remove from current frame list
 2015-08-04 21:13:23 +00:00
John Reck
666f319443 am 2fa3eec0: am 93c14069: Merge "hwui: add extension to support unpack operations in OpenGL ES 2.0" 
* commit '2fa3eec0e1807f6a45b71a41624698e8cc949026':
  hwui: add extension to support unpack operations in OpenGL ES 2.0
 2015-08-04 20:53:55 +00:00
John Reck
bc04d3acba Merge "animateNoDamage failed to remove from current frame list" 2015-08-04 20:52:40 +00:00
John Reck
b47ea9b2ed am 2fa3eec0: am 93c14069: Merge "hwui: add extension to support unpack operations in OpenGL ES 2.0" 
* commit '2fa3eec0e1807f6a45b71a41624698e8cc949026':
  hwui: add extension to support unpack operations in OpenGL ES 2.0
 2015-08-04 20:51:42 +00:00
John Reck
598b0123d3 am 67716c13: am e28c5d62: am a975a844: am 70e5db94: Merge "Fix crash in kModeProcessNoContext" into mnc-dev 
* commit '67716c13939f92cf1de2404e47c569ddf92ee96a':
  Fix crash in kModeProcessNoContext
 2015-08-04 20:13:07 +00:00
John Reck
a975a84498 am 70e5db94: Merge "Fix crash in kModeProcessNoContext" into mnc-dev 
* commit '70e5db9413f82bf1f000bd99b3d2dbecf6e4ab04':
  Fix crash in kModeProcessNoContext
 2015-08-04 19:48:30 +00:00
John Reck
5fe0aac688 am 70e5db94: Merge "Fix crash in kModeProcessNoContext" into mnc-dev 
* commit '70e5db9413f82bf1f000bd99b3d2dbecf6e4ab04':
  Fix crash in kModeProcessNoContext
 2015-08-04 19:45:28 +00:00
John Reck
95cd24bb9d Fix crash in kModeProcessNoContext 
Bug: 22931143
Change-Id: I9897a28b1edd006aee67ae2343874ad92bbd15a0
 2015-08-04 18:19:11 +00:00
Ye Ouyang
68eb3b22b0 animateNoDamage failed to remove from current frame list 
runRemainingAnimations is used to animate the available animation handle
which were not yet run, it actually animate those animation handle and
removes from the list by notifyAnimationsRan(). In case if these animation
handles are not removed, it leads to the Fatal Assert of runRemainingAnimations.

Some usecases causes the addition of animation handle when there is
no animators, in these cases this check prevents execution of
notifyAnimationsRan() leads to Fatal Assert crash of runRemainingAnimations.

Allowing the animation to happen irrespective of animators solves the problem.

Change-Id: Ifa72286cdc6ff785fcc999f3b951dd787e7003e9
 2015-08-04 10:42:32 -05:00
xiaozhengdong
d538d30e2f hwui: add extension to support unpack operations in OpenGL ES 2.0 
OpenGL ES 3.0+ lets us specify the row length for unpack operations
such as glTexSubImage2D(). This allows us to upload a sub-rectangle
of a texture. Also, the GL_EXT_unpack_subimage extension can also
support this feature in OpenGL ES 2.0

Change-Id: Id43c2c55c5eaefbace67087c955f0b4324fb2c35
Signed-off-by: xiaozhengdong <xiaozhengdong@xiaomi.com>
 2015-08-04 19:46:01 +08:00
John Reck
5d0c84bd7f am c03ab87a: Merge "Disable skipping frames on empty damage" into mnc-dev 
* commit 'c03ab87ac9f721ff22bfe5e9c0cd0e5be64f261e':
  Disable skipping frames on empty damage
 2015-08-04 03:10:02 +00:00
John Reck
903e117e55 am 0429246e: am 0c9ec1f2: am 2e529712: am c03ab87a: Merge "Disable skipping frames on empty damage" into mnc-dev 
* commit '0429246eb85dd3c42f92bd5680fe2f6883faddbc':
  Disable skipping frames on empty damage
 2015-08-04 01:31:03 +00:00
John Reck
2e529712e6 am c03ab87a: Merge "Disable skipping frames on empty damage" into mnc-dev 
* commit 'c03ab87ac9f721ff22bfe5e9c0cd0e5be64f261e':
  Disable skipping frames on empty damage
 2015-08-04 01:00:24 +00:00
Yusuke Sato
05f648e1d3 Clean up AssetManager::scanAndMergeZipLocked 
Now that ZipFileRO::startIteration supports prefix/suffix matching,
we can pass dirName to the function for simpler code and slightly
better performance.

(cherry-pick of c796ad0a8be6df4a3b354690dfe5ce1df8136c09)

Change-Id: I0e2ac58de28020c2af8d8e569a97592b09596185
 2015-08-03 17:24:42 -07:00
Yusuke Sato
957c23775f Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files 
for better performance. Without the optimization, these two functions
may check more than 100k file names in the pre-installed APK files,
which can take a few seconds to finish even on a recent device.

(cherry-pick of 34fe3df8519523dbb4bc27010fa57f259d5e868d)

Bug: 21957428
Change-Id: I5ebe0438019958d883a7fda6bd92ea4484211d23
 2015-08-03 17:24:32 -07:00
John Reck
6d4d0db312 Disable skipping frames on empty damage 
Bug: 22592975

Optimization added in MNC is not quite correct, occasionally
it will fail to repaint when it was supposed to leading
to buffer corruption. Disable the optimization for now.

Change-Id: I34dfdfb357eda298198043ded7335d4588a003fd
 2015-08-03 22:47:49 +00:00
Chris Craik
e375685aa4 am 9c458148: am 3d208671: am 7dfb1d99: am 730c0f65: Merge "Fix stencil mask usage in HWUI" into mnc-dev 
* commit '9c458148e9c113ee7092f05ede90a71a64a01adb':
  Fix stencil mask usage in HWUI
 2015-07-30 19:59:20 +00:00
Chris Craik
7dfb1d9931 am 730c0f65: Merge "Fix stencil mask usage in HWUI" into mnc-dev 
* commit '730c0f6591b1c99699e9d0ecf36d696f7d87629f':
  Fix stencil mask usage in HWUI
 2015-07-30 19:37:15 +00:00
Chris Craik
dd497cab35 am 730c0f65: Merge "Fix stencil mask usage in HWUI" into mnc-dev 
* commit '730c0f6591b1c99699e9d0ecf36d696f7d87629f':
  Fix stencil mask usage in HWUI
 2015-07-30 19:35:51 +00:00
Chris Craik
730c0f6591 Merge "Fix stencil mask usage in HWUI" into mnc-dev 2015-07-30 19:30:58 +00:00
Chris Craik
fa51a0e1ce Fix stencil mask usage in HWUI 
bug:21588246

Ensure we always set the mask before clearing, and removes
some unneeded optimizations around mask usage in
debug (overdraw) mode.

Change-Id: I71ed06c16f8d9f158953d5aa160098514f0f7f00
 2015-07-30 11:06:53 -07:00
Elliott Hughes
1db1b5821f am 204b4157: am f8a6a2f6: Merge "Use _WIN32 rather than HAVE_WINSOCK." 
* commit '204b4157b3fdbeea8859c4ad0e29be18d74e6f5f':
  Use _WIN32 rather than HAVE_WINSOCK.
 2015-07-30 15:47:11 +00:00
Elliott Hughes
d065fd415c am 204b4157: am f8a6a2f6: Merge "Use _WIN32 rather than HAVE_WINSOCK." 
* commit '204b4157b3fdbeea8859c4ad0e29be18d74e6f5f':
  Use _WIN32 rather than HAVE_WINSOCK.
 2015-07-30 15:46:55 +00:00
Elliott Hughes
59cbe8d107 Use _WIN32 rather than HAVE_WINSOCK. 
Change-Id: I0821d2af8473c359e8b73aec455000cb7c42f690
 2015-07-29 17:49:27 -07:00