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

119748 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Craik
4fecd0aeeb am 74a8b916: am 59ff85af: (-s ours) am 2729857d: (-s ours) Merge "Fix AOSP build - DO NOT MERGE" 
* commit '74a8b916aceb0b55a7fdfa63bd8267c50d952a28':
  Fix AOSP build - DO NOT MERGE
 2014-02-26 19:14:35 +00:00
Chris Craik
328b7ee6a2 am aecb8c43: am 7b4cce68: am c3bac8a0: Merge "Fix graphics corruption caused by HWUI caches" 
* commit 'aecb8c43d0c6c3d2b55f88abeaa0e3197be59301':
  Fix graphics corruption caused by HWUI caches
 2014-02-26 19:14:32 +00:00
Chris Craik
74a8b916ac am 59ff85af: (-s ours) am 2729857d: (-s ours) Merge "Fix AOSP build - DO NOT MERGE" 
* commit '59ff85af314e2984068943f5572ac40ef381edea':
  Fix AOSP build - DO NOT MERGE
 2014-02-26 19:10:44 +00:00
Chris Craik
aecb8c43d0 am 7b4cce68: am c3bac8a0: Merge "Fix graphics corruption caused by HWUI caches" 
* commit '7b4cce68853d8bcfce2b6bd7f999915063eb56d2':
  Fix graphics corruption caused by HWUI caches
 2014-02-26 19:10:39 +00:00
Chris Craik
59ff85af31 am 2729857d: (-s ours) Merge "Fix AOSP build - DO NOT MERGE" 
* commit '2729857df6c559b37248c96b78303b662212d14b':
  Fix AOSP build - DO NOT MERGE
 2014-02-26 11:06:30 -08:00
Chris Craik
7b4cce6885 am c3bac8a0: Merge "Fix graphics corruption caused by HWUI caches" 
* commit 'c3bac8a096cc5661cf91c8c0aa9b7dd0fc099c5d':
  Fix graphics corruption caused by HWUI caches
 2014-02-26 11:06:27 -08:00
Chris Craik
2729857df6 Merge "Fix AOSP build - DO NOT MERGE" 2014-02-26 18:48:27 +00:00
Chris Craik
c3bac8a096 Merge "Fix graphics corruption caused by HWUI caches" 2014-02-26 18:48:00 +00:00
Chris Craik
2c42b79c6c Fix AOSP build - DO NOT MERGE 
Change-Id: I42b420c2ce89ce364a2809b28b827964e6923fa1
 2014-02-26 10:44:50 -08:00
Sangkyu Lee
36fad8f6fc Fix graphics corruption caused by HWUI caches 
Some caches(PatchCache, TextureCache, PathCache) for HWUI
uses deferred removal for their cache entries even though
actual resource objects are immediately freed by
ResourceCache.
For this reason, the uniqueness of a resource address in
the caches is not guaranteed in specific cases.
(Because malloc() can return the same address when malloc()
and free() called very frequently.)

So it can be possible the cache have two cache entries for
two different resources but the same memory address.
(Of course one of the resources is already freed.)
It also can be possible mGarbage vector in PatchCache has
duplicated addresses and this can lead to duplicated free
blocks in the free block list and graphics corruption.
(Deferred removal was implmeneted based on an assumption of
unique resource addresses.)

So this patch makes sure resource objects are freed after
the resources are removed from the caches to guarantee
the uniqueness of a resource address and prevent graphics
corruption.

Change-Id: I040f033a4fc783d2c4bc04b113589657c36fb15b
Signed-off-by: Sangkyu Lee <sk82.lee@lge.com>
 2014-02-26 10:43:26 -08:00
Craig Mautner
97686e0023 am 91df7766: am 42ec5035: Modify API to hide ActivityView. 
* commit '91df776654e5cf66e5115e0c46ecdbe19a55a0bc':
  Modify API to hide ActivityView.
 2014-02-25 20:25:55 +00:00
Craig Mautner
91df776654 am 42ec5035: Modify API to hide ActivityView. 
* commit '42ec5035672fbfe701ddbf90dcc4390dab9188af':
  Modify API to hide ActivityView.
 2014-02-25 20:22:28 +00:00
