469 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
fa101530bc resolved conflicts for merge of d26707da to master
Change-Id: I1a379194f70c4b14191333ca2d8e6dd9d8b0f9dd
2010-01-12 11:53:42 -08:00
San Mehat
d26707da89 am c93c70c4: Merge "framework: storage: Ensure that filesystems are unmounted before shutdown/reboot" into eclair
Merge commit 'c93c70c4b849d31ff1b5e5cf2fb9462fd60e5da0' into eclair-plus-aosp

* commit 'c93c70c4b849d31ff1b5e5cf2fb9462fd60e5da0':
  framework: storage: Ensure that filesystems are unmounted before shutdown/reboot
2010-01-12 10:02:40 -08:00
San Mehat
7ebf017658 framework: storage: Ensure that filesystems are unmounted before shutdown/reboot
Signed-off-by: San Mehat <san@google.com>
2010-01-12 07:57:42 -08:00
Joe Onorato
f5d95cbc1a less log spew 2010-01-08 15:46:24 -05:00
Dan Egnor
6916089e83 Remove old EventLog tests from here, they will be replaced by a
(better) EventLog test in CTS.

Fix some minor errors in the handling of too-large event log values.
2010-01-07 00:28:58 -08:00
Joe Onorato
dc4cc3f469 Stop spamming the log. 2010-01-06 14:07:28 -08:00
Dan Egnor
62136d3e1c Simplify EventLog interface -- remove supported for nested
sequences (which nobody used) and streamline the API, adding
documentation in preparation for inclusion in the SDK.

Gut and deprecate EventLogTags, which unfortunately was put
into the public SDK (an oversight).  Include the functionality
in EventLog proper, in a simpler and easier to use manner.

This change doesn't actually un-@hide anything, but it does
change it to @pending.
2010-01-06 12:30:12 -08:00
Marco Nelissen
7bcbd51173 Don't round size to page size. Ashmem will do this internally as needed. 2010-01-04 09:54:45 -08:00
Dave Sparks
c95a176d6f Remove some logging from camera operations. Bug 2346606. 2010-01-04 08:55:04 -08:00
Jack Palevich
a6276fdd42 A library for encoding and decoding ETC1 textures.
The ETC1 compressed texture format is commonly
supported by OpenGL ES 2.0-capable devices.
2009-12-31 13:31:04 +08:00
Jean-Baptiste Queru
5237f019b9 am c4978805: merge from open-source master
Merge commit 'c4978805dc8837570701629a9b8098e80804ad34'

* commit 'c4978805dc8837570701629a9b8098e80804ad34':
  ImageButton example doesn't work. Default state should be at the last.
  Time.parse3339 range checking and proper 'sec-frac' skip
