5878 Commits

Author SHA1 Message Date
Android (Google) Code Review
a45c5f07e2 Merge change 9216
* changes:
  Fix UUID typo and allow incoming AVRCP connections.
2009-07-31 10:41:27 -07:00
Jaikumar Ganesh
ade40526c8 Fix UUID typo and allow incoming AVRCP connections. 2009-07-31 10:33:47 -07:00
Cary Clark
77d98f4ed7 rebuild the nav cache on mouse clicks during page load
On the first tap down, send a message to rebuild the nav
cache so that double taps have a better chance of having
some alignment information to work with.

Also, pass scale information to getBlockLeftEdge to
restrict the alignment search
2009-07-31 13:15:06 -04:00
Richard Meng
a1c94ae4f7 Handle SMS during CDMA emergency callback mode
If in emergency callback mode, any 3rd party application tries
to send Message using telephony API, return a NO_SERVICE error code.
2009-07-31 09:31:26 -07:00
Android (Google) Code Review
1b0efec347 am 17c195c8: Merge change 9340 into donut
Merge commit '17c195c8da3470b2e69880e206342f0c2d85f938'

* commit '17c195c8da3470b2e69880e206342f0c2d85f938':
  Fix issue 2025872: Deadlock in SoundPool.stop
2009-07-31 08:55:51 -07:00
Android (Google) Code Review
17c195c8da Merge change 9340 into donut
* changes:
  Fix issue 2025872: Deadlock in SoundPool.stop
2009-07-31 08:50:45 -07:00
Leon Scroggins
010582885c Allow the user to jump to the next textfield.
Requires a change to external/webkit.  Set ImeActions for textfields,
depending on the existence of other textfields on the page, and
react accordingly.
2009-07-31 10:54:38 -04:00
Android (Google) Code Review
ed95840681 am dccfaefd: Merge change 9285 into donut
Merge commit 'dccfaefd681a3895f6d4f9eedd106be817e1555d'

* commit 'dccfaefd681a3895f6d4f9eedd106be817e1555d':
  Clear singleton reference during JetPlayer.release()
2009-07-31 07:15:30 -07:00
Android (Google) Code Review
dccfaefd68 Merge change 9285 into donut
* changes:
  Clear singleton reference during JetPlayer.release()
2009-07-31 07:11:25 -07:00
Eric Laurent
fd8c0e1ff8 Fix issue 2025872: Deadlock in SoundPool.stop
There were 2 problems in SoundPool:

1 If not using the shared memory buffer mode, there was a problem when a sound channel was stolen. The new channel could sometimes not be added to the restart
list if the AudioTrack callback thread was stopped before the underrun callback was called.

The SoundChannel::play() method is modified so that SoundPool::done() is called immediately after stopping the channel. There is a possibility that done() is called a second time by the callback; in this case it will be added 2 times to the restart list but the second start request will be ignored as the first one will have reset the next chennel ID when processed.

2 There was a deadlock on SoundPool::mLock if SoundPool::stop() was called while a channel restart was pending:
 SoundPool::stop() lock mLock -> SoundChannel::stop() -> SoundPool::done() -> SoundPool::addToRestartList() -> try to lock mLock == deadlock

A second mutex mRestartLock is added to protect the restart list mRestart. mLock is still used to protect mChannels list but mRestart is now used to
protect access to mRestart by restart thread and client thread.
2009-07-31 06:29:13 -07:00
johnwang
106d27140b Add technology and authentication type in setupDataCall.
SetupDataCall needs radio technology parameter to identify CDMA and GSM type. 0 means CDMA and 1 means GSM. The values are different from GSM_PHONE and CDMA_PHONE. Add authType parameter to identify PAP/CHAP authentication. Currently the authType is set to use both PAP and CHAP in CDMA phone.

	modified:   telephony/java/com/android/internal/telephony/CommandsInterface.java
	modified:   telephony/java/com/android/internal/telephony/RIL.java
	modified:   telephony/java/com/android/internal/telephony/RILConstants.java
	modified:   telephony/java/com/android/internal/telephony/cdma/CdmaDataConnection.java
	modified:   telephony/java/com/android/internal/telephony/gsm/PdpConnection.java
	modified:   telephony/java/com/android/internal/telephony/test/SimulatedCommands.java