Craig Mautner
42ec503567 Modify API to hide ActivityView. 
Fixes build too.

Change-Id: Ibd571cf36c89691a37c45db59c31237fee17adac
 2014-02-25 12:17:15 -08:00
Craig Mautner
c407ace301 am d4c819c0: am dd9ce628: Merge "Clean up activities and displays when done" into klp-modular-dev 
* commit 'd4c819c0029da8fb7248564aefde2146d5ecfc19':
  Clean up activities and displays when done
 2014-02-25 18:52:55 +00:00
Craig Mautner
d4c819c002 am dd9ce628: Merge "Clean up activities and displays when done" into klp-modular-dev 
* commit 'dd9ce6287eb9ccae8d527e6750c91b0bd47834fc':
  Clean up activities and displays when done
 2014-02-25 18:49:37 +00:00
Craig Mautner
dd9ce6287e Merge "Clean up activities and displays when done" into klp-modular-dev 2014-02-25 18:46:01 +00:00
Craig Mautner
95da1087ed Clean up activities and displays when done 
More maintenance fixes.

Fix bug 13157352.

Change-Id: Ic86d39a84452a1cf1dc1762cec517b419ad0a852
 2014-02-25 10:40:18 -08:00
Robert Greenwalt
8395aadbd3 am 860ac9e4: am 41c684a7: am 0d39ef72: am cf73f46a: am 43ec3b93: am 1f9ebc5f: (-s ours) am 868d4c34: am 95023066: DO NOT MERGE Sanitize WifiConfigs 
* commit '860ac9e45f496604757cb27f248def98878f82bb':
  DO NOT MERGE Sanitize WifiConfigs
 2014-02-25 18:33:28 +00:00
Robert Greenwalt
860ac9e45f am 41c684a7: am 0d39ef72: am cf73f46a: am 43ec3b93: am 1f9ebc5f: (-s ours) am 868d4c34: am 95023066: DO NOT MERGE Sanitize WifiConfigs 
* commit '41c684a7b5602991cb1af63b2bcaa4e41812dfb9':
  DO NOT MERGE Sanitize WifiConfigs
 2014-02-25 18:29:25 +00:00
Robert Greenwalt
41c684a7b5 am 0d39ef72: am cf73f46a: am 43ec3b93: am 1f9ebc5f: (-s ours) am 868d4c34: am 95023066: DO NOT MERGE Sanitize WifiConfigs 
* commit '0d39ef72112972dfadd70ef14c733672e4a2d646':
  DO NOT MERGE Sanitize WifiConfigs
 2014-02-25 18:25:11 +00:00
Robert Greenwalt
0d39ef7211 am cf73f46a: am 43ec3b93: am 1f9ebc5f: (-s ours) am 868d4c34: am 95023066: DO NOT MERGE Sanitize WifiConfigs 
* commit 'cf73f46a514f5c2b1a0de137ed203401417307b4':
  DO NOT MERGE Sanitize WifiConfigs
 2014-02-25 18:21:50 +00:00
Robert Greenwalt
cf73f46a51 am 43ec3b93: am 1f9ebc5f: (-s ours) am 868d4c34: am 95023066: DO NOT MERGE Sanitize WifiConfigs 
* commit '43ec3b939b732ea2d3b26635c51a6c91f2692270':
  DO NOT MERGE Sanitize WifiConfigs
 2014-02-25 18:18:05 +00:00
Robert Greenwalt
43ec3b939b am 1f9ebc5f: (-s ours) am 868d4c34: am 95023066: DO NOT MERGE Sanitize WifiConfigs 
* commit '1f9ebc5fa73e7d324429a697cd10abb3761b1ff0':
  DO NOT MERGE Sanitize WifiConfigs
 2014-02-25 18:14:26 +00:00
Robert Greenwalt
1f9ebc5fa7 am 868d4c34: am 95023066: DO NOT MERGE Sanitize WifiConfigs 
* commit '868d4c341034de6e2ebb6c1a247488b00d17c78d':
  DO NOT MERGE Sanitize WifiConfigs
 2014-02-25 10:12:35 -08:00
