68369 Commits

Author SHA1 Message Date
Jason Sams
a6f338ca5f Do RS caching the same way HardwareRenderer does.
Eliminates the need for an application context for caching.

Change-Id: I4374738083b5eb4ce983d2cb5409428e3668c423
2012-02-24 16:22:16 -08:00
Glenn Kasten
26debac448 Move declaration of mixerStatus to inner block
mixerStatus was being declared (and initialized) too early,
which also resulted in a duplicate initialization.  Moved
the declaration into the block where it is actually used.

Change-Id: Ifdcfefe362a5efe3493dd616cdb44645c6f9aed5
2012-02-24 16:14:46 -08:00
Dianne Hackborn
b69b2c01b4 Fix build.
Change-Id: Id3262bff0df598ecc81a4346dee9febd3aaa60c9
2012-02-24 16:10:26 -08:00
Glenn Kasten
2521a01970 Pull out duplicated copies of silent mode check
Also fix the error handling for the property_get.

This is part of preparation for the threadLoop() merge.

Change-Id: I6405190ea18146d1271575e1dfe9f279e8f36b17
2012-02-24 16:02:24 -08:00
James Dong
e82f055e3e Only allow valid types to be used in DrmErrorEvent and DrmInfoEvent
o This patch will prevent applications from abusing the API by using
  arbitrary int value for DrmErrorEvent or DrmInfoEvent types.
o We should have not defined some type constants in the super/base
  class, DrmEvent.

Change-Id: Id0bb12caa8ce471cb6951cc2b5d37ea408f90063
2012-02-24 15:50:41 -08:00
Dianne Hackborn
56694cec11 am 92ce6314: am 140da7c4: am 133dc2d7: Merge "Fix issue #6048808: sometimes auto-correct is inactive" into ics-mr1
* commit '92ce6314c15bd6d59a94a247ae63f1da9b4ccab2':
2012-02-24 15:47:40 -08:00
Dianne Hackborn
0aec3ea6de am 911b505f: am dc5fa185: am 133dc2d7: Merge "Fix issue #6048808: sometimes auto-correct is inactive" into ics-mr1
* commit '911b505f11c719906985f169a4f45930bdec8695':
  Fix issue #6048808: sometimes auto-correct is inactive
2012-02-24 15:44:55 -08:00
Dianne Hackborn
92ce6314c1 am 140da7c4: am 133dc2d7: Merge "Fix issue #6048808: sometimes auto-correct is inactive" into ics-mr1
* commit '140da7c4140f0536c3fad1f7be555ebd58055b63':
2012-02-24 15:42:43 -08:00
Dianne Hackborn
911b505f11 am dc5fa185: am 133dc2d7: Merge "Fix issue #6048808: sometimes auto-correct is inactive" into ics-mr1
* commit 'dc5fa1859d03ecca36fc6be2fed7bbd4ba70b51f':
  Fix issue #6048808: sometimes auto-correct is inactive
2012-02-24 15:41:35 -08:00
Dianne Hackborn
dc5fa1859d am 133dc2d7: Merge "Fix issue #6048808: sometimes auto-correct is inactive" into ics-mr1
* commit '133dc2d7aecc68990c363c861716b134910a4ced':
  Fix issue #6048808: sometimes auto-correct is inactive
2012-02-24 15:38:07 -08:00
Dianne Hackborn
140da7c414 am 133dc2d7: Merge "Fix issue #6048808: sometimes auto-correct is inactive" into ics-mr1
* commit '133dc2d7aecc68990c363c861716b134910a4ced':
  Fix issue #6048808: sometimes auto-correct is inactive
2012-02-24 15:38:03 -08:00
Dianne Hackborn
133dc2d7ae Merge "Fix issue #6048808: sometimes auto-correct is inactive" into ics-mr1 2012-02-24 15:36:33 -08:00
Mathias Agopian
7b49b4bea8 Merge "deprecate L_8, LA_88 and RGB_332 in sdk" 2012-02-24 15:09:54 -08:00
Robert Greenwalt
6513daef5e Merge "Seperate RIL constants from the framework." 2012-02-24 15:02:30 -08:00
Mathias Agopian
e9d4c71f47 deprecate L_8, LA_88 and RGB_332 in sdk
re-add support for pixelformats L_8, LA_88 and RGB_332 in libui
for backward compatibility.