2009-07-31 01:31:12 -07:00
Android (Google) Code Review
5190c492a4 Merge change 9334
* changes:
  Flip the use of triangle icon on the right of settings.
2009-07-31 00:01:49 -07:00
Amith Yamasani
0355455b6f Flip the use of triangle icon on the right of settings.
Triangle will now only show up for preferences that have dialogs popup
when selected - like lists, sliders, EditTexts and Yes/No dialogs.
This is a change for the base preferences. If any subclasses override
and specify a different layout or normal preferences display a
dialog when pressed, they may not follow the new style.
2009-07-30 23:57:05 -07:00
Grace Kloba
4c8db8a4fe Fix #2025900. If a https request is canceled while openConnection is called
and a ssl error happened, the http thread can be blocked for up to 10 min.
Added code to detect this case and unlock the thread.
2009-07-30 23:13:34 -07:00
Android (Google) Code Review
bb7717a63d Merge change 9329
* changes:
  Smoother transitions in GrassRS
2009-07-30 22:39:58 -07:00
Romain Guy
8c76cef0c8 Smoother transitions in GrassRS 2009-07-30 22:39:21 -07:00
Android (Google) Code Review
e3081efc79 Merge change 9324
* changes:
  Second word lost when SMS is received from email
2009-07-30 22:22:02 -07:00
Android (Google) Code Review
bda9bac412 am 3e584428: Merge change 9124 into donut
Merge commit '3e584428deb098484cc881192dd221c81f707764'

* commit '3e584428deb098484cc881192dd221c81f707764':
  Fix a bug in ImageView: The drawing matrix is not updated when setImageMatrix is called.
2009-07-30 19:55:47 -07:00
Android (Google) Code Review
3e584428de Merge change 9124 into donut
* changes:
  Fix a bug in ImageView: The drawing matrix is not updated when setImageMatrix is called.
2009-07-30 19:53:47 -07:00
Romain Guy
584a375df6 First pass at implementing the Grass live wallpaper in RenderScript.
This change also adds second(), minute() and hour() to the RS library.
2009-07-30 19:11:51 -07:00
Android (Google) Code Review
1a20bae18c Merge change 9287
* changes:
  fixed some issues with the software renderer when surfaces are made current.
2009-07-30 18:46:48 -07:00
Mathias Agopian
5b5c914487 fixed some issues with the software renderer when surfaces are made current.
there was several issues:
- when a surface was made non-current, the last frame wasn't shown and the buffer could stay locked
- when a surface was made current the 2nd time, it would not dequeue a new buffer

now, queue/dequeue are done when the surface is made current.

for this to work, a new query() hook had to be added on android_native_window_t, it allows to retrieve some attributes of a window (currently only width and height).
2009-07-30 18:14:56 -07:00
Phil Dubach
176e650931 Clear singleton reference during JetPlayer.release()
Only one JetPlayer instance is supported at a time. A singleton reference is
created and returned in JetPlayer.getInstance(). When calling release() on the
instance, the corresponding native player is finalized.  Therefore, release()
must also clear the singleton reference, so that any subsequent call to
getInstance() re-initializes the native player.
2009-07-30 17:59:02 -07:00
Satish Roddom
bd55b0cb15 Second word lost when SMS is received from email
When SMS is sent from a email address, Email Gateway server sends a string
containing from address, message text.  Current code is treating the first
word as from_address, second word as subject and rest of the string as message_body.
Because of this second word is getting stored in separate variable and not as part
of message text, so second word is always lost.
2009-07-30 17:25:23 -07:00
Android (Google) Code Review
a05f75d61a Merge change 9267
* changes:
  Don't invalidate view if setEnabled doesn't change the state.
