2943 Commits

Author SHA1 Message Date
Android (Google) Code Review
b86bad9493 Merge change 9438 into donut
* changes:
  Change some log.i to log.d.
2009-07-31 20:15:15 -07:00
Hung-ying Tyan
e81f51f44b Change some log.i to log.d. 2009-08-01 10:11:46 +08:00
Jean-Baptiste Queru
3159e3260e Merge snapshot variant of donut back into the tree 2009-07-31 17:43:58 -07:00
Jean-Baptiste Queru
5c1207be90 donut snapshot 2009-07-31 17:38:20 -07:00
Scott Main
6dceb76b3e add "since" info for reference docs 2009-07-31 16:47:19 -07:00
Marco Nelissen
c3c08ba5d6 Name unknown albums after the folder they're in, similar to how songs
with no title metadata are named after the file. Only files that are
in the root of the card will still belong to the "Unknown Album"
2009-07-31 15:02:25 -07:00
Scott Main
af09b67f31 add api level doc to the appendix 2009-07-31 13:11:07 -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
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
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
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
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
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
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
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
Jaikumar Ganesh
f4fbdfa53f Update current.xml after review comments. 2009-07-30 14:09:59 -07:00
Jaikumar Ganesh
0da3bdb476 Fix public API caused due to CDMA changes. 2009-07-30 12:37:43 -07:00
Mike Reed
6af2552d24 use safeUnref() since the other macro is not defined in donut 2009-07-30 11:46:47 -04:00
Android (Google) Code Review
7299d6ad98 Merge change 9159 into donut
* changes:
  check for null native objects, which never happens on a real subclass (we throw in that case) but can happen because we allow the callers to create the base class from java.
2009-07-30 08:16:09 -07:00
Mike Reed
a04e555dc9 check for null native objects, which never happens on a real subclass (we throw in that case)
but can happen because we allow the callers to create the base class from java.
2009-07-30 11:05:57 -04:00
Android (Google) Code Review
67fb572833 Merge change 9147 into donut
* changes:
  Fix in-app search shortcut icons
2009-07-30 06:06:09 -07:00
Bjorn Bringert
83dba19a8e Fix in-app search shortcut icons
When the suggstion provider is in a different package from the searchable
activity, the icons stored for shortcuts used the package of the
activity instead of the provider.

Fixes http://b/issue?id=2023993
2009-07-30 13:58:23 +01:00
Android (Google) Code Review
4598d149fb Merge change 9145 into donut
* changes:
  Add the encryption option to PptpProfile parcel.
2009-07-30 05:46:07 -07:00
Hung-ying Tyan
1f1602e729 Add the encryption option to PptpProfile parcel. 2009-07-30 20:36:27 +08:00
Android (Google) Code Review
b203a57d1f Merge change 9114 into donut
* changes:
  Add state saving mechanism to support proc restart
2009-07-30 04:46:00 -07:00
Hung-ying Tyan
fe8e48cdd5 Add state saving mechanism to support proc restart
Also...
+ stop daemons before getting server IP;
+ remove setForeground();
+ add the DBG flag for Log.d calls.

PatchSet 3:
+ add CHALLENGE_ERROR and REMOTE_HUNG_UP to VpnManager
+ broadcast new error codes in VpnService
+ check local IP change instead of dns change
+ move removeStates() to VpnService.onFinalCleanUp()

PatchSet 7:
+ add encryption flag to PptpProfile
+ PptpService and MtpdHelper are revised accordingly
2009-07-30 19:14:50 +08:00
Chung-yih Wang
f4692640a8 Add unit tests for netkeystore.
+ some boundary checks.
2009-07-30 16:37:48 +08:00
Chih-Chung Chang
f88872655e Fix a bug in ImageView: The drawing matrix is not updated when setImageMatrix is called.
The drawing matrix used in onDraw() is mDrawMatrix, but in setImageMatrix()
only mMatrix is updated. We need to call configureBounds() to update
mDrawMatrix if it was null. The is found in bug 2023281.
2009-07-30 15:39:37 +08:00
Android (Google) Code Review
73139aead7 Merge change 9075 into donut
* changes:
  Change the resource path for fwd locked apps when scanning the fwd locked install directory
2009-07-29 21:14:34 -07:00
Android (Google) Code Review
25dff70f15 Merge change 9039 into donut
* changes:
  Fix #2018814: System cannot correctly render assets with "wrap_content" attribute in QVGA