This may or may not fix 6058926

Bug: 6049685
Change-Id: Ic1b8b4cc994522f7fe664da64c0ef76b98bc6d53
2012-02-24 14:58:36 -08:00
Glenn Kasten
baad42e3a3 Merge "Pull CPU statistics code out of threadLoop()" 2012-02-24 14:25:15 -08:00
Jason Sams
9733f26093 test runs but I do not check results yet.
Change-Id: I427581a301bb1a9710554187accad2d6f9d9b10c
2012-02-24 14:24:56 -08:00
Alex Sakhartchouk
20c9c92ec6 Removing GL calls from librs
Change-Id: Ida22199a33f0f9fd534dcc5951d12937967a187b
2012-02-24 14:22:34 -08:00
The Android Open Source Project
1a9e08e406 am 5cb79935: am 2ddd7b3e: Reconcile with ics-mr1-release
* commit '5cb79935b9ebb74a410d78a986391dda6e9f7994':
2012-02-24 14:14:47 -08:00
The Android Open Source Project
5cb79935b9 am 2ddd7b3e: Reconcile with ics-mr1-release
* commit '2ddd7b3e8753816ccaaf5e2fe5b0b51892c4c853':
2012-02-24 14:12:35 -08:00
The Android Open Source Project
2ddd7b3e87 Reconcile with ics-mr1-release
Change-Id: Ib2f215bb3db0195c35ca5bc645df38d46061dc7e
2012-02-24 14:05:51 -08:00
The Android Open Source Project
243732e356 am cb20fab2: am aac21480: Reconcile with ics-mr1-release
* commit 'cb20fab2ee39cfcb43400b88098b75a8aab4b0e0':
2012-02-24 14:04:16 -08:00
Andreas Huber
3be5aad4d9 Merge "Make sure we return input/output buffers to the codec not just while" 2012-02-24 14:03:27 -08:00
Andreas Huber
ed07dafc2e Merge "Fix two more locations that use the old setObject("buffer", ...) paradigm" 2012-02-24 14:02:52 -08:00
The Android Open Source Project
cb20fab2ee am aac21480: Reconcile with ics-mr1-release
* commit 'aac214800b518259306960ff9cc90de65d095398':
2012-02-24 14:01:27 -08:00
Andreas Huber
b5ef6e5d94 Make sure we return input/output buffers to the codec not just while
flushing but also while stopping.

Change-Id: I23534008b93654c9b9c022c0b1d204c2b546d566
2012-02-24 13:58:09 -08:00
The Android Open Source Project
aac214800b Reconcile with ics-mr1-release
Change-Id: I496b3ff789ad7d4cb5f3cf720fbcab423a3694f6
2012-02-24 13:57:46 -08:00
Glenn Kasten
6ec27552a0 Pull CPU statistics code out of threadLoop()
This is to prepare for the threadLoop() merge

Change-Id: I118c7d5c6b011b5d5b95ec7d63fb03feb166a9cf
2012-02-24 13:56:12 -08:00
Andreas Huber
6281fa1d93 Fix two more locations that use the old setObject("buffer", ...) paradigm
that I'd previously missed.

Change-Id: Ifbdbfb94d1bc1cbe8c0a403fed05ce99fca8397b
2012-02-24 13:42:47 -08:00
Glenn Kasten
23c9c74017 Fix tracking of hardware state for dump
At end of AudioFlinger::onFirstRef(), the hardware status was being left
in wrong state.  It should be AUDIO_HW_IDLE but was AUDIO_HW_INIT.

mHardwareStatus was being set to AUDIO_HW_OUTPUT_OPEN too early, and so
a return would leave it in the wrong state until next hardware operation.

Take the hardware lock for dev->get_parameters, and update mHardwareStatus
before and after.

Keep hardware lock only for the duration of the dev->set_parameters.

Rename two constants in enum hardware_call_state to have the prefix
AUDIO_HW so they follow the naming conventions.

Add comments.

Change-Id: I6c7450b11f9b13adaeef9cec874333e478a58fc0
2012-02-24 13:31:26 -08:00
Dianne Hackborn
7663d80f6b Fix issue #6048808: sometimes auto-correct is inactive
My previous change to speed up the time the IME is dismissed was
fundamentally flawed.  That change basically switched the order
the application called the input method manager service from doing
startInput() and then windowGainedFocus(), to first windowGainedFocus()
and then startInput().

