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

118226 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Kralevich
fdd6351067 am 491eaf22: Merge "Note libselinux dependency on packages.list format changes." 
* commit '491eaf2255a95186e84092eae4ec43582eebb37b':
  Note libselinux dependency on packages.list format changes.
 2014-03-26 08:47:39 -07:00
Nick Kralevich
491eaf2255 Merge "Note libselinux dependency on packages.list format changes." 2014-03-26 15:41:14 +00:00
Stephen Smalley
e6e25554d3 Note libselinux dependency on packages.list format changes. 
Change-Id: I3c34a86f5706c4fca826a8634936131e4e4fc297
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
 2014-03-26 09:19:12 -04:00
Chris Craik
4118480aab am 80470cdf: Merge "Solve three memory leaks related to PatchCache" 
* commit '80470cdf6c6995f4afe8d5e2c4b6e898625173fb':
  Solve three memory leaks related to PatchCache
 2014-03-25 13:21:01 -07:00
Chris Craik
80470cdf6c Merge "Solve three memory leaks related to PatchCache" 2014-03-25 20:11:33 +00:00
Kenny Root
c1d863e7a4 am 77ceb5e8: Merge "Use X509ExtendedTrustManager and not Conscrypt" 
* commit '77ceb5e8f18608cdbf19831f6188db87a5e0c058':
  Use X509ExtendedTrustManager and not Conscrypt
 2014-03-25 10:19:27 -07:00
Craig Mautner
9bbd2f977b am 2cacc619: Merge "Don\'t wait for finishing animation when second display is disconnected" 
* commit '2cacc619d62f58ee8a9d0fcfac942c6d5faf7031':
  Don't wait for finishing animation when second display is disconnected
 2014-03-25 10:19:24 -07:00
Kenny Root
77ceb5e8f1 Merge "Use X509ExtendedTrustManager and not Conscrypt" 2014-03-25 17:06:55 +00:00
Craig Mautner
2cacc619d6 Merge "Don't wait for finishing animation when second display is disconnected" 2014-03-25 17:01:28 +00:00
Narayan Kamath
ea96d791c7 am 5f0d44f6: Merge "Fix scaleNinePatch." 
* commit '5f0d44f69768a39b0bcd9d1d072ce3606a1ca1ed':
  Fix scaleNinePatch.
 2014-03-25 07:27:11 -07:00
Narayan Kamath
5f0d44f697 Merge "Fix scaleNinePatch." 2014-03-25 13:56:51 +00:00
Koji Fukui
39f7068ed9 Don't wait for finishing animation when second display is disconnected 
Basically WindowManagerService wait for finishing animation when
a window is removed. But when second display is disconnected, windows
on second display can't be shown even if animation is waited for.
On the contrary, it keeps on waiting for finishing the animation
in special case.

With this fix windows are immediately removed without waiting for
animation when second display is disconnected.

Change-Id: I1354c193c04db394a21a11c174e10c8e7da17a0e
 2014-03-25 11:25:32 +09:00
Jens Gulin
6056e10271 Solve three memory leaks related to PatchCache 
A Patch can be fairly large, holding bitmap data, but
is also frequently leaked which adds to the severity.
The feature is used in many important processes such
as Home, SystemUI and Chrome.

The following leaks are solved:

1. The Patch itself was not always freed.
PatchCache::removeDeferred() can mark patches to be
cared for by PatchCache::clearGarbage(). But
mCache.remove() would only destroy the container
and the pointer, not the Patch object itself.

2. The vertices stored in the Patch at Patch::createMesh()
would always leak. The empty/default destructor in Patch
would not properly destroy "vertices" since it's just a
pointer.

3. A BufferBlock that's added to the mFreeBlocks
in PatchCache could leak. The leak happened when a
patch later needed the entire free block, because the
object was removed from the list but never deleted
in PatchCache::setupMesh().

Change-Id: I41e60824479230b67426fc546d3dbff294c8891f
 2014-03-25 09:37:02 +09:00
Kenny Root
da776c872e Use X509ExtendedTrustManager and not Conscrypt 
This allows the new X509ExtendedTrustManager to be used instead of
Conscrypt directly.

Bug: 13103812
Change-Id: I736f475342395f26657f2371828a6d3a0065a50a
 2014-03-24 17:05:22 -07:00
Craig Mautner
103ed35587 am 557a93e1: Merge "Set ScreenshotSurface secure if any secure content is shown." 
* commit '557a93e104f1fec69ed05b2d0ff26c78bca4c5d6':
  Set ScreenshotSurface secure if any secure content is shown.
 2014-03-24 07:34:59 -07:00