Robert Greenwalt
868d4c3410 am 95023066: DO NOT MERGE Sanitize WifiConfigs 
* commit '950230663fb3a9af438ec2ee57605fc9e7a58428':
  DO NOT MERGE Sanitize WifiConfigs
 2014-02-25 10:09:13 -08:00
Hui Lu
fcf7d3a649 am eeb291b7: am 95e3cba1: Merge "Reconnect/teardown proxy network connectivity." into klp-modular-dev 
* commit 'eeb291b7f36d63c3db467cc7f4be61af09aa3171':
  Reconnect/teardown proxy network connectivity.
 2014-02-25 18:00:05 +00:00
Hui Lu
eeb291b7f3 am 95e3cba1: Merge "Reconnect/teardown proxy network connectivity." into klp-modular-dev 
* commit '95e3cba1f66af5594b5bdc210426ced44dd7b7ac':
  Reconnect/teardown proxy network connectivity.
 2014-02-25 17:56:42 +00:00
Hui Lu
95e3cba1f6 Merge "Reconnect/teardown proxy network connectivity." into klp-modular-dev 2014-02-25 17:53:41 +00:00
Mike Lockwood
f2d07694d0 am 6eff9949: am 0fc59cd9: am da2bbaf2: am 2c7b913e: am 5daec5b5: Merge "UsbDeviceManager: Fix race condition entering USB accessory mode" into klp-dev 
* commit '6eff99494dd7b274b3b9f89c64ece6cabaff5c8e':
  UsbDeviceManager: Fix race condition entering USB accessory mode
 2014-02-25 15:51:18 +00:00
Mike Lockwood
6eff99494d am 0fc59cd9: am da2bbaf2: am 2c7b913e: am 5daec5b5: Merge "UsbDeviceManager: Fix race condition entering USB accessory mode" into klp-dev 
* commit '0fc59cd958b87d015deac63797fcbfbcec518389':
  UsbDeviceManager: Fix race condition entering USB accessory mode
 2014-02-25 15:48:03 +00:00
Mike Lockwood
0fc59cd958 am da2bbaf2: am 2c7b913e: am 5daec5b5: Merge "UsbDeviceManager: Fix race condition entering USB accessory mode" into klp-dev 
* commit 'da2bbaf219117f7507c5c0015c41347a9cc27507':
  UsbDeviceManager: Fix race condition entering USB accessory mode
 2014-02-25 15:44:24 +00:00
Mike Lockwood
da2bbaf219 am 2c7b913e: am 5daec5b5: Merge "UsbDeviceManager: Fix race condition entering USB accessory mode" into klp-dev 
* commit '2c7b913e367670dde337893efd59029c054019fc':
  UsbDeviceManager: Fix race condition entering USB accessory mode
 2014-02-25 15:41:11 +00:00
Mike Lockwood
2c7b913e36 am 5daec5b5: Merge "UsbDeviceManager: Fix race condition entering USB accessory mode" into klp-dev 
* commit '5daec5b58a89779b0f8775f52859bae0bda17b23':
  UsbDeviceManager: Fix race condition entering USB accessory mode
 2014-02-25 15:38:25 +00:00
Mike Lockwood
5daec5b58a Merge "UsbDeviceManager: Fix race condition entering USB accessory mode" into klp-dev 2014-02-25 15:35:34 +00:00
Narayan Kamath
cc99b18ce3 am a6f70d8b: am 7fe5978b: am 2ba70fd4: Merge "Use reinterpret_cast when an integer is cast to a pointer" 
* commit 'a6f70d8b2dc2a2d900dfaa4b3fcd0fbdffdcfb9e':
  Use reinterpret_cast when an integer is cast to a pointer
 2014-02-25 13:17:39 +00:00
Narayan Kamath
d8410d38cf am 614b00de: am a88abfb3: am 6ab07fac: Merge "Use long for pointers in opengl/EGL classes" 
* commit '614b00de9cdd354a289d98173ba656e5260288e7':
  Use long for pointers in opengl/EGL classes
 2014-02-25 13:17:37 +00:00
