58404 Commits

Author SHA1 Message Date
Jake Hamby
be1a0493a8 Merge "Use the local timezone for CDMA SMS timestamps." 2011-08-30 13:45:30 -07:00
Fabrice Di Meglio
e03b7a476c am c6f19da0: Merge "Fix bug #5197549 android.text.cts.StaticLayoutTest#testGetEllipsisCount fails on IRK49E mysid-userdebug"
* commit 'c6f19da0ff703adff8a6a06e0b19ea46abada644':
  Fix bug #5197549 android.text.cts.StaticLayoutTest#testGetEllipsisCount fails on IRK49E mysid-userdebug
2011-08-30 13:44:34 -07:00
Fabrice Di Meglio
c6f19da0ff Merge "Fix bug #5197549 android.text.cts.StaticLayoutTest#testGetEllipsisCount fails on IRK49E mysid-userdebug" 2011-08-30 13:42:34 -07:00
Jim Miller
c943092d5d am 25c82e6c: Merge "Fix 5233681,5230897: Minor tweaks to lockscreen layout on tablets."
* commit '25c82e6cb4d8c056b20bea361c513ff6cfaf8ba7':
  Fix 5233681,5230897: Minor tweaks to lockscreen layout on tablets.
2011-08-30 13:31:31 -07:00
Jim Miller
25c82e6cb4 Merge "Fix 5233681,5230897: Minor tweaks to lockscreen layout on tablets." 2011-08-30 13:29:24 -07:00
Dave Santoro
0834ae4d23 am d49eea78: Merge "Profile API modifications."
* commit 'd49eea7831d7386fc429984eee0e8ef117a1d927':
  Profile API modifications.
2011-08-30 13:14:17 -07:00
Dave Santoro
d49eea7831 Merge "Profile API modifications." 2011-08-30 13:12:50 -07:00
Claudia de Veaux
217e3ebc7a am fbc4fe3e: Merge "Remove unnecessary parenthesees in "No service" lock screen string. Bug: 5221160"
* commit 'fbc4fe3e329285b17f2586c81d6894355dd32b12':
  Remove unnecessary parenthesees in "No service" lock screen string. Bug: 5221160
2011-08-30 11:07:07 -07:00
Claudia de Veaux
fbc4fe3e32 Merge "Remove unnecessary parenthesees in "No service" lock screen string. Bug: 5221160" 2011-08-30 11:05:31 -07:00
Eric Laurent
2e0ae89d18 am 0e35c78d: Merge "226483: A2DP connected, but music out to speaker"
* commit '0e35c78d25a8df8b3bde566ad6c474f9df242ea4':
  226483: A2DP connected, but music out to speaker
2011-08-30 10:53:47 -07:00
Eric Laurent
0e35c78d25 Merge "226483: A2DP connected, but music out to speaker" 2011-08-30 10:51:54 -07:00
Eino-Ville Talvala
728e08bc3f Fix SurfaceMediaSource timestamp handling.
Was not basing timestamps on startTimeUs.
Now synchronizes properly with audio.

Bug: 4510826
Change-Id: I613db0aa91e51fc75d120e65540e742d8ab2ae43
2011-08-30 10:49:15 -07:00
Narayan Kamath
97171243f8 Change the heuristics for waiting for audiotracks to finish.
This is made necessary by a bug when the utterance is smaller
than the audio buffer size. In that case, we call stop() to
flush the audio to the mixer, but that causes the playstate to
be set to stopped though some audio is still being mixed. This
breaks our waiting loop.

We now wait a fixed amount of time for such short utterances
and do not observe the playback head position.

bug:5220048
Change-Id: Ic81dec751c1faca0b14164caeda6305c8f9815fe
2011-08-30 18:34:51 +01:00
Scott Main
214dfb094a am d0116b68: cherrypick Change-Id: I2ff5eb2a8e86c0ec30eba4d904221b2e5384d05a docs: fix ndk filename
* commit 'd0116b680a2c194eb3b8713a230151bfb32a6aef':
  cherrypick Change-Id: I2ff5eb2a8e86c0ec30eba4d904221b2e5384d05a docs: fix ndk filename
2011-08-30 10:34:04 -07:00
Scott Main
d0116b680a cherrypick Change-Id: I2ff5eb2a8e86c0ec30eba4d904221b2e5384d05a
docs: fix ndk filename

Change-Id: I7de46a11733bc262aaba61346d334de555408c85
2011-08-30 10:31:34 -07:00
Scott Main
e5d8471060 am 44325215: cherrypick Change-Id: If9ee878fcd7e2ef3161edf58dc3ac98ed9399ea5 docs: add ndk r6b sums and sizes
* commit '44325215f03ba8b214330c68055181761d388607':
  cherrypick Change-Id: If9ee878fcd7e2ef3161edf58dc3ac98ed9399ea5 docs: add ndk r6b sums and sizes