Craig Mautner
557a93e104 Merge "Set ScreenshotSurface secure if any secure content is shown." 2014-03-24 14:31:38 +00:00
Narayan Kamath
02eb6bfd66 Fix scaleNinePatch. 
Use yDivs for yDivs, and not xDivs.

bug: 13394494

(cherry picked from commit 42a51ae8812bccde7ff370cc2688f7955e489ad4)

Change-Id: Ia0a7d701a170945216ab247a483e7f972b6fe17e
 2014-03-24 12:35:01 +00:00
Alex Klyubin
d8c32164e1 am 88517170: Merge "Adjust to the change in the private SSLParameterImpl API." 
* commit '88517170cbb09b45324d5b457a0e5e840cc7d09b':
  Adjust to the change in the private SSLParameterImpl API.
 2014-03-21 11:41:38 -07:00
Alex Klyubin
88517170cb Merge "Adjust to the change in the private SSLParameterImpl API." 2014-03-21 18:36:08 +00:00
Alex Klyubin
a2507e8764 Adjust to the change in the private SSLParameterImpl API. 
Conscrypt's SSLParameterImpl getDefaultTrustManager was renamed to
getDefaultX509TrustManager.

Bug: 13563574
Change-Id: I601c651d631f5a2e4a04d21941186553988e5286
 2014-03-21 11:13:50 -07:00
Colin Cross
e4360c8e14 am 4308a523: Merge "bootanimation: build 32-bit if 64-bit gl libraries are not available" 
* commit '4308a5230e2887c1ee12e7bdc60e0b93212637ab':
  bootanimation: build 32-bit if 64-bit gl libraries are not available
 2014-03-20 10:33:20 -07:00
Colin Cross
4308a5230e Merge "bootanimation: build 32-bit if 64-bit gl libraries are not available" 2014-03-20 17:28:12 +00:00
Narayan Kamath
c850102d5c am 0da4ad42: Merge "Don\'t register methods when there\'s nothing to register." 
* commit '0da4ad425d52d1aeec16b31b784c456753532dc2':
  Don't register methods when there's nothing to register.
 2014-03-20 03:13:27 -07:00
Narayan Kamath
0da4ad425d Merge "Don't register methods when there's nothing to register." 2014-03-20 10:08:38 +00:00
Minoru Aoi
2b74a24a52 Set ScreenshotSurface secure if any secure content is shown. 
The screenrecord command can record secure content during rotation.
This is because the ScreenshotSurface surface for rotation animation
is not set secure even though its screenshot contains secure content.

Change-Id: I5a70be71ddfc26de4230e7d4fe547210c2154210
 2014-03-20 11:35:33 +09:00
Chris Craik
00efaea980 am dac29800: Merge "Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON" 
* commit 'dac298005ce3c1361e27bb740e4b518765d43d77':
  Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON
 2014-03-19 19:24:53 -07:00
Chris Craik
dac298005c Merge "Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON" 2014-03-20 02:19:54 +00:00
Nick Kralevich
dd6b749557 am 83725810: Merge "Get rid of noise during boot." 
* commit '8372581089422364f4f8bc948b9cbdcf5f8c2e91':
  Get rid of noise during boot.
 2014-03-19 18:47:45 -07:00
Nick Kralevich
8372581089 Merge "Get rid of noise during boot." 2014-03-20 01:37:39 +00:00
Dianne Hackborn
0aa5163c13 Get rid of noise during boot. 
This log is not an error, it is a warning, don't spam a stack
crawl when it happens.

Change-Id: I6038e3625cc0c16af9e54887b5e7ec451d9f864d
 2014-03-19 18:34:52 -07:00
Colin Cross
0dccb02b9f am 19fc55e1: Merge "build app_process64 on 64-bit targets" 
* commit '19fc55e1e3a51aba4db985d186d1f4ec075d7ca1':
  build app_process64 on 64-bit targets
 2014-03-19 18:19:25 -07:00
Colin Cross
19fc55e1e3 Merge "build app_process64 on 64-bit targets" 2014-03-20 01:14:43 +00:00
Colin Cross
31d16e5bf9 bootanimation: build 32-bit if 64-bit gl libraries are not available 
Set LOCAL_32_BIT_ONLY if TARGET_32_BIT_SURFACEFLINGER is set.

Change-Id: I76396cc9fe3fe45d1e98a44bf911d6e70922555a
 2014-03-19 18:10:31 -07:00