The problem is that the service relies on startInput() being done
first, since this is the mechanism to set up the new input focus,
and windowGainedFocus() is just updating the IME visibility state
after that is done.  However, by doing the startInput() first, that
means in the case where we are going to hide the IME we must first
wait for the IME to re-initialize editing on whatever input has
focus in the new window.

To address this, the change here tries to find a half-way point
between the two.  We now do startInput() after windowGainedFocus()
only when this will result in the window being hidden.

It is not as easy as that, though, because these are calls on to
the system service from the application.  So being able to do that
meant a fair amount of re-arranging of this part of the protocol
with the service.  Now windowGainedFocus() is called with all of
the information also needed for startInput(), and takes care of
performing both operations.  The client-side code is correspondingly
rearranged so that the guts of it where startInput() is called can
instead call the windowGainedFocus() entry if appropriate.

So...  in theory this is safer than the previous change, since it
should not be impacting the behavior as much.  In practice, however,
we are touching and re-arranging a lot more code, and "should" is
not a promise.

Change-Id: Icb58bef75ef4bf9979f3e2ba88cea20db2e2c3fb
2012-02-24 13:18:23 -08:00
Glenn Kasten
d366515421 Merge "Remove TrackBase::mFlags" 2012-02-24 13:17:36 -08:00
Glenn Kasten
3526982c1d Remove TrackBase::mFlags
The bit-field TrackBase::mFlags was supposed to have track-specific
flags in the upper 16 bits, and system flags in the lower 16 bits.

The upper 16 bits of mFlags were initialized in the TrackBase
constructor from the flags parameter of IAudioFlinger::createTrack()
and IAudioFlinger::openRecord(), and the lower 16 bits were cleared.

However, the upper 16 bits of mFlags were never acccessed again.
So really there are no track-specific flags.  I left the flags
in the parameter list of createTrack() and openRecord() but made a
note that these should be removed eventually as they are dead.

This leaves only the one system flag "step server failed".  I replaced
the bit-field mFlags by bool mStepServerFailed, which is simpler and
slightly faster.

Change-Id: I6650f5487be72791b4a67d73adcd10ffa04e2aa5
2012-02-24 13:14:28 -08:00
Martin Storsjo
dafebd6bfc stagefright amrnb: Remove extern from table definitions
Local prototype declarations are added where no suitable ones are
available in headers.

This fixes warnings when compiling as C - while the source
files are named .cpp, they actually are compileable as pure C.

This was committed on the master branch of the opencore
repository in commit a0acb494ea6682ca966b5ebbd3676c89c56d63a6,
based on AOSP contribution 10303.

Change-Id: Ib4e27ea30302c66e0233e63e5a4652f6339bc940
2012-02-24 23:07:49 +02:00
Martin Storsjo
9cb864de44 stagefright amrnb: Add includes for prototype declarations of tables
This was committed on the master branch of the opencore
repository in commit da3d0463c999871ee584a0d750be65be65d19b00,
based on AOSP contribution 10302.

Change-Id: I4ad5526634efecc2d2bb3d2169184b8d4d4d7671
2012-02-24 23:07:40 +02:00
Martin Storsjo
67d536a971 stagefright amrnb: Add missing const qualifier to table declarations in headers
This was committed on the master branch of the opencore
repository in commit 5ce7a6fdf125116ffce2e692e14eafef1c807628,
based on AOSP contribution 10301.

Change-Id: Ie32b32c7407f449e382c0b4fd2d60a664e0daa33
2012-02-24 23:07:29 +02:00
Martin Storsjo
7a60831412 stagefright amrwb: Make a global const array static
This fixes compilation as C - while the source files are named
.cpp, they actually are compileable as pure C. Prior to this,
this table produced multiple definitions of the same symbol.

This was committed on the master branch of the opencore
repository in commit a803bd49a631317e0d52ff060cf1799f7741a47e,
based on AOSP contribution 10017.

Change-Id: Id76274964242b119ab61b8181e557477df1e1521
2012-02-24 23:04:24 +02:00
Martin Storsjo
b3094e4a0e stagefright amrwb: Make local const arrays static
Some of these tables exist in both the amrnb and amrwb libraries,
but with different content.