2009-07-30 16:55:04 -07:00
Android (Google) Code Review
f0f6c51e13 am c134c281: Merge change 9265 into donut
Merge commit 'c134c281ca83a28deb96c7b338c48c0b0327f26f'

* commit 'c134c281ca83a28deb96c7b338c48c0b0327f26f':
  Highlight IMEI-reading as part of READ_PHONE_STATE description
2009-07-30 16:20:51 -07:00
Android (Google) Code Review
c134c281ca Merge change 9265 into donut
* changes:
  Highlight IMEI-reading as part of READ_PHONE_STATE description
2009-07-30 16:18:21 -07:00
Android (Google) Code Review
992c1ebda1 Merge change 9260
* changes:
  Fix crash while dialing "*228;1"
2009-07-30 16:14:38 -07:00
Amith Yamasani
a2ef00b428 Don't invalidate view if setEnabled doesn't change the state.
Check the current enabled state before setting it, in case there's
no change. Otherwise some apps are repeatedly redrawing buttons based
on validation of some text field (like gmail or mms message bodies).
Should slightly improve the performance of soft keyboard text entry.
2009-07-30 16:14:34 -07:00
Christopher Tate
f2348429bc Highlight IMEI-reading as part of READ_PHONE_STATE description 2009-07-30 16:13:03 -07:00
Android (Google) Code Review
20b8e3a347 am 1247a644: Merge change 9243 into donut
Merge commit '1247a6444bb9f006e0b9def5cd15d626785424bb'

* commit '1247a6444bb9f006e0b9def5cd15d626785424bb':
  Clean up RIL_SIM_* in RILConstants
2009-07-30 16:07:57 -07:00
Mike LeBeau
0185fc570b am c2e06072: Tell the SearchManager to stopSearch before starting an in-app voice search. Without this, because of the recent changes to how the search dialog hides and resumes, we end up re-showing the search dialog after returning to the app from voice search, obscu
Merge commit 'c2e06072051e319bc609df66f4c72b77716f4fa4'

* commit 'c2e06072051e319bc609df66f4c72b77716f4fa4':
  Tell the SearchManager to stopSearch before starting an in-app voice
2009-07-30 16:07:50 -07:00
Jaikumar Ganesh
2801ac1a77 am f4fbdfa5: Update current.xml after review comments.
Merge commit 'f4fbdfa53fe0497d9b1f3b9642df357bb765e84f'

* commit 'f4fbdfa53fe0497d9b1f3b9642df357bb765e84f':
  Update current.xml after review comments.
2009-07-30 16:07:30 -07:00
Android (Google) Code Review
ae7d38ad92 Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/frameworks/base 2009-07-30 16:07:30 -07:00
Jaikumar Ganesh
ab752276ee am 0da3bdb4: Fix public API caused due to CDMA changes.
Merge commit '0da3bdb476086db02a1076780676b21e239c79d6'

* commit '0da3bdb476086db02a1076780676b21e239c79d6':
  Fix public API caused due to CDMA changes.
2009-07-30 16:07:11 -07:00
Mike Reed
a31ce104f5 am 6af2552d: use safeUnref() since the other macro is not defined in donut
Merge commit '6af2552d244ff933dfd54570121db455cc7c3cda'

* commit '6af2552d244ff933dfd54570121db455cc7c3cda':
  use safeUnref() since the other macro is not defined in donut
2009-07-30 16:06:31 -07:00
Android (Google) Code Review
93efb724ac am 7299d6ad: Merge change 9159 into donut
Merge commit '7299d6ad9820bbb601034542c94d6dc73cc4829d'

* commit '7299d6ad9820bbb601034542c94d6dc73cc4829d':
  check for null native objects, which never happens on a real subclass (we throw in that case)
