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

6726 Commits

Author SHA1 Message Date
Chris Craik
34e9b5b2e4 Merge "Early return when the scale is 0." into mnc-dr-dev am: 10eb6ab94b am: 8b581e2bc7 
am: a853bb450c

* commit 'a853bb450ce7e6f06220a86dcc171a837d30511b':
  Early return when the scale is 0.
 2015-11-04 19:46:47 +00:00
Chris Craik
289c3ba2c4 Merge "Remove -ffast-math from libhwui makefile" into mnc-dr-dev am: c4aaf0f4b8 am: 62b16e2e10 
am: 1938c39f77

* commit '1938c39f77a52c1058e7b2434bdc5d08ed9053b9':
  Remove -ffast-math from libhwui makefile
 2015-11-04 19:40:04 +00:00
Chris Craik
10eb6ab94b Merge "Early return when the scale is 0." into mnc-dr-dev 2015-11-04 19:28:39 +00:00
Teng-Hui Zhu
cdce35a7e8 Early return when the scale is 0. 
b/24534579

Change-Id: Ib3581ec99387ca70ca036026f64857a49657d94b
(cherry picked from commit 8d0ec389531d071529fb0a800f10733b057205d9)
 2015-11-04 18:31:50 +00:00
John Reck
392b0926aa Merge "Revert "Use clang for libhwui"" into mnc-dr-dev am: 1e1fbd804b am: f8635c2e04 
am: 26f50df754

* commit '26f50df75477a18e40c6da59a15cc2bd4b441239':
  Revert "Use clang for libhwui"
 2015-11-04 18:21:35 +00:00
Chris Craik
e02ec7c37a Remove -ffast-math from libhwui makefile 
bug:25417885

Change-Id: I8244bd28c2d46fc449398b9bf5104bf7cbaded8a
 2015-11-04 10:14:57 -08:00
John Reck
492a56cc93 Revert "Use clang for libhwui" 
Bug 25462107

This reverts commit d354fd2c66855d116440eb4c936317f124241225.

Change-Id: Ib7c50b5becf247f837f3cc20f9128d9411d22563
 2015-11-04 15:21:35 +00:00
Tenghui Zhu
0cda530e0e Merge "Use clang for libhwui" into mnc-dr-dev am: 61c93eb16d am: a66dc6e159 
am: a32f221db0

* commit 'a32f221db0361c9047fd61373fbf815c37d958f8':
  Use clang for libhwui
 2015-11-03 19:55:52 +00:00
Chris Craik
d354fd2c66 Use clang for libhwui 
bug:25417885

Change-Id: I0ef8034d79ba3682925e3c2a4b7ccd833fd4f156
 2015-11-03 10:34:28 -08:00
Andreas Gampe
314e1e00d8 Merge "Revert "libs: add libpackagelistparser"" 
am: e3da6ba5dd

* commit 'e3da6ba5dd29002789a76dafdc14987c51d92ea5':
  Revert "libs: add libpackagelistparser"
 2015-10-23 04:16:20 +00:00
Andreas Gampe
ce969123b1 Revert "libs: add libpackagelistparser" 
This reverts commit dc06bb0752c1bc3e87b04a097b308bca1bc86181.

This should go into system/core.

Change-Id: Idf304ac5ccd4bcc86722f65688e3ee6284452287
 2015-10-22 19:50:09 -07:00
Daniel Cashman
188e8875db Merge "libs: add libpackagelistparser" 
am: cc7373eafd

* commit 'cc7373eafd0d5be7df8898748a700b47298ebf10':
  libs: add libpackagelistparser
 2015-10-22 23:12:49 +00:00
William Roberts
dc06bb0752 libs: add libpackagelistparser 
There are 4 components that all implement package parsing, they are:
1. sdcardd
2. libselinux
3. logd
4. runas

Create a library that can be used by all of them, and new ones as needed.

Change-Id: I87a406802f95d8e7bfd8ee85f723f80e9e6b6c0c
Signed-off-by: William Roberts <william.c.roberts@intel.com>
 2015-10-14 16:38:03 -07:00
Stephen Hines
697e3dd6b9 am ee144b1e: resolved conflicts for bd57dac5 to stage-aosp-master 
* commit 'ee144b1e60a88e8f097113e046813f0b61c38b9b':
  Don't unregister Fonts from renderer at destruction
 2015-10-03 00:46:17 +00:00
Stephen Hines
ee144b1e60 resolved conflicts for bd57dac5 to stage-aosp-master 
Change-Id: I5107af13712d7cc908d8699e5c15a002f0a3ec85
 2015-10-02 17:34:05 -07:00
Chris Craik
bd57dac5d5 Merge "Don't unregister Fonts from renderer at destruction" 2015-10-02 22:30:09 +00:00
Chris Craik
148c78f825 Don't unregister Fonts from renderer at destruction 
bug:24584749

Fonts are only destroyed when the renderer is destroyed, this prevents
modifying the FontRenderer's LruCache while it's being iterated through
in FontRenderer::~FontRenderer.

Change-Id: I0e2c9f87981bfa50454ec8689df05851839e288e
 2015-10-02 14:21:46 -07:00
Sergio Giro
31e5ded687 am 6706b71d: am 86e67d70: Merge "frameworks/base: delete TinyHashMap" 
* commit '6706b71d7cfb9a916fd482189c04a0d59c19c103':
  frameworks/base: delete TinyHashMap
 2015-10-01 10:22:39 +00:00
Sergio Giro
6706b71d7c am 86e67d70: Merge "frameworks/base: delete TinyHashMap" 
* commit '86e67d708d738807c843850a3b6c9170e514ff8f':
  frameworks/base: delete TinyHashMap
 2015-10-01 10:16:44 +00:00
Sene Gales
1673035f05 frameworks/base: delete TinyHashMap 
In DeferredDisplayList use std::unordered_map instead of TinyHashMap

Towards deprecation of BasicHashTable

Change-Id: I91b8d5dc80444c88fecff9c362fa610cca253973
 2015-09-30 20:37:01 +01:00
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