Narayan Kamath
a6f70d8b2d am 7fe5978b: am 2ba70fd4: Merge "Use reinterpret_cast when an integer is cast to a pointer" 
* commit '7fe5978bf7c4b473d8f6db5a12cfdcd110511331':
  Use reinterpret_cast when an integer is cast to a pointer
 2014-02-25 13:14:35 +00:00
Narayan Kamath
614b00de9c am a88abfb3: am 6ab07fac: Merge "Use long for pointers in opengl/EGL classes" 
* commit 'a88abfb3a5dccdad6210b294843fa2e21a27d378':
  Use long for pointers in opengl/EGL classes
 2014-02-25 13:14:30 +00:00
Narayan Kamath
7fe5978bf7 am 2ba70fd4: Merge "Use reinterpret_cast when an integer is cast to a pointer" 
* commit '2ba70fd49bfcbb516e75c198c106764609335feb':
  Use reinterpret_cast when an integer is cast to a pointer
 2014-02-25 05:11:43 -08:00
Narayan Kamath
a88abfb3a5 am 6ab07fac: Merge "Use long for pointers in opengl/EGL classes" 
* commit '6ab07fac49d6b618883a2ef4cea11f0959b3abe3':
  Use long for pointers in opengl/EGL classes
 2014-02-25 05:11:40 -08:00
Narayan Kamath
2ba70fd49b Merge "Use reinterpret_cast when an integer is cast to a pointer" 2014-02-25 13:05:48 +00:00
Narayan Kamath
6ab07fac49 Merge "Use long for pointers in opengl/EGL classes" 2014-02-25 13:05:44 +00:00
Jeff Brown
01d63a3524 am ae8106ef: am 2326acb5: Merge "Fix typo that causes dreaming on battery." into klp-modular-dev 
* commit 'ae8106ef9cdea9b6325afec197023d5b2d6214d0':
  Fix typo that causes dreaming on battery.
 2014-02-25 00:37:42 +00:00
Jeff Brown
ae8106ef9c am 2326acb5: Merge "Fix typo that causes dreaming on battery." into klp-modular-dev 
* commit '2326acb591d889d9492219f5f8f79940fd66ba70':
  Fix typo that causes dreaming on battery.
 2014-02-25 00:32:37 +00:00
Justin Koh
ffbe7f83eb am 22352885: am bf3a45f3: Merge "DO NOT MERGE EGL14.eglCreateWindowSurface should set producerControlledByApp" into klp-modular-dev 
* commit '2235288538d0c1758315bba961200d0e2254dedd':
  DO NOT MERGE EGL14.eglCreateWindowSurface should set producerControlledByApp
 2014-02-25 00:29:56 +00:00
Jeff Brown
2326acb591 Merge "Fix typo that causes dreaming on battery." into klp-modular-dev 2014-02-25 00:27:41 +00:00
Justin Koh
2235288538 am bf3a45f3: Merge "DO NOT MERGE EGL14.eglCreateWindowSurface should set producerControlledByApp" into klp-modular-dev 
* commit 'bf3a45f3adc435d7670ac5a92d2fb73b1e21f7aa':
  DO NOT MERGE EGL14.eglCreateWindowSurface should set producerControlledByApp
 2014-02-25 00:24:51 +00:00
Justin Koh
bf3a45f3ad Merge "DO NOT MERGE EGL14.eglCreateWindowSurface should set producerControlledByApp" into klp-modular-dev 2014-02-25 00:20:45 +00:00
Jeff Brown
966604f159 Fix typo that causes dreaming on battery. 
Bug: 13173012
Change-Id: I611970a5b4c4b0072ce52e3fc6a57dd3a0c075b3
 2014-02-24 16:19:51 -08:00
Takahiro Aizawa
5b4a857603 DO NOT MERGE EGL14.eglCreateWindowSurface should set producerControlledByApp 
Interface of Surface class changed.
To reflect the change for EGL14, add producerControlledByApp flag.
Similar change can be seen in 0fa257fe53bf520bdde93996a1901ce6bc3e1788

This is a cherry-pick of https://android-review.googlesource.com/#/c/72973/ which is already in master, so do not merge.

Change-Id: Ic8911d3131e033747cfdabe59ac2fea1e90bb4a0
 2014-02-25 00:00:16 +00:00