69426 Commits

Author SHA1 Message Date
James Dong
8e3fac28a0 Merge "Fixed a buffer overflow bug in DrmPassthruPlugin" 2012-03-14 10:43:18 -07:00
James Dong
2bab6b63c7 Merge "Turned off log spamming from DrmPassthruPlugin" 2012-03-14 10:43:12 -07:00
Gilles Debunne
48b050a213 Merge "Use SpanSet to accelerate Layout.drawBackground" 2012-03-14 10:40:02 -07:00
Eino-Ville Talvala
0016813784 Merge "Add references to MediaActionSound in Camera documentation." 2012-03-14 10:34:05 -07:00
Michael Jurka
605eabf6a2 Merge "Fix hardware layer redraw bug" 2012-03-13 19:56:33 -07:00
James Dong
32d8fc8d6d Fixed a buffer overflow bug in DrmPassthruPlugin
Change-Id: I8df2a90409c9266a094a1a0904a5ff76ec483d16
2012-03-13 19:23:23 -07:00
James Dong
c3259471c6 Turned off log spamming from DrmPassthruPlugin
Change-Id: I2cecdba49cf044d2aafd8aa404d27df311cad401
2012-03-13 18:54:16 -07:00
Michael Jurka
952e02b430 Fix hardware layer redraw bug 2012-03-13 18:35:10 -07:00
Romain Guy
67c7377ef1 Merge "Correctly compute the number of bytes written by each op. Bug #6157792" 2012-03-13 18:02:55 -07:00
Romain Guy
390f882f89 Correctly compute the number of bytes written by each op.
Bug #6157792

Previously, DisplayListRenderer would compute the number of bytes
written after a drawing op by looking at the difference between
the start pointer of the command stream and the end pointer of
the command stream. The SkWriter class used to record the commands
stream allocates blocks of storage which would cause a crash when
a command spanned two blocks.

Change-Id: I4d79d3feeb6d72d9d4e6ab05ecebd72d004be56c
2012-03-13 18:00:10 -07:00
Jason Sams
29000644ae Merge "Fix test makefile" 2012-03-13 16:54:11 -07:00
Jason Sams
759eb4e8f0 Fix test makefile
bug=5972398

Change-Id: I9298e08220863eecf5c87047a05d7aa146a4c060
2012-03-13 16:22:46 -07:00
Gilles Debunne
60e3b3fa60 Use SpanSet to accelerate Layout.drawBackground
The main performance improvement should come from the fact
that we entirely skip the loop (which calls getLineStart, getLineTop
and getLineDescent on each line) in the frequent case where there
are no LineBackgroundSpans.

Change-Id: Ie2d3168521e88d43f1a4236da2b3e8447606df1e
2012-03-13 15:58:33 -07:00
Gilles Debunne
6810a2442b Merge "New SpanSet class extracted from TextLine." 2012-03-13 15:56:07 -07:00
Philip Milne
b001475fc5 Merge "Fixes for bugs: #6103660, #6103957, #6104457 and #6104322." 2012-03-13 15:32:20 -07:00
Philip Milne
1018fb42cb Fixes for bugs: #6103660, #6103957, #6104457 and #6104322.
Add getters and setters to the layout widgets so as to mirror their XML apis.

Change-Id: Ie2237fd55e1c3e4ec0d08b4f8154ea7e122c1e79
2012-03-13 15:22:07 -07:00
Jeff Brown
9dc348d756 Merge "Fix spurious ANRs in native activities." 2012-03-13 15:15:48 -07:00
Wink Saville
f2fbd2eda5 Merge "Telephony: Make IccFileHandler use ci instead of phone" 2012-03-13 15:10:55 -07:00
Jeff Brown
2b6c32ca41 Fix spurious ANRs in native activities.
Some native activities experienced ANRs when the input consumer
deferred an input event due to client-side batching.  If the
input channel was fully emptied then the client had no way of
knowing that it should wake up to handle the deferred input event.

This patch also fixes some lock issues in the native activity
input queue implementation.  In at least one error case, it
was possible for a function to exit without releasing the lock.

Bug: 6051176
Change-Id: I4d9d843237e69b9834f8d8b360031b677fcab8c3
2012-03-13 15:00:09 -07:00
Gilles Debunne
4ffb879f48 New SpanSet class extracted from TextLine.
Change-Id: I424dbd7ff0693fd465b6c83ebabba221b2eca6fe
2012-03-13 14:58:37 -07:00
Daniel Lam
2e76c992bf SurfaceTexture: Fully refactored from BufferQueue
Cleaning up camera and media interactions as part of SurfaceTexture refactoring

Change-Id: Iea2b10ff80b5f01f83ed0902c725df1d3b4c541a
2012-03-13 14:39:28 -07:00
Eric Fischer
dc19246853 Merge "Import translations. DO NOT MERGE" 2012-03-13 14:25:21 -07:00
Eric Fischer
39cfc7c1cc Merge "Import translations. DO NOT MERGE" 2012-03-13 14:25:11 -07:00
Eric Fischer
55baedbea0 Import translations. DO NOT MERGE
Change-Id: Ifae737940ed904103eb4177dcb0fe6256f1f1fbb
2012-03-13 14:17:47 -07:00
Robert Greenwalt
8e94c25f5d Merge "Record the trimmed cmd string for logs" 2012-03-13 14:13:07 -07:00
Eric Fischer
6e3735fa01 Import translations. DO NOT MERGE
Change-Id: I1797f7d37caafea3764ef0d95a3ab7b8f6bd16ab
2012-03-13 14:04:22 -07:00
Marco Nelissen
1c1d1e7ed7 Merge "Gapless playback, step 1." 2012-03-13 13:23:07 -07:00
Marco Nelissen
84b8320545 Gapless playback, step 1.
Currently able to play Ogg Vorbis, PCM WAV and other lossless files seamlessly
by reusing the initial AudioTrack for subsequent players.