2009-12-21 15:52:57 -08:00
Jean-Baptiste Queru
c4978805dc merge from open-source master 2009-12-21 15:32:25 -08:00
Mike Reed
f7ed3a2b0f am 0249c83e: am 31a69fdb: throw if we have a null typeface native instance (so we don\'t crash in native code) we may still have to native-destroy a Typeface with a null ref, so check for that
Merge commit '0249c83ed014cc6a36caac30e55db62c29c204e2'

* commit '0249c83ed014cc6a36caac30e55db62c29c204e2':
  throw if we have a null typeface native instance (so we don't crash in native code)
2009-12-17 09:27:42 -08:00
Mike Reed
31a69fdbe1 throw if we have a null typeface native instance (so we don't crash in native code)
we may still have to native-destroy a Typeface with a null ref, so check for that
2009-12-17 12:18:44 -05:00
Jaikumar Ganesh
ef3308790a am 57043a67: am 43ad522d: Merge change Ic0e32f12 into eclair-mr2
Merge commit '57043a675f8826099e619c5d325fc7670be83e0b'

* commit '57043a675f8826099e619c5d325fc7670be83e0b':
  Add a callback for the ConnectSink Call.
2009-12-16 16:31:25 -08:00
Jaikumar Ganesh
c0e32f1243 Add a callback for the ConnectSink Call.
This takes care of the conditions where the bluez audio drivers
are not up and we try to make the call to connect the sink.
This would get rid of the hack in Settings app.
2009-12-16 11:42:06 -08:00
Dianne Hackborn
314664d247 am 68a3b8b6: am 24eca800: Merge change I887f355f into eclair-mr2
Merge commit '68a3b8b66044d0a9fa901ad306fc6db6d13f94d3'

* commit '68a3b8b66044d0a9fa901ad306fc6db6d13f94d3':
  Propagate background scheduling class across processes.
2009-12-10 07:05:18 -08:00
Jack Palevich
981ccfbbfd Implement Matrix Palette extension.
Adds support for formerly-unimplemented methods:

glCurrentPaletteMatrixOES
glLoadPaletteFromModelViewMatrixOES
glMatrixIndexPointerOES
glWeightPointerOES

The bulk of the changes are related to implementing the two PointerOES
methods, which are implemented pretty much the same way as the existing
Pointer methods were implemented.

This change also changes the way glPointSizePointerOES is implemented,
making it act like all the other Pointer methods. (Previously it was
not handling non-direct-buffer arguments correctly.)

Fixes bug 2308625 "Support matrix palette skinning
in JSR239 and related APIs"

Also updated GLLogWraper to fix two bugs in GLLogWrapper that were
discovered while testing matrix palette skinning support:

a) Handle trying to print the contents of null-but-enabled buffers.
(It's not legal to draw with null-but-enabled buffers, and
in fact some OpenGL drivers will crash if you try to render in this
state, but there's no reason the GLLogWrapper should crash while trying
to debug this situation.

b) Don't read off the end of a vertex buffer with non-zero position when
printing the entire contents of the vertex buffer. Now we only print from
the current position to the end of the buffer.
2009-12-09 16:34:46 +08:00
Jack Palevich
3608891b83 Add a Java API for OpenGL ES 2.0.
Currently this API is hidden.

Add a test program.
2009-12-09 16:34:33 +08:00
Android (Google) Code Review
5c47265a70 Merge change Ibe6eac82
* changes:
  Implement Matrix Palette extension.
2009-12-08 20:13:44 -08:00
Jack Palevich
be6eac828f Implement Matrix Palette extension.
Adds support for formerly-unimplemented methods:

glCurrentPaletteMatrixOES
glLoadPaletteFromModelViewMatrixOES
glMatrixIndexPointerOES
glWeightPointerOES

The bulk of the changes are related to implementing the two PointerOES
methods, which are implemented pretty much the same way as the existing
Pointer methods were implemented.

This change also changes the way glPointSizePointerOES is implemented,
making it act like all the other Pointer methods. (Previously it was
not handling non-direct-buffer arguments correctly.)

Fixes bug 2308625 "Support matrix palette skinning
in JSR239 and related APIs"

Also updated GLLogWraper to fix two bugs in GLLogWrapper that were
discovered while testing matrix palette skinning support:

a) Handle trying to print the contents of null-but-enabled buffers.
(It's not legal to draw with null-but-enabled buffers, and
in fact some OpenGL drivers will crash if you try to render in this
state, but there's no reason the GLLogWrapper should crash while trying
to debug this situation.

b) Don't read off the end of a vertex buffer with non-zero position when
printing the entire contents of the vertex buffer. Now we only print from
the current position to the end of the buffer.
2009-12-08 15:43:51 +08:00
Dianne Hackborn
887f355f99 Propagate background scheduling class across processes.
This is a very simply implementation: upon receiving an IPC, if the handling
thread is at a background priority (the driver will have taken care of
propagating this from the calling thread), then stick it in to the background
scheduling group.  Plus an API to turn this off for the process, which is
used by the system process.

This also pulls some of the code for managing scheduling classes out of
the Process JNI wrappers and in to some convenience methods in thread.h.
2009-12-07 19:11:14 -08:00
Eric Laurent
feab08b901 am e30bae7f: am b8341cf7: am 6d42d806: Merge change I9cc489a2 into eclair
Merge commit 'e30bae7f8ef0489788c155ae44d9a57beca1acf5'

* commit 'e30bae7f8ef0489788c155ae44d9a57beca1acf5':
  Fix issue 2304669: VoiceIME: starting and canceling voice IME yields persistent "error 8" state on future attempts and breaks voice search.
2009-12-07 18:33:53 -08:00
Christopher Tate
0303edf957 am a26b0a40: am ed6dd2e6: am d3bc1994: Merge change I397b6a93 into eclair
Merge commit 'a26b0a401b6aadb45fa58d1d05b3112fbfda3fba'

* commit 'a26b0a401b6aadb45fa58d1d05b3112fbfda3fba':
  Don't accidentally signal multiple exceptions in setThreadPriority()
2009-12-07 14:52:56 -08:00
Eric Laurent
b8341cf7c8 am 6d42d806: Merge change I9cc489a2 into eclair
Merge commit '6d42d80653f2c41f3e72a878a1d9a6f9693b89f7' into eclair-mr2

* commit '6d42d80653f2c41f3e72a878a1d9a6f9693b89f7':
  Fix issue 2304669: VoiceIME: starting and canceling voice IME yields persistent "error 8" state on future attempts and breaks voice search.
2009-12-07 11:03:17 -08:00
Eric Laurent
9cc489a219 Fix issue 2304669: VoiceIME: starting and canceling voice IME yields persistent "error 8" state on future attempts and breaks voice search.
Fixed AudioFlinger::openInput() broken in change ddb78e7753be03937ad57ce7c3c842c52bdad65e
so that an invalid IO handle (0) is returned in case of failure.
Applied the same correction to openOutput().
Modified RecordThread start procedure so that a failure occuring during the first read from audio input stream is detected and causes
the record start to fail.
Modified RecordThread stop procedure to make sure that audio input stream fd is closed before we exit the stop function.

Fixed AudioRecord JAVA and JNI implementation to take status of native AudioRecord::start() into account
and not change mRecordingState to RECORDSTATE_RECORDING if start fails.
2009-12-07 05:37:47 -08:00
Christopher Tate
ed6dd2e6a5 am d3bc1994: Merge change I397b6a93 into eclair
Merge commit 'd3bc1994b0c2c5e9c60fa748de47eebbe1984fda' into eclair-mr2

* commit 'd3bc1994b0c2c5e9c60fa748de47eebbe1984fda':
  Don't accidentally signal multiple exceptions in setThreadPriority()
2009-12-04 12:54:36 -08:00
Christopher Tate
41c4bea27c Don't accidentally signal multiple exceptions in setThreadPriority()
After signalling an exception due to set_sched_policy() failing (probably
because the thread in question had exited before this function was called), we
proceeded to call setpriority() anyway, and raised *another* exception when it
also failed.  We don't do this any more; we just bail after signalling the first
exception.

Change-Id: I397b6a93c73d3f0870176e26759f2bec33e56205
2009-12-04 11:07:48 -08:00
San Mehat
fb6aafd8f9 am ca84ac88: am d345c6ac: am 0a42b811: base: process: Abort setting the process group if one of the threads fails to switch
Merge commit 'ca84ac88c7f6940677f9b796b21779e53965bf06'

* commit 'ca84ac88c7f6940677f9b796b21779e53965bf06':
  base: process: Abort setting the process group if one of the threads fails to switch
2009-12-04 04:27:12 -08:00
San Mehat
d345c6aced am 0a42b811: base: process: Abort setting the process group if one of the threads fails to switch
Merge commit '0a42b811aea490a9a605b75f0320101f6eafd283' into eclair-mr2

* commit '0a42b811aea490a9a605b75f0320101f6eafd283':
  base: process: Abort setting the process group if one of the threads fails to switch
2009-12-03 12:45:59 -08:00
San Mehat
0a42b811ae base: process: Abort setting the process group if one of the threads fails to switch
Signed-off-by: San Mehat <san@google.com>
2009-12-03 12:23:00 -08:00
Mike Lockwood
726a570258 resolved conflicts for merge of dfaf2e03 to master
Change-Id: I440d2042dd404a421789063e42102699fa33b7c0
2009-11-25 15:05:51 -05:00
Mike Lockwood
3a32213c40 Remove HardwareService and move vibrator support to VibratorService.
The lights support is only needed by PowerManagerService and NotificationManagerService, so we do not need a Binder API for it.
Move backlight and notification light support to new LightsService class.
The camera flash is now handled directly by the camera HAL, so the flash Hardware service flash support is obsolete.

Change-Id: I086d681f54668e7f7de3e8b90df3de19d59833c5
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-25 12:54:58 -05:00
Jaikumar Ganesh
4f4fdf6dc3 am 09e27c4a: am 8631e554: am ad431ad8: Merge change Ia3acc2ee into eclair
Merge commit '09e27c4a9cc5bbddc2e18d66d396ee2cf4d753a3'

* commit '09e27c4a9cc5bbddc2e18d66d396ee2cf4d753a3':
  Fix pairings lost on reboot.
2009-11-22 22:17:07 -08:00
Jaikumar Ganesh
8631e55425 am ad431ad8: Merge change Ia3acc2ee into eclair
Merge commit 'ad431ad8631d8b19b04193ff1f89a955a7643c60' into eclair-mr2

* commit 'ad431ad8631d8b19b04193ff1f89a955a7643c60':
  Fix pairings lost on reboot.
2009-11-22 22:02:17 -08:00
Android (Google) Code Review
ad431ad863 Merge change Ia3acc2ee into eclair
* changes:
  Fix pairings lost on reboot.
2009-11-22 21:54:29 -08:00
Dianne Hackborn
5973cbc163 am e71db657: am f2900600: am 1824ec8c: Merge change If2b0bbed into eclair
Merge commit 'e71db6579c2afe06fe95dd88217a667d18fe4e20'

* commit 'e71db6579c2afe06fe95dd88217a667d18fe4e20':
  Debugging for issue #2228381 android.view.InflateException
2009-11-20 15:31:17 -08:00
Dianne Hackborn
f29006000c am 1824ec8c: Merge change If2b0bbed into eclair
Merge commit '1824ec8c127e3a8ef602d027e3c10d81f28320e8' into eclair-mr2

* commit '1824ec8c127e3a8ef602d027e3c10d81f28320e8':
  Debugging for issue #2228381 android.view.InflateException
2009-11-20 15:20:34 -08:00
Dianne Hackborn
b8d8167955 Debugging for issue #2228381 android.view.InflateException
Binary XML file line #37: Error inflating class <unknown> after adding a secondary account

Now that I have these debug logs, I want to keep them since they will make
debugging these kinds of issues a lot easier in the future.  (Note in this
case there was no problem in the framework.)

Change-Id: If2b0bbeda4706b7c5dc1ba4a5db04b74f40e1543
2009-11-20 14:26:42 -08:00
Vasu Nori
8914a04b16 am 483ae632: am 5a03f36e: maintain cache of statementids returned by sqlite upon compiling a sql stmnt
Merge commit '483ae6328701d29e9731af25c64b09b1e18bc2e7'

* commit '483ae6328701d29e9731af25c64b09b1e18bc2e7':
  maintain cache of statementids returned by sqlite upon compiling a sql stmnt
2009-11-20 14:19:49 -08:00
Vasu Nori
5a03f36ef8 maintain cache of statementids returned by sqlite upon compiling a sql stmnt 2009-11-20 14:09:24 -08:00
Jaikumar Ganesh
b148bc844e Fix pairings lost on reboot.
Bug:2277376
Dr No:Eastham
2009-11-20 13:50:26 -08:00
Jack Palevich
560814f6b1 Add a Java API for OpenGL ES 2.0.
Currently this API is hidden.

Add a test program.
2009-11-19 16:34:55 +08:00
Kenny Root
6c2d4029f1 Time.parse3339 range checking and proper 'sec-frac' skip
The parse3339 JNI code doesn't properly do bounds checking on the input String.
These changes do some bounds checking to prevent a buffer underflow condition.

parse3339 should allow the fractional seconds to be optional and an arbitrary
length as specified in RFC 3339. This will scan through arbitrary precision
until it finds the timezone indicators.

Change-Id: Ie9d01d0b24163d893c58c747d37873c83b74e6c7
2009-11-16 14:30:24 -06:00
Jean-Baptiste Queru
9db3d07b96 eclair snapshot 2009-11-13 13:53:39 -08:00
Jared Suttles
2ff953f970 am cfa254fe: am 1ae7831b: am 8b1243e5: jni: GpsLocationProvider: Check for pending callbacks before waiting
Merge commit 'cfa254fe102230915abdd42dac1a5b18ab4ac1a9'

* commit 'cfa254fe102230915abdd42dac1a5b18ab4ac1a9':
  jni: GpsLocationProvider: Check for pending callbacks before waiting
2009-11-06 10:28:34 -08:00
Jared Suttles
1ae7831b8a am 8b1243e5: jni: GpsLocationProvider: Check for pending callbacks before waiting
Merge commit '8b1243e5e4930598e8e78ebd18e7b6cd6fb0445f' into eclair-mr2

* commit '8b1243e5e4930598e8e78ebd18e7b6cd6fb0445f':
  jni: GpsLocationProvider: Check for pending callbacks before waiting
2009-11-06 06:31:37 -08:00
Jared Suttles
8b1243e5e4 jni: GpsLocationProvider: Check for pending callbacks before waiting
This change fixes a corner case where a callback may not get handled until
a second callback arrives.  This can happen because there is a significant
section of the wait_for_event function where the mutex is not locked, and
the sPendingCallbacks member could be updated.  We now check to see if
there is a pending callback to handle before we wait for another callback.

Change-Id: I20cfae1e780944bb74133940dda032efc4c55540
Signed-off-by: Fred Fettinger <fred.fettinger@motorola.com>
Signed-off-by: Jared Suttles <jared.suttles@motorola.com>
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-06 08:28:58 -05:00
Eric Laurent
e7c6644778 am 653d5d41: am fcae6c71: am 67b69292: Merge change I93f500a5 into eclair
Merge commit '653d5d415c3447a4250120548bf32d1ee63fe36f'

* commit '653d5d415c3447a4250120548bf32d1ee63fe36f':
  Fix issue 2203561: Sholes: audio playing out of earpiece.
2009-11-05 02:01:30 -08:00
Eric Laurent
fcae6c7179 am 67b69292: Merge change I93f500a5 into eclair
Merge commit '67b692920c18f99b096dce285adc6f7439fa866c' into eclair-mr2

* commit '67b692920c18f99b096dce285adc6f7439fa866c':
  Fix issue 2203561: Sholes: audio playing out of earpiece.
2009-11-05 00:01:33 -08:00