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

2297 Commits

Author SHA1 Message Date
Elliott Hughes
53e621f2f3 am 898d8048: am 2eca1b53: Merge "Add return after NULL check in JetPlayer" 
* commit '898d8048b69124e919935903da97757ad2ebea4c':
  Add return after NULL check in JetPlayer
 2012-12-15 15:10:34 -08:00
Jamie Gennis
82bb813f11 stop using a deprecated SurfaceTextureClient ctor 
Change-Id: Ie6196ba4896c0ab37b9aed3d1a4ffd04c99c5f80
 2012-12-11 17:02:31 -08:00
You Kim
8f5691fd92 Add return after NULL check in JetPlayer 
When pointer lpJet is NULL, it should return.

Change-Id: Ia0471173b57da8f9bf22b3a19479aa5b3c4a5acb
 2012-12-12 05:34:21 +09:00
Nick Kralevich
efafb77500 am c0ffba90: am 261bc704: Merge "convert jint to uint32_t." 
* commit 'c0ffba907f6ab539ced94e089ccb4abbf7c2808f':
  convert jint to uint32_t.
 2012-12-10 10:34:20 -08:00
Nick Kralevich
7353cf305e convert jint to uint32_t. 
This works around a compiler bug, and is probably more
correct anyway.

Change-Id: I1c49064bd64c31dafae560e416c665de0449f245
 2012-12-07 16:56:47 -08:00
Glenn Kasten
2b0b6596e4 Merge "Replace run-time modes by compile-time constants" 2012-12-05 16:33:58 -08:00
Glenn Kasten
8a18043436 Merge "new can't fail on Android" 2012-12-04 16:37:49 -08:00
Glenn Kasten
1adb715bc6 new can't fail on Android 
Change-Id: I0e048d3d8ba1ec34d13684b9fd898035d3381db8
 2012-12-03 15:28:36 -08:00
Romain Guy
5bb3c730f5 Apply dev. settings at runtime 
Bug #7434649

Change-Id: I16f00eaa8a5eefd9f9849e196cf2cb1659215390
 2012-11-30 16:29:33 -08:00
Glenn Kasten
3d301cb2b1 Replace run-time modes by compile-time constants 
Simplify the code to use the constant values of MODE_STATIC and
MODE_STREAM from AudioTrack.java.

There is already a comment in AudioTrack.java saying that these symbols
need to be kept in sync with this file, and they are public static final
so they can never be changed.

Change-Id: I6cb10ac511df4845610454d1659e64d9195d67cd
 2012-11-29 14:34:59 -08:00
Romain Guy
b8dca777ca Merge "Use LruCache instead of GenerationCache in libhwui" 2012-11-29 13:58:57 -08:00
Romain Guy
a4caee0115 Merge "Cleanup: remove unused property" 2012-11-29 13:15:22 -08:00
Romain Guy
1741d73441 Cleanup: remove unused property 
Change-Id: I09b418ef8888c42a876cb9014b22231ec31ca7eb
 2012-11-29 13:05:16 -08:00
Romain Guy
059e12ccd2 Use LruCache instead of GenerationCache in libhwui 
Change-Id: Ic26ddc7151eb5462bcd243b21daf7187ed6d3bec
 2012-11-29 11:44:02 -08:00
Alex Ray
8a6787b1c7 core: Update Java wrappers for atrace. 
Atrace functionality moved to cutils.  Add ATRACE_TAG_HAL.

Change-Id: I80e1c9438bfd2436559b64e94e4009cb9c5dbc09
 2012-11-27 23:11:16 -08:00
Jesse Hall
16823bd611 Process all display events in order 
Display events in each batch received from IPC were being processed in
reverse order, and stopped after the first vsync event (latest
chronologically) was handled. This makes perfect sense for vsync
events, but is broken for hotplug events.

Now we process them all in order, handling all except vsync as we see
them. For vsync events, only the last is reported.

Bug: 7491120
Change-Id: I04528fea8f38c1013734d4aa92fb1955ac24d7cc
 2012-11-19 10:53:26 -08:00
Robert Greenwalt
60bfacd8ef Merge "Support for dns domain." 2012-11-16 12:56:56 -08:00
Robert Greenwalt
8058f62189 Support for dns domain. 
bug:6799630
Change-Id: I10070eddb65b7b60f0bc2b3e1e320e1aa4ec6e98
 2012-11-16 11:25:32 -08:00
Glenn Kasten
fd1e3dfde2 Use size_t for frame count 
Change-Id: Idd364443715a920ece2cc54acc95b395b6ed2c6c
 2012-11-15 14:55:43 -08:00
Glenn Kasten
85fbc871de Use uint32_t for sample rate 
Change-Id: If6d4f53254b630dc479af22b77b59555b43eeab4
 2012-11-14 13:47:46 -08:00