2011-08-30 10:26:09 -07:00
Robert Ly
e9f384d6e9 am ba812693: cherrypick Change-Id: I52ed6e5a97f32d2395cf171009b0b650268cac4e docs: ndk r6b rel notes
* commit 'ba8126938e8ec82502e9db9594ef7036fa4a4b13':
  cherrypick Change-Id: I52ed6e5a97f32d2395cf171009b0b650268cac4e docs: ndk r6b rel notes
2011-08-30 10:26:02 -07:00
Scott Main
44325215f0 cherrypick Change-Id: If9ee878fcd7e2ef3161edf58dc3ac98ed9399ea5
docs: add ndk r6b sums and sizes

Change-Id: I6a72bc2b3c21115208b067a8246b9aa7e70b8738
2011-08-30 10:20:10 -07:00
Robert Ly
ba8126938e cherrypick Change-Id: I52ed6e5a97f32d2395cf171009b0b650268cac4e
docs: ndk r6b rel notes

Change-Id: I3512f11370ddbfbe6c70efe59f216b5c4ea84ae7
2011-08-30 10:19:40 -07:00
Eric Laurent
05ce094164 226483: A2DP connected, but music out to speaker
When the A2DP headset is connected, there is a possible
race condition when the audio tracks are moved from
the mixer thread attached to the speaker output to the thread
attached to A2DP output.
As the request to clear the stream type to output mapping cache in
the client process is asynchronous, it is possible that the flag
indicating to the client audio track to re-create the IAudioTrack
on the new thread is processed before the cache is invalidated.
In this case, the track will be attached to the old thread and
music will continue playing over the device speaker instead of being
redirected to A2DP headset.

Change-Id: Ib2ce1eb5320eaff83287b93779061bf4e7a330df
2011-08-30 10:19:38 -07:00
Tsu Chiang Chuang
78adccbe02 am 67112061: Merge "Adding bandwidth enforcement test app."
* commit '67112061b2a68e4e6f76fb45f7a2285925d6b1cb':
  Adding bandwidth enforcement test app.
2011-08-30 10:14:08 -07:00
Tsu Chiang Chuang
67112061b2 Merge "Adding bandwidth enforcement test app." 2011-08-30 10:12:44 -07:00
Luca Zanolin
e6d3682189 Add EditTextShortcutSpan to provide edit short cut in the text view.
At the moment, EditTextShortcutSpan allows only the deletion of the text. In the future, we may decide to add extra functionality,
like "retry" where all the text is removed and a specific IME is triggered.

Fix the underline. The underline is not defined in thickness, and not as a multiplier of the default underline thickness.

Change the behaviour of SuggestionRangeSpan to match the specification.

Change-Id: I80437d9887c7a2ff8f62c38afbb0cb7add7ee9c8
2011-08-30 18:04:34 +01:00
Mike Lockwood
97bbefac0c Merge "Make Serial Manager APIs public" into ics-aah 2011-08-30 10:01:05 -07:00
Mike Lockwood
20b31a945e Merge "Quick and dirty test app for new SerialPort API" into ics-aah 2011-08-30 09:59:33 -07:00
Mike Lockwood
a72177a4e8 Merge "New Serial Manager API:" into ics-aah 2011-08-30 09:59:19 -07:00
Mike Lockwood
1bf3c4bba2 Make Serial Manager APIs public
Change-Id: I9b96ff288a4757c4c4465a6a5ea3b4ed9c432e06
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-08-30 12:56:33 -04:00
Mike Lockwood
b6d80cf126 Quick and dirty test app for new SerialPort API
Change-Id: Ie1ae6e7387b9f1e2788b798de29a06d551a44d1d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-08-30 12:56:33 -04:00
Mike Lockwood
8b3b98d622 New Serial Manager API:
SerialManager: provides access to serial ports
SerialPort: for reading and writing data to and from serial ports

IO with both array based and direct ByteBuffers is supported.

Accessing serial ports requires android.permission.SERIAL_PORT permission

Each platform must configure list of supported serial ports in the
config_serialPorts resource overlay
(this is needed to prevent apps from accidentally accessing the bluetooth
or other system UARTs).

In addition, the platform uevent.rc file must set the owner to the
/dev/tty* files to "system" so the framework can access the port.

Change-Id: I6afa78ceacf08486aaebced4156ecd2e33051879
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-08-30 12:56:26 -04:00
Narayan Kamath
777a1254ea am 5cdc720d: Merge "Don\'t allow TTS engines to synthesize too for ahead."
* commit '5cdc720dcadaa517766abb8a2f176de1a78a26a8':
  Don't allow TTS engines to synthesize too for ahead.
2011-08-30 09:54:49 -07:00
Narayan Kamath
5cdc720dca Merge "Don't allow TTS engines to synthesize too for ahead." 2011-08-30 09:52:06 -07:00
Gilles Debunne
02242b9db6 am ce4afc14: Merge "Moving action popup window when moving text selection"
* commit 'ce4afc1425cf74b7168a2d3d35c54efe9b5c98af':
  Moving action popup window when moving text selection
