425 Commits

Author SHA1 Message Date
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
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
Eric Laurent
bda7469d9b Fix issue 2203561: Sholes: audio playing out of earpiece.
Create a new IAudioTrack interface to AudioFlinger when start() fails due to a broken pipe error.
Do the same if start fails due to the same error after time out in obtainBuffer().
Do not indicate that the AudioTrack is started to AudioPolicyManager if IAudioTrack start fails.
This avoids that an AudioTrack keeps a dead IAudioTrack after a media server crash.

Same modifications for AudioRecord.

Add a flag to ToneGenerator indicating that the callback thread can call Java. Without it, when the media server crashes and restarts, the AudioSystem error callback will crash in JNI if the IAudiotrack is created from AudioTrack callback thread.
2009-11-04 23:47:21 -08:00
Mike Reed
514ee74db4 am 2cacabae: am 58d30b69: am 1864d01f: Merge change Iae849da2 into eclair
Merge commit '2cacabaea9beabb0019b38a4734c1297ffeff607'

* commit '2cacabaea9beabb0019b38a4734c1297ffeff607':
  add table maskfilter
2009-11-01 21:54:17 -08:00
Mike Reed
58d30b6907 am 1864d01f: Merge change Iae849da2 into eclair
Merge commit '1864d01f2be0e82da7d8844fa91bee8880282041' into eclair-mr2

* commit '1864d01f2be0e82da7d8844fa91bee8880282041':
  add table maskfilter
2009-10-30 14:13:44 -07:00
Android (Google) Code Review
1864d01f2b Merge change Iae849da2 into eclair
* changes:
  add table maskfilter
2009-10-30 17:03:18 -04:00
Mike Reed
0e1e623011 add table maskfilter
hidden for now, since it need only be seen by Launcher2

http://b/issue?id=2210685
2009-10-30 08:11:58 -04:00
San Mehat
351621907a am 9d91da02: am 67ef832c: am 957e5867: process: Disable debugging
Merge commit '9d91da02d9dd83caad87279002a67780a2480623'

* commit '9d91da02d9dd83caad87279002a67780a2480623':
  process: Disable debugging
2009-10-29 20:18:32 -07:00
San Mehat
3e883fb1c8 am 3e28a104: am 574b99bf: am 8e312e81: Merge change Ia5109a87 into eclair
Merge commit '3e28a1047975d46a2754bb3092344686d3733cfe'

* commit '3e28a1047975d46a2754bb3092344686d3733cfe':
  process: Add debug code to log process group transitions
2009-10-29 20:16:49 -07:00
Jack Palevich
599d0fe5a2 am 9009d51f: am 5be6eedf: am b575e4df: Merge change I4a943184 into eclair
Merge commit '9009d51f258efaf092c1a3dc367dd2ec320c50ea'

* commit '9009d51f258efaf092c1a3dc367dd2ec320c50ea':
  Avoid trying to throw multiple exceptions at once.
2009-10-29 20:16:29 -07:00
San Mehat
67ef832cdb am 957e5867: process: Disable debugging
Merge commit '957e58670baad8c5995f1368e3b5280f0dbd891f' into eclair-mr2

* commit '957e58670baad8c5995f1368e3b5280f0dbd891f':
  process: Disable debugging
2009-10-29 19:32:06 -07:00
San Mehat
574b99bfcd am 8e312e81: Merge change Ia5109a87 into eclair
Merge commit '8e312e8160ef0cae569b6127591ee72c70bfda41' into eclair-mr2

* commit '8e312e8160ef0cae569b6127591ee72c70bfda41':
  process: Add debug code to log process group transitions
2009-10-29 19:28:58 -07:00
Jack Palevich
5be6eedf3b am b575e4df: Merge change I4a943184 into eclair
Merge commit 'b575e4dffe123dc7c8c579dc9cf6130eae6a4abe' into eclair-mr2