Robert Greenwalt
321020b7e0 Merge "Remove DhcpInfoInternal" 2012-11-09 09:51:21 -08:00
Robert Greenwalt
4717c261b2 Remove DhcpInfoInternal 
First step in accepting a set of patches.
bug:6799630

Change-Id: I6c894c60aeb3022960c2aaa45451bb1dde2b493b
 2012-11-09 09:46:32 -08:00
Irfan Sheriff
8449bb0378 am 37794c20: am f264e8e3: am 567a2919: Merge "Stop supplicant and dhcp before start" into jb-mr1.1-dev 
* commit '37794c200fa24e622d842d420b49a2a2a87a38bb':
  Stop supplicant and dhcp before start
 2012-11-08 06:18:47 -08:00
Irfan Sheriff
37794c200f am f264e8e3: am 567a2919: Merge "Stop supplicant and dhcp before start" into jb-mr1.1-dev 
* commit 'f264e8e34e32bfb8e7e75b61b9da9b6f219690b0':
  Stop supplicant and dhcp before start
 2012-11-08 06:14:33 -08:00
Elliott Hughes
e4d08f11c4 am 9197d170: am fec5f611: Merge "It\'s 2012. We\'re always WITH_JIT." 
* commit '9197d170b770f2b87abd0cd0e13dcf71e5a181c2':
  It's 2012. We're always WITH_JIT.
 2012-11-07 13:08:11 -08:00
Elliott Hughes
9197d170b7 am fec5f611: Merge "It\'s 2012. We\'re always WITH_JIT." 
* commit 'fec5f611fef4fc3b7afa5d7194f4f40d156157ac':
  It's 2012. We're always WITH_JIT.
 2012-11-07 10:48:26 -08:00
Irfan Sheriff
f264e8e34e am 567a2919: Merge "Stop supplicant and dhcp before start" into jb-mr1.1-dev 
* commit '567a2919f3ad66dcb972e45411d18a4515d9f0b1':
  Stop supplicant and dhcp before start
 2012-11-06 17:43:05 -08:00
Elliott Hughes
be8b47f6ce It's 2012. We're always WITH_JIT. 
Change-Id: Ia3d1a1b1df06816f2cfa3879ec669b34c62cf9b9
 2012-11-06 17:16:21 -08:00
Irfan Sheriff
511d5346ce Stop supplicant and dhcp before start 
Bug: 7227463
Change-Id: Iaa0df7522edc38d25fae2bbda8d24490e997e733
 2012-11-06 15:53:32 -08:00
Igor Murashkin
1a94c7db9f Merge "Updated android.graphics.SurfaceTexture to use wp for FrameAvailableListener" 2012-11-05 13:47:56 -08:00
Igor Murashkin
c99db2bc46 Updated android.graphics.SurfaceTexture to use wp for FrameAvailableListener 
Bug: 7425644
Change-Id: I7ccdc0ef421df7240d6cff9222c37411b1ecaf01
 2012-10-30 14:44:25 -07:00
Glenn Kasten
b24a1b7f99 Remove obsolete references to libmedia_native 
Bug: 6654403
Change-Id: I05d8e81fd31617b587fd1228a303c40db83e7f2d
 2012-10-30 10:59:52 -07:00
Raph Levien
178705f45d Merge "Modify TextLayoutCache to use new LRU cache" 2012-10-29 09:01:34 -07:00
Raph Levien
d98efca738 Modify TextLayoutCache to use new LRU cache 
This patch modifies TextLayoutCache to use the new hash-based LRU
caching mechanism, which should be significantly faster than the
old GenerationCache implementation.

Change-Id: I6170462ad93a56156a731a2927680164d62b5cfc
 2012-10-25 23:17:33 -07:00
Jamie Gennis
8b9750c1bb am fec93f67: am 39c68da5: am cd79b35c: Merge "Surface: add the PhysicalDisplayInfo#secure field" into jb-mr1-dev 
* commit 'fec93f67190f7ced8578130e2340dee0e4010a33':
  Surface: add the PhysicalDisplayInfo#secure field
 2012-10-23 15:29:47 -07:00
Jamie Gennis
fec93f6719 am 39c68da5: am cd79b35c: Merge "Surface: add the PhysicalDisplayInfo#secure field" into jb-mr1-dev 
* commit '39c68da57b443c869378263b8063da6e821a1b6d':
  Surface: add the PhysicalDisplayInfo#secure field
 2012-10-23 15:27:10 -07:00
Jamie Gennis
39c68da57b am cd79b35c: Merge "Surface: add the PhysicalDisplayInfo#secure field" into jb-mr1-dev 
* commit 'cd79b35c3828e0ebf4c9e68da75f9d857ccf01db':
  Surface: add the PhysicalDisplayInfo#secure field
 2012-10-23 15:24:29 -07:00