2009-07-30 16:06:21 -07:00
Android (Google) Code Review
bb2e26c57c am 67fb5728: Merge change 9147 into donut
Merge commit '67fb5728332f7e3f8c11245fb9cb9d1cfe2b5607'

* commit '67fb5728332f7e3f8c11245fb9cb9d1cfe2b5607':
  Fix in-app search shortcut icons
2009-07-30 16:05:59 -07:00
Android (Google) Code Review
04bdf2ce14 am 4598d149: Merge change 9145 into donut
Merge commit '4598d149fb9c081877a214d74efadcb60d2acbb9'

* commit '4598d149fb9c081877a214d74efadcb60d2acbb9':
  Add the encryption option to PptpProfile parcel.
2009-07-30 16:05:51 -07:00
Android (Google) Code Review
455266e173 am b203a57d: Merge change 9114 into donut
Merge commit 'b203a57d1f00fe509e0d065cd928099bb7d19d87'

* commit 'b203a57d1f00fe509e0d065cd928099bb7d19d87':
  Add state saving mechanism to support proc restart
2009-07-30 16:05:45 -07:00
Chung-yih Wang
9225dfa70c am f4692640: Add unit tests for netkeystore.
Merge commit 'f4692640a8c40b8bbba1f00841c2f8fbe7b28d7a'

* commit 'f4692640a8c40b8bbba1f00841c2f8fbe7b28d7a':
  Add unit tests for netkeystore.
2009-07-30 16:05:39 -07:00
Android (Google) Code Review
cb798bcf13 am 73139aea: Merge change 9075 into donut
Merge commit '73139aead7203c22f3a4abb5e9fd8abd5ef249b1'

* commit '73139aead7203c22f3a4abb5e9fd8abd5ef249b1':
  Change the resource path for fwd locked apps when scanning the fwd locked install
2009-07-30 16:05:33 -07:00
Android (Google) Code Review
afcf686cb0 am 25dff70f: Merge change 9039 into donut
Merge commit '25dff70f153529b87f5ad4a92f4de21e8950b1de'

* commit '25dff70f153529b87f5ad4a92f4de21e8950b1de':
  Fix #2018814: System cannot correctly render assets with "wrap_content" attribute in QVGA
2009-07-30 16:05:27 -07:00
Android (Google) Code Review
1247a6444b Merge change 9243 into donut
* changes:
  Clean up RIL_SIM_* in RILConstants
2009-07-30 15:50:49 -07:00
Mike LeBeau
c2e0607205 Tell the SearchManager to stopSearch before starting an in-app voice
search. Without this, because of the recent changes to how the search
dialog hides and resumes, we end up re-showing the search dialog after
returning to the app from voice search, obscuring the new voice search
results behind.

Fixes http://b/2025364
2009-07-30 15:48:24 -07:00
John Wang
0d45e37069 Clean up RIL_SIM_* in RILConstants
GET_SIM_STATUS now returns structure RIL_CardStatus. So RIL_SIM_* status are obsoleted.

	modified:   java/com/android/internal/telephony/RILConstants.java
2009-07-30 15:45:12 -07:00
Libin Tang
d903014c1f Fix crash while dialing "*228;1" 2009-07-30 15:44:39 -07:00
Libin Tang
d23b2cd28c Fix CDMA ERI/roaming indicator issues
- If the SID is not in NAM and PRL, the phone should use default Roaming
  Indicator
- If a system is acquired that matches the NAM but does NOT match the PRL,
  the device shall display a FLASHING roaming indicator
- Handle corner cases for PRL is not loaded / Home SID is not programmed
- Reorganize the ERI logic
2009-07-30 15:43:12 -07:00
Android (Google) Code Review
8845ea0592 Merge change 9245
* changes:
  Remove android:multiprocess from ShutdownActivity to ensure it runs in the system process.
2009-07-30 15:29:21 -07:00
Mike Lockwood
49f746823e Remove android:multiprocess from ShutdownActivity to ensure it runs in the system process.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-07-30 15:27:00 -07:00