* commit 'b575e4dffe123dc7c8c579dc9cf6130eae6a4abe':
  Avoid trying to throw multiple exceptions at once.
2009-10-29 19:28:38 -07:00
San Mehat
957e58670b process: Disable debugging
Signed-off-by: San Mehat <san@google.com>
2009-10-29 13:59:32 -07:00
Android (Google) Code Review
8e312e8160 Merge change Ia5109a87 into eclair
* changes:
  process: Add debug code to log process group transitions
2009-10-29 15:02:53 -04:00
San Mehat
a5109a878e process: Add debug code to log process group transitions
Signed-off-by: San Mehat <san@google.com>
2009-10-29 11:50:43 -07:00
Mike Reed
5a3727903e am b26ab463: am 10d32a33: Merge change I16dc1411 into eclair-mr2
Merge commit 'b26ab4635555dee35b620ffef2aa53cf242b4b02'

* commit 'b26ab4635555dee35b620ffef2aa53cf242b4b02':
  add boundary patch
2009-10-28 23:56:37 -07:00
Jack Palevich
4a94318454 Avoid trying to throw multiple exceptions at once.
The typical usage pattern for the get_char helper function is:

    bool thrown = false;

    n = get_char(env, s, 0, 1000, &thrown);
    n += get_char(env, s, 1, 100, &thrown);
    n += get_char(env, s, 2, 10, &thrown);
    n += get_char(env, s, 3, 1, &thrown);
    if (thrown) return false;

As you can see, get_char is called multiple times before the
thrown flag is checked. If the input text contains multiple
incorrect characters, then we have to guard against throwing
the same exception multiple times. (Because doing so will
cause the Dalvik runtime to abort.)

The fix is simple: modify get_char to check if an exception
has already been thrown before throwing a new exception.
2009-10-28 19:38:05 -07:00
Mike Reed
c04851fd0a add boundary patch 2009-10-28 15:18:41 -04:00
Andrew Harp
4572edb287 am fb324e70: am adddd24f: am 78a50aa1: Merge change If3c30fc9 into eclair
Merge commit 'fb324e706e487738b3edbaca67bdf459fafcd4ea'

* commit 'fb324e706e487738b3edbaca67bdf459fafcd4ea':
  Patching in hidden API to allow app managed preview frame buffers.
2009-10-23 19:39:01 -07:00
Andrew Harp
adddd24f31 am 78a50aa1: Merge change If3c30fc9 into eclair
Merge commit '78a50aa1db6572ba7d9f9d91c6eb16f993c09f40' into eclair-mr2

* commit '78a50aa1db6572ba7d9f9d91c6eb16f993c09f40':
  Patching in hidden API to allow app managed preview frame buffers.
2009-10-23 19:17:59 -07:00
Android (Google) Code Review
78a50aa1db Merge change If3c30fc9 into eclair
* changes:
  Patching in hidden API to allow app managed preview frame buffers.
2009-10-23 22:08:30 -04:00
Jack Palevich
31f4c2d653 am a9046729: am a2ec1f4c: am 8f89a1a3: Merge change Ic620a52b into eclair
Merge commit 'a904672996c60c4ec50439a8d2be04fd9bd6444c'

* commit 'a904672996c60c4ec50439a8d2be04fd9bd6444c':
  Add size checks for glBufferData and glBufferSubData
2009-10-23 17:55:49 -07:00
Jack Palevich
a2ec1f4cea am 8f89a1a3: Merge change Ic620a52b into eclair
Merge commit '8f89a1a360465e08e81ceca3cb3042606a98668b' into eclair-mr2

* commit '8f89a1a360465e08e81ceca3cb3042606a98668b':
  Add size checks for glBufferData and glBufferSubData