Colin Cross
2764fce3a1 build app_process64 on 64-bit targets 
On 64-bit platforms builds two copies of app_process, the 32-bit
app_process and 64-bit app_process64.

Change-Id: I59d739b5df398ad0bd040c954c57640ff7ab3e72
 2014-03-19 17:49:47 -07:00
Glenn Kasten
a3dc076d2d am bfc44092: Merge "mediaeditor shouldn\'t depend on audioflinger." 
* commit 'bfc440923ecb8f32448c675095a2096049fe7ebe':
  mediaeditor shouldn't depend on audioflinger.
 2014-03-19 14:05:23 -07:00
Glenn Kasten
240d563863 am c1f3d4c1: Merge "Fix 64 bit compile failures in renderscript" 
* commit 'c1f3d4c1ba7903d1b72c2341b5284da12b79ee46':
  Fix 64 bit compile failures in renderscript
 2014-03-19 14:05:20 -07:00
Glenn Kasten
bfc440923e Merge "mediaeditor shouldn't depend on audioflinger." 2014-03-19 21:02:39 +00:00
Glenn Kasten
c1f3d4c1ba Merge "Fix 64 bit compile failures in renderscript" 2014-03-19 21:01:57 +00:00
Nick Kralevich
e75d340ae5 am 5c8e1a6e: Merge "Allow PMS to restorecon directories under /data." 
* commit '5c8e1a6ed4b7e12632c7c82b94e1909ae82b0706':
  Allow PMS to restorecon directories under /data.
 2014-03-19 13:20:37 -07:00
Nick Kralevich
5c8e1a6ed4 Merge "Allow PMS to restorecon directories under /data." 2014-03-19 20:17:40 +00:00
Mark Salyzyn
9a09a52365 am 0b472ae1: Merge "androidfw: resolve 64-bit build issues" 
* commit '0b472ae13d38dd166a1a35782e028ade85bf2975':
  androidfw: resolve 64-bit build issues
 2014-03-19 12:42:15 -07:00
Glenn Kasten
4898892118 am d6408735: Merge "PacProcessor should be 32 bit only." 
* commit 'd6408735b9b2ca9378886a4b30e3d691c0923817':
  PacProcessor should be 32 bit only.
 2014-03-19 12:38:41 -07:00
Mark Salyzyn
0b472ae13d Merge "androidfw: resolve 64-bit build issues" 2014-03-19 19:36:52 +00:00
Glenn Kasten
d6408735b9 Merge "PacProcessor should be 32 bit only." 2014-03-19 19:34:08 +00:00
Mark Salyzyn
00adb8685e androidfw: resolve 64-bit build issues 
- uid_t/gid_t cast to unsigned long
- unused argument warnings
- tab and space requirements

Change-Id: Ib446d8165b9082be02edb55e6b71fd1a03ea3431
 2014-03-19 11:11:14 -07:00
Narayan Kamath
587a25b6cd mediaeditor shouldn't depend on audioflinger. 
Change-Id: I7e1b999b03a3ee5eff2e10a460f64abeba16ba90
 2014-03-19 17:49:47 +00:00
Robert Craig
4385343fd8 Allow PMS to restorecon directories under /data. 
This change applies a relabel to both /data/data and
/data/user directories on boot. Not every boot will
apply this relabeling however. The appropriate
seapp_contexts is hashed and compared to
/data/system/seapp_hash to decide if the relabel
should occur.

Change-Id: I05e8b438950ddb908e46c9168ea6ee601e6d674f
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
 2014-03-19 17:37:37 +00:00
Narayan Kamath
78c0ce5612 Fix 64 bit compile failures in renderscript 
Use uintptr_t for pointers (and not uint32_t) and
also don't assume that size_t is 32 bits wide.

Also uses java longs for passing pointers across
JNI boundaries.

Change-Id: Ie52bd8ae967fbddc911eda3a43cc799d53bbce66
 2014-03-19 17:14:54 +00:00
Narayan Kamath
f83c73ec2f Don't register methods when there's nothing to register. 
Change-Id: I6d0233f79bb90089426d702b4076ec5750e82475
 2014-03-19 14:13:27 +00:00
Narayan Kamath
58f9a645e1 PacProcessor should be 32 bit only. 
It depends on external/v8, which isn't ready for 64 bit yet.

Change-Id: Ibc9705665b81d3667826dedd6217f2eb6d451c81
 2014-03-19 11:39:43 +00:00