2009-07-29 19:44:48 -07:00
Dianne Hackborn
0d221012ff Fix #2018814: System cannot correctly render assets with "wrap_content" attribute in QVGA
It turns out we were not returning the density for anything retrieved from a
TypedArray...  which basically means any bitmap references from a layout or style...!!!

This is now fixed.

Also fiddle with the density compatibility mode to turn on smoothing in certain situations,
helping the look of things when they need to scale and we couldn't do the scaling at
load time.
2009-07-29 19:44:01 -07:00
Suchi Amalapurapu
f2c1072a3b Change the resource path for fwd locked apps when scanning the fwd locked install
directory
2009-07-29 18:29:19 -07:00
Android (Google) Code Review
b91e2b0292 Merge change 9073 into donut
* changes:
  Special-case search within the browser to not show the app icon to the left of the search field. Also, because this removes context about whether you're in browser search or global search, we make sure to clear any entered text if you jump out to global search from within browser search.
2009-07-29 18:20:18 -07:00
Mike LeBeau
5a7d752b65 Special-case search within the browser to not show the app icon
to the left of the search field. Also, because this removes context
about whether you're in browser search or global search, we make
sure to clear any entered text if you jump out to global search from
within browser search.

This is a really ugly hack, but was required by the UI team. We will
find a better way to reconcile in Eclair.
2009-07-29 18:17:13 -07:00
Android (Google) Code Review
c6eb5ac988 Merge change 9071 into donut
* changes:
  Fix issue #2018454: NullPointerException in ImageSpan constructor
2009-07-29 18:09:28 -07:00
Dianne Hackborn
0cd6376fa1 Fix issue #2018454: NullPointerException in ImageSpan constructor 2009-07-29 17:55:58 -07:00
Android (Google) Code Review
9c71716e3d Merge change 9063 into donut
* changes:
  Fixing bug #2023024 - there is an out of bounds exception that can happen if services are going away as the AccessibilityManagerService is trying to dispatch notifications to these services. Catching this exception and bailing because having this exception means that there are no more services around that need to get this notification.
2009-07-29 17:48:56 -07:00
Charles Chen
85b598beda Fixing bug #2023024 - there is an out of bounds exception that
can happen if services are going away as the AccessibilityManagerService
is trying to dispatch notifications to these services. Catching this
exception and bailing because having this exception means that there
are no more services around that need to get this notification.
2009-07-29 17:23:50 -07:00
Android (Google) Code Review
65e5438df9 Merge change 8966 into donut
* changes:
  Add tests for android.net.vpn.
2009-07-29 17:16:13 -07:00
Robert Greenwalt
41c1043399 Fix MulticastLock API to match WifiLock API.
Adds option to make lock refcounted or not.  Fixes 2017680.
2009-07-29 16:30:23 -07:00
Android (Google) Code Review
0067057c31 Merge change 9035 into donut
* changes:
  Fix the TabWidget to display custom views for the tabs better when the tabs have different sizes.
2009-07-29 15:27:55 -07:00
Jack Veenstra
5d5cd178e3 Fix the TabWidget to display custom views for the tabs better when the tabs have different sizes. 2009-07-29 15:19:23 -07:00
Android (Google) Code Review
3d716ed6a3 Merge change 9021 into donut
* changes:
  DO NOT MERGE - Fix CNAP-related NullPointerException
2009-07-29 14:52:11 -07:00
Wink Saville
9953eb27ed DO NOT MERGE - Fix CNAP-related NullPointerException
This will fix a CNAP-related bug where missing a call from a party with an
"Unknown" number presentation and then trying to log that call will cause
a NullPointerException to be thrown.

This was already merged into master so marked will not be merged.
2009-07-29 14:51:26 -07:00
Jean-Baptiste Queru
f4dc9da372 Merge snapshot variant of donut back into the main tree 2009-07-29 14:31:38 -07:00
Jean-Baptiste Queru
a8675f67e3 donut snapshot 2009-07-29 14:25:07 -07:00
Android (Google) Code Review
2bad713f31 Merge change 8860 into donut
* changes:
  Fix bug 2017664 Removed the TTS_ prefix in the TextToSpeech class to follow the standard naming convention. Moved the TTS-related intents from the Intent class to TextToSpeech and TextToSpeech.Engine. Renamed the TextToSpeech.Engine constants that are used as extras for the   ACTION_TTS_CHECK_TTS_DATA intent to prefix them with EXTRA_. Cleaned up the other TextToSpeech.Engine constant to remove superfluous mentions of   "TTS" in the name.
2009-07-29 11:38:44 -07:00