2009-10-23 17:39:47 -07:00
Andrew Harp
94927dffce Patching in hidden API to allow app managed preview frame buffers.
Commit-Id: If3c30fc932697afa966cc97b17749e9996de92ee
2009-10-23 01:44:47 -04:00
Jack Palevich
c620a52b69 Add size checks for glBufferData and glBufferSubData
Without the size checks it's possible for calls to glBufferData
and glBufferSubData to read off the end of the Buffer object's
data, which can cause page faults.

Fix end-of-line characters for the "spec" files. (That's why
every line of these files is changed.)

Enhance our code emitter to properly handle bounds checks for
possibly-null pointers.
2009-10-21 11:02:44 -07:00
Nick Pelly
2cd5250abb am aeed585d: am 43f2b4e9: am 53f33d84: Revert "Remove STOPSHIP comment."
Merge commit 'aeed585d19f4db006ca765eed37d629831e4b563'

* commit 'aeed585d19f4db006ca765eed37d629831e4b563':
  Revert "Remove STOPSHIP comment."
2009-10-14 15:51:13 -07:00
Nick Pelly
43f2b4e9c6 am 53f33d84: Revert "Remove STOPSHIP comment."
Merge commit '53f33d84776a0bad668e361365a7049b16f8a929' into eclair-mr2

* commit '53f33d84776a0bad668e361365a7049b16f8a929':
  Revert "Remove STOPSHIP comment."
2009-10-14 12:37:06 -07:00
Nick Pelly
53f33d8477 Revert "Remove STOPSHIP comment."
This reverts commit 3d0726b4d8a30e57852b70f1dcf4d8d20508cd1e

Change-Id: Ie1ce5d09cc0b799ef0799f30eedc95f0ca5d3fad
DrNo: jerrryw
2009-10-14 12:25:29 -07:00
Nick Pelly
09897fb287 am b355695a: am 52cb8557: am a04ca9b4: Merge change I2492bffe into eclair
Merge commit 'b355695a093df11387828b3c588fd05c04b8907b'

* commit 'b355695a093df11387828b3c588fd05c04b8907b':
  Remove STOPSHIP comment.
2009-10-14 12:17:39 -07:00
Nick Pelly
52cb855752 am a04ca9b4: Merge change I2492bffe into eclair
Merge commit 'a04ca9b489ce0e92fa156f8ce26459a463b3e085' into eclair-mr2

* commit 'a04ca9b489ce0e92fa156f8ce26459a463b3e085':
  Remove STOPSHIP comment.
2009-10-14 12:03:19 -07:00
Nick Pelly
3d0726b4d8 Remove STOPSHIP comment.
Change-Id: I2492bffe57bded65fdbef5cf98e22cef3937e537
DrNo: eastham
Bug: 2089423
Joke: Why don't anteaters get sick? Because they're full of anty-bodies!
2009-10-14 11:46:18 -07:00
Zheng BaoZhong
416dd8e60a am 360f21cd: am a4adc798: Merge change I409d9b4a into eclair-mr2
Merge commit '360f21cdfccb5039cabb3c519b6b9b598aec1dca'

* commit '360f21cdfccb5039cabb3c519b6b9b598aec1dca':
  Wifi: Fix runtime crash in when scan results contain KSC 5601 SSID
2009-10-13 16:59:28 -07:00
David 'Digit' Turner
de553351bf am 4c220bd0: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
Merge commit '4c220bd0f32b93314c4c1bff328bd815265ef117'

* commit '4c220bd0f32b93314c4c1bff328bd815265ef117':
  Encourage developers to connect RFCOMM by UUID instead of Channel.
2009-10-12 12:36:03 -07:00
Jeff Hamilton
1d4eb8843e am 254d7ecd: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
Merge commit '254d7ecd06aabc54fb1d2b9afd53b6e78045c6a9'

* commit '254d7ecd06aabc54fb1d2b9afd53b6e78045c6a9':
  add (hidden) setHasAlpha() to allow clients like the view's cache to hint that a bitmap is opaque.
2009-10-12 12:33:44 -07:00