Change-Id: Ie7cf6b9076bdf4f9211574456d192c02c04fecc7
2012-03-13 13:13:14 -07:00
Eino-Ville Talvala
586d365e00 Merge "Check for null characters being used in camera parameters." 2012-03-13 13:03:48 -07:00
Fabrice Di Meglio
41efc44754 Merge "Move LocalUtil unit tests from Frameworks to CTS" 2012-03-13 12:51:59 -07:00
Fabrice Di Meglio
1103beee44 Move LocalUtil unit tests from Frameworks to CTS
Change-Id: I9f3333a4fdf7ccbe71e5bd5a9bd0104551efb724
2012-03-13 12:49:53 -07:00
James Dong
7cd59760be Merge "Switched to use the header files in /frameworks/native and deleted the duplicate header files in /frameworks/base" 2012-03-13 12:44:54 -07:00
Robert Greenwalt
d192598d3e Record the trimmed cmd string for logs
The over the wire command includes a \0 that mangles log messages.
bug:6149176

Change-Id: I77d4e443f1966bff060f1b97570851f7549fee8e
2012-03-13 12:30:14 -07:00
Craig Mautner
a1b09a92d8 Merge "Set the reason for screen-off before usage." 2012-03-13 12:21:09 -07:00
Daniel Lehmann
53567a756e Merge "Introduce READ_CALL_LOG and WRITE_CALL_LOG" 2012-03-13 12:17:45 -07:00
Chet Haase
278836e22c Merge "Fix garbage deref with DisplayList property structures" 2012-03-13 11:51:46 -07:00
Chet Haase
491189f6bb Fix garbage deref with DisplayList property structures
This is the real fix to issue 6158892. We currently delete
transform/camera structures at DisplayList destructor time, if these
structures are not NULL. We set the fields to NULL in an init() method
called (eventually) by the constructor. But it is possible for the object
to be destroyed before that init code is called, resulting in the deref
bug reported. The fi is to set these structures to NULL directly in the
constructor.

Issue 6158892i: Device runtime restarts frequently

Change-Id: Ibfa0f9314767eed6fd51f4ec7edc0d0edd5fdd0f
2012-03-13 11:42:34 -07:00
Alex Yakavenka
2b75d12a7b Telephony: Make IccFileHandler use ci instead of phone
Change-Id: I94889b5b7954d9c16721f12145e8412ba418ac12
2012-03-13 11:39:03 -07:00
Craig Mautner
44bf70fba2 Set the reason for screen-off before usage.
An occasional call sequence through updateLightsLocked ended up storing
the old screen-off reason rather than the current screen-off reason.
This caused the Keyguard screen to be bypassed when turning back on. By
saving the power-off reason in mScreenOffReason prior to calling
updateLightsLocked we eliminate this problem.

The offending calling sequence was:
  PowerManagerService.setPowerState(..., reason) => updateLightsLocked
  => animateTo => screenOffFinishedAminatingLocked(mScreenOffReason)
  => sendNotificationLocked.

Change-Id: I8ee0b3226f94af7ff7e7b7b0bf54e47fd0c03631
2012-03-13 11:38:38 -07:00
Glenn Kasten
a2d68c9394 Merge "Whitespace and indentation" 2012-03-13 11:35:12 -07:00
Romain Guy
3c9d9c18b4 Merge "Follow the include style used elsewhere in the library" 2012-03-13 11:19:26 -07:00
Romain Guy
d5a85fb63d Follow the include style used elsewhere in the library
Change-Id: I14aebdaeb04b6f4c611153ece4ac1f6ad9bfc15f
2012-03-13 11:18:20 -07:00
George Mount
e5359373e0 Merge "Support "prev" for IME input." 2012-03-13 11:16:47 -07:00
Chet Haase
8d4ada4cd3 Merge "Fix garbage deref in DisplayList structures" 2012-03-13 11:16:03 -07:00
Chet Haase
866ed817d0 Fix garbage deref in DisplayList structures
Issue #6158892: Device runtime restarts frequently

Change-Id: I4e6afaaf9ac66d6846caf0ed82ea67163d8b15c2
2012-03-13 11:13:36 -07:00
Glenn Kasten
18db49a462 Whitespace and indentation
Fix indentation to be multiple of 4.
Make it easier to search:
  sp< not sp < to
  "switch (...)" instead of "switch(...)" (also "if" and "while")
Remove redundant blank line at start or EOF.
Remove whitespace at end of line.
Remove extra blank lines where they don't add value.

Use git diff -b or -w to verify.

Change-Id: I966b7ba852faa5474be6907fb212f5e267c2874e
2012-03-13 11:09:47 -07:00
Alex Sakhartchouk
0657813970 Merge "Using the rs API instead." 2012-03-13 09:31:22 -07:00
James Dong
c830e7db7f Merge "Fixing coding style : Indentation" 2012-03-13 09:21:37 -07:00
Irfan Sheriff
a52bf287cf Merge "Improve network avoidance" 2012-03-13 08:36:47 -07:00
Glenn Kasten
f4c072d421 Merge "Clean up assertion checks" 2012-03-13 07:16:44 -07:00