Jamie Gennis
cd79b35c38 Merge "Surface: add the PhysicalDisplayInfo#secure field" into jb-mr1-dev 2012-10-23 15:22:37 -07:00
Jamie Gennis
95429c3d1b Surface: add the PhysicalDisplayInfo#secure field 
Bug: 7368436
Change-Id: I38bf7bbfca354380c30da7516f628cf40416d350
 2012-10-23 15:07:22 -07:00
Chet Haase
aaee13176e am 85c1aef9: am 6534dd02: am 74261d84: Merge "Don\'t null the reference to Bitmap pixels until we\'re really ready" into jb-mr1-dev 
* commit '85c1aef929b40f6fae31938b9c71160865d67f81':
  Don't null the reference to Bitmap pixels until we're really ready
 2012-10-22 15:55:08 -07:00
Chet Haase
85c1aef929 am 6534dd02: am 74261d84: Merge "Don\'t null the reference to Bitmap pixels until we\'re really ready" into jb-mr1-dev 
* commit '6534dd0275c8d01de7e7400ba239d203c37c8164':
  Don't null the reference to Bitmap pixels until we're really ready
 2012-10-22 15:52:20 -07:00
Chet Haase
6534dd0275 am 74261d84: Merge "Don\'t null the reference to Bitmap pixels until we\'re really ready" into jb-mr1-dev 
* commit '74261d847f64ccfeba0a7f08f6c59473a3b6647d':
  Don't null the reference to Bitmap pixels until we're really ready
 2012-10-22 15:49:22 -07:00
Chet Haase
74261d847f Merge "Don't null the reference to Bitmap pixels until we're really ready" into jb-mr1-dev 2012-10-22 15:46:43 -07:00
Chet Haase
547e66531d Don't null the reference to Bitmap pixels until we're really ready 
A change in the VM triggers a native memory error more aggressively than before,
showing that there's a bug in the logic of recycling bitmaps. Since the pixel
memory is allocated on the Java heap, nulling out the reference to that memory
in the Java level Bitmap object can cause that memory to get collected at any time.
Meanwhile, we may have a reference to that memory at the native level for rendering
purposes, causing an error if/when we access that memory after it has been collected
by the VM.

The fix is to avoid setting the reference to the pixels to null unless we are
not referring to it in native code. This is determined at the time we call
recycle() - we return a boolean to indicate whether the native code is still
using the memory. if not, the Java code can null out the reference and allow the
VM to collect it. Otherwise, it will get collected later when the encompassing
Bitmap object is collected.

Issue #7339156 HTML5 tests crash the app (Vellamo)

Change-Id: I3a0d6b9a6c5dd3b86cc2b0ff7719007e774b5e3c
 2012-10-22 15:25:19 -07:00
Jamie Gennis
e8c18cb36b am 5bbfcd3e: am 9fee7bd7: am 23d62241: Merge "Set the secureness when creating displays" into jb-mr1-dev 
* commit '5bbfcd3e15048f94310da6cba85be8ab047c0e8b':
  Set the secureness when creating displays
 2012-10-22 13:57:55 -07:00
Jamie Gennis
5bbfcd3e15 am 9fee7bd7: am 23d62241: Merge "Set the secureness when creating displays" into jb-mr1-dev 
* commit '9fee7bd73d1231172267cde99d2374cf072c2dca':
  Set the secureness when creating displays
 2012-10-22 13:54:53 -07:00
Jamie Gennis
9fee7bd73d am 23d62241: Merge "Set the secureness when creating displays" into jb-mr1-dev 
* commit '23d622418b5c67dc43faabd930d1c59c5ce34f6a':
  Set the secureness when creating displays
 2012-10-22 13:52:12 -07:00
Jamie Gennis
7bbf8163fb Set the secureness when creating displays 
This change makes use of the new 'secure' argument to the
ISurfaceComposer::createDisplay method.  In this change both the overlay and
wifi displays are hard-coded to be non-secure displays.

Bug: 7368436
Change-Id: Ib65312f2adab5104d8deefbfc32af9dc106a9129
 2012-10-19 18:34:35 -07:00
Romain Guy
05606be858 am 3786a9b9: am 07a9ebd1: am b8460d15: Merge "Take into account the texture layer\'s transform for clipping Bug #7370212" into jb-mr1-dev 
* commit '3786a9b97a5a149c7f8a68a0f6c4cc4c063be7ac':
  Take into account the texture layer's transform for clipping Bug #7370212
 2012-10-17 19:23:27 -07:00
Romain Guy
3786a9b97a am 07a9ebd1: am b8460d15: Merge "Take into account the texture layer\'s transform for clipping Bug #7370212" into jb-mr1-dev 
* commit '07a9ebd1a01bc2819a90ddc98263a24bd6459768':
  Take into account the texture layer's transform for clipping Bug #7370212
 2012-10-17 19:21:20 -07:00