2011-08-30 09:49:31 -07:00
Gilles Debunne
2ae8410d4b am 4cbcc2bc: Merge "Bug 5218421: new NPE is SpellChecker when using Japanese language"
* commit '4cbcc2bc06cb228c2c5374920d2d4038685de8a6':
  Bug 5218421: new NPE is SpellChecker when using Japanese language
2011-08-30 09:47:30 -07:00
Gilles Debunne
ce4afc1425 Merge "Moving action popup window when moving text selection" 2011-08-30 09:46:30 -07:00
Gilles Debunne
4cbcc2bc06 Merge "Bug 5218421: new NPE is SpellChecker when using Japanese language" 2011-08-30 09:45:46 -07:00
Jean-Michel Trivi
6d61bf8576 am c5d0fac0: Merge "Bug 5156756 Fix AAC ADTS header size computation"
* commit 'c5d0fac081c4c496b29586bff79dfff05755b716':
  Bug 5156756 Fix AAC ADTS header size computation
2011-08-30 09:08:02 -07:00
Jean-Michel Trivi
c5d0fac081 Merge "Bug 5156756 Fix AAC ADTS header size computation" 2011-08-30 09:06:36 -07:00
Mike Lockwood
b9797b08f4 am 7c267b24: Merge "Extinguish notification LED when user passes through lock screen"
* commit '7c267b24c69685ee623efb61bd98707869e92f5d':
  Extinguish notification LED when user passes through lock screen
2011-08-30 08:47:21 -07:00
Mike Lockwood
7c267b24c6 Merge "Extinguish notification LED when user passes through lock screen" 2011-08-30 08:46:18 -07:00
Mike Lockwood
63b5ad9e17 Extinguish notification LED when user passes through lock screen
Also do not blink for notifications received when the screen is on.

Bug: 5233071

Change-Id: I15675ca317007d4b900ef74e60d11a5bca3d7333
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-08-30 09:55:30 -04:00
Svetoslav Ganov
0ca6a6cde0 am 173cc7c8: Merge "Adding accessibility support to the slide lock screen"
* commit '173cc7c86a7226e4167b2c0626a97d57aaca0d0a':
  Adding accessibility support to the slide lock screen
2011-08-29 22:11:52 -07:00
Svetoslav Ganov
173cc7c86a Merge "Adding accessibility support to the slide lock screen" 2011-08-29 22:09:56 -07:00
Svetoslav Ganov
f058340b2f Adding accessibility support to the slide lock screen
bug:5210233

Change-Id: I93e876524ae6aaf75aadbe6a21c5c17d41a705f0
2011-08-29 22:01:44 -07:00
Jim Miller
2227acd719 Fix 5233681,5230897: Minor tweaks to lockscreen layout on tablets.
- Remove negative padding required by old font which is no longer
required by the new clock font.
- Change brightness of AM/PM indicator to white.

Change-Id: I10540a2976a47014e535f958e07d1c61fa0d8d41
2011-08-29 21:19:36 -07:00
Rajneesh Chowdury
516affc103 am 90200ee4: Merge "5106773 Can\'t export a movie - Error returned from OMX API in ducati"
* commit '90200ee4e23b662e81a8d6fb6ef634ac6b378f5f':
  5106773 Can't export a movie - Error returned from OMX API in ducati
2011-08-29 20:45:06 -07:00
Rajneesh Chowdury
90200ee4e2 Merge "5106773 Can't export a movie - Error returned from OMX API in ducati" 2011-08-29 20:43:11 -07:00
Rajneesh Chowdury
8f7bf02506 5106773 Can't export a movie - Error returned from OMX API in ducati
Video Editor engine wrongly set the profile in place of level.
So level was always 1 (default value for Profile)

Change-Id: I202f866d32e81869d9692174d59d9d777a772282
2011-08-29 20:16:22 -07:00
Jeff Sharkey
d712530185 am 4107beec: Merge "Introduce immediate CONNECTIVITY_ACTION variant."
* commit '4107beecaab18b393e56a0c34b333f0a6e15be2f':
  Introduce immediate CONNECTIVITY_ACTION variant.
2011-08-29 20:01:46 -07:00
Jeff Sharkey
4107beecaa Merge "Introduce immediate CONNECTIVITY_ACTION variant." 2011-08-29 20:00:12 -07:00
Jean-Michel Trivi
59fe406b3a Bug 5156756 Fix AAC ADTS header size computation
This previous frame size computation code had two incorrect
 assumptions:
 1/ the ADTS frame length value already contains the header size
 2/ the ADTS header is not of fixed size: it is 2 bytes bigger
  if it contains the CRC value.
For 1/, the code worked because when the header size was added
 to the frame size, the + operator is of stronger precedence
 than the ? operator, so the size added was always 0 (instead
 of ADTS_HEADER_LENGTH.
For 2/, the code worked as long as there was no CRC in the ADTS
 data.

The fix consists in:
 - documenting what the frame length computation code returns
 - fixing the frame length computation
 - when computing the frame length, also returning the header
  size so the correct data can be sent to the decoder.

Change-Id: I92df72a9e531f594f762e63d62f9dee7b0109904
2011-08-29 18:56:55 -07:00