This avoids some cases of multiple definitions of symbols, if
linking in both libraries statically into the same executable,
if the libraries are built as C. (As C++, the local symbols
get mangled so they don't conflict with the external C symbols
in amrnb, that are unmangled.)

Most of this was committed on the master branch of the opencore
repository in commit 0cd4b3ac412dd0a8370ce339e89cf346c6cfe395,
based on AOSP contribution 10016.

Change-Id: I5387e699ce54a56dc43fcfa0396dee5c99280fd9
2012-02-24 23:03:10 +02:00
Martin Storsjo
ab0149852b stagefright amrwb: Change a C++ style cast into a C style cast
This fixes compilation as C - while the source files are named
.cpp, they actually are compileable as pure C (except for this
cast).

This was committed on the master branch of the opencore
repository in commit ae27d9b2ef68c4e6fc383a8cab93d6baa235ff6b,
based on AOSP contribution 10014.

Change-Id: I4f533313be041ad3e0a03ffc5f4207480894ddd1
2012-02-24 23:01:24 +02:00
Eric Fischer
2db8d82ebf Import translations. DO NOT MERGE
Change-Id: I2c3594ab6bee0ee334f98c0c403a3de295b8fa05
2012-02-24 12:42:07 -08:00
Svetoslav Ganov
16bb9ab384 Merge "Regression: Cannot query the content of certain windows." 2012-02-24 11:33:46 -08:00
Siva Velusamy
8293c92c75 gltrace: attach buffer data sent with glBufferData
Attach the buffer that is passed with glBufferData
and glBufferSubData to the proto buf.

Change-Id: I1b4c1172d405736b06cb0a356a6e241e1d60c4d5
2012-02-24 11:32:00 -08:00
Svetoslav Ganov
00d0c14a0f Regression: Cannot query the content of certain windows.
1. A bad merge on my part caused ViewRootImpl not to register
   for accessibility state change.

bug:6064348

Change-Id: Idf7b8b444e9021e9d9ec3749164cfe448c8268ab
2012-02-24 11:31:17 -08:00
Jean-Baptiste Queru
6b48f088b1 am ed7e1e83: am 47023027: am 26d9944e: am 6a300a54: Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned"
* commit 'ed7e1e830165678421ee7d1b3dac044214a6e635':
  stagefright aacenc: Make the bits to write in WriteBits unsigned
2012-02-24 11:11:10 -08:00
Jean-Baptiste Queru
ed7e1e8301 am 47023027: am 26d9944e: am 6a300a54: Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned"
* commit '470230275431c8ae85debc3c089b6942c55fef0f':
  stagefright aacenc: Make the bits to write in WriteBits unsigned
2012-02-24 11:07:45 -08:00
Jean-Baptiste Queru
4702302754 am 26d9944e: am 6a300a54: Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned"
* commit '26d9944e3f75123708ef0cfb158f48709348a361':
  stagefright aacenc: Make the bits to write in WriteBits unsigned
2012-02-24 11:05:15 -08:00
Jean-Baptiste Queru
26d9944e3f am 6a300a54: Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned"
* commit '6a300a5413898ff8b728e77c5a23290cae60e9b5':
  stagefright aacenc: Make the bits to write in WriteBits unsigned
2012-02-24 11:02:29 -08:00
Martin Storsjo
a9e1747f9e stagefright aacenc: Remove a stray semicolon
This avoids warnings about an empty body in an if statement.

mem_free does the same null check, so the accidental extra
semicolon was harmless, and the whole if statement actually
is needless. But if removing the if statements, all the
other ones should be removed too, for consistency.
(This could be done as a separate change).

Change-Id: I1b6064dedd15ffa949043bb5396148aaed9b43f6
2012-02-24 21:01:26 +02:00
Martin Storsjo
e3c3499468 stagefright aacenc: Add prototypes for arm specific implementations of functions
The arm specific functions are implemented in .s files,
without any function declarations in headers.

This fixes compiler warnings about implicit declarations
of these functions.

Change-Id: I1512560b6740c1879f378886e05aaad2e3a6c869
2012-02-24 20:56:11 +02:00
Martin Storsjo
4a12db6d4e stagefright amrwbenc: Change keyword ordering
This avoids warnings about 'static' not being at the beginning
of the declarations.

Change-Id: I80f91b8a0f7f61edcdca96c206fedbd74ec0d88e
2012-02-24 20:54:26 +02:00