57330 Commits

Author SHA1 Message Date
Stephen Hines
514f9790fd Call .rs.dtor() when tearing down Scripts.
BUG=5186750

This allows us to properly reference count any globals (static or extern) that
need to potentially be cleaned up.

Change-Id: I03d2c38c1e7a4ca96c40003d2eeecb6f395d5835
2011-08-31 17:41:39 -07:00
Justin Ho
9b718682ed Merge "Updated action bar/CAB assets Bug: 5156319 5076695" 2011-08-30 15:42:26 -07:00
Jean-Michel Trivi
2261c7d645 Merge "Bug 5045498 Force display update when display registers" 2011-08-30 15:14:12 -07:00
Christopher Tate
95901a1b8b Merge "Fix JNI for warning about failure to unlink DeathRecipients" 2011-08-30 15:09:54 -07:00
Chia-chi Yeh
1c75e966b2 Merge "SIP: add the check for expiry time in Contact header." 2011-08-30 15:02:59 -07:00
Jean-Michel Trivi
958bba6862 Bug 5045498 Force display update when display registers
When an IRemoteControlDisplay registers, cause the
 RemoteControlClient to send all its information to the newly
 registered display.
The previous code was only sending a request for update: this
 request didn't here cause the client to send the data because
 a new client generation had not been synchronized among clients
 and displays.
This CL uses the same code path to force an update as when audio
 focus changes, or a new client registers, by calling the same
 method that is called in those cases,
 updateRemoteControlDisplay_syncRcs(flags).
Also in this CL: more method renames to indicate methods that
 are called synchronized on mRCStack.

Change-Id: I54102f45ba1cd4812d958ecd883bec7bc45ae88f
2011-08-30 14:48:31 -07:00
Romain Guy
853921fa6d Merge "Text would disappear when the font size is 75px. Bug #5230196" 2011-08-30 14:43:06 -07:00
Romain Guy
799833a8b4 Text would disappear when the font size is 75px.
Bug #5230196

Yes, 75px. Any other font size would work. Don't ask.

Change-Id: I96c7db9926a97f65128d60c8238c3640ee2444ba
2011-08-30 14:41:48 -07:00
Jamie Gennis
8d102eb672 Merge changes I33f59705,Ia4c8c822,I2fb695ab,I2e587afc
* changes:
  MediaDump: use the MediaPlayer#setSurface method
  HTML5VideoView: switch to MediaPlayer#setSurface
  MediaPlayer: unhide the setSurface method
  Surface: unhide the SurfaceTexture ctor
2011-08-30 14:38:56 -07:00
Justin Ho
8b9362d65f Updated action bar/CAB assets
Bug: 5156319 5076695

Change-Id: If80d0bf0d3ca4d6bf22ef6231380c07f73fe966b
2011-08-30 14:08:52 -07:00
Christopher Tate
0d4a792e8d Fix JNI for warning about failure to unlink DeathRecipients
We now (a) use the right Class getName() method, and (b) look it
up once at setup time rather than doing that lookup every time we
want to emit the warning.  Verified to work properly and no longer
crash or throw or otherwise complain.

Change-Id: If0767f8845588ba7f34bac21474f4e2ad5c111d6
2011-08-30 14:06:20 -07:00
Chia-chi Yeh
5f760064e1 SIP: add the check for expiry time in Contact header.
There can be three expiry times in the same message header. We
choose the smaller value in Expires header and Contact header,
and then we obey the value defined in Min-Expires header. If
none of them is set, the default value is used.

Bug: 5178284

Change-Id: Ie9d4a48c93863e82e5197bb4a0db3f4fec56857c
2011-08-30 13:59:11 -07:00
Jake Hamby
be1a0493a8 Merge "Use the local timezone for CDMA SMS timestamps." 2011-08-30 13:45:30 -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
25c82e6cb4 Merge "Fix 5233681,5230897: Minor tweaks to lockscreen layout on tablets." 2011-08-30 13:29:24 -07:00
Dave Santoro
d49eea7831 Merge "Profile API modifications." 2011-08-30 13:12:50 -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
0e35c78d25 Merge "226483: A2DP connected, but music out to speaker" 2011-08-30 10:51:54 -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
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
67112061b2 Merge "Adding bandwidth enforcement test app." 2011-08-30 10:12:44 -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
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
c5d0fac081 Merge "Bug 5156756 Fix AAC ADTS header size computation" 2011-08-30 09:06:36 -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
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
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
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
Dianne Hackborn
4293064179 Merge "Fix issues 5158104 and 4981556 (fragment problems)" 2011-08-29 18:40:21 -07:00
Jim Miller
476769b42f Merge "Fix 5044158: Integrate music transport control into LockScreen" 2011-08-29 18:30:44 -07:00
Jim Miller
1c18828d20 Fix 5044158: Integrate music transport control into LockScreen
This integrates a new version of TransportControlView into LockScreen
and adds plumbing to handle new AudioService events to show/hide the view
and updates the required assets for all devices.

Updated to use new AudioManager API. Since the current API only supports
one RCD, the handler now lives in TransportControlView.

Change-Id: I220d4dd760bef35bd84209adc3c5829bf5bc9a2c
2011-08-29 18:29:21 -07:00
Christopher Tate
3765621434 Merge "Un-hide the new BackupAgent.onFullBackup() API" 2011-08-29 18:11:38 -07:00
Dianne Hackborn
6c285977a0 Fix issues 5158104 and 4981556 (fragment problems)
5158104: com.android.contacts: java.lang.IllegalStateException:
Can not perform this action after onSaveInstanceState at
android.app.FragmentManagerImpl.checkStateLoss(FragmentManager.java:1201)

The ViewPager can just commit without worrying about a state loss,
since it can correctly reconstruct its state later.

4981556: Fragment.mImmediateActivity doesn't get restored on orientation change

I am giving up on this thing; I just don't see how it can actually
be correct.  So now instead of getting an exception about a dup
add/remove at point of the add/remove call, this will happen later when
processing the transaction.

Also add an API for controlling the visibility of menus, which ViewPager
can use to have the correct menus shows.  And add a method to get the
name of a back stack entry.

Change-Id: Idcba14cfa2a172545a7a2a2c466cb49ceb789619
2011-08-29 17:58:17 -07:00
Irfan Sheriff
f99360bf8f Merge "Initialize p2p settings" 2011-08-29 17:36:50 -07:00
John Reck
30cca6020d Merge "Fix contentInvalidateAll NPE" 2011-08-29 17:14:11 -07:00
Jake Hamby
4144a06025 Use the local timezone for CDMA SMS timestamps.
3GPP2 uses the local timezone for timestamps in SMS messages.
Use the local timezone instead of UTC when decoding bearer data.

Bug: 5123883
Change-Id: Iec25bcbb7862f0794ead80b6923c815b68bdd2a5
2011-08-29 16:28:27 -07:00
Matthew Xie
d56b3c9524 Merge "Move Bluetooth remove service record handler to the app main thread" 2011-08-29 16:27:54 -07:00
Matthew Xie
484867a8ed Move Bluetooth remove service record handler to the app main thread
Move Bluetooth remove service record handler to the app main thread.
This removes the dependency of caller thread that constructs the
BluetoothAdapter singleton instance. The caller thread could stop while
BluetoothAdapter singleton exists but lose the handler context.
Make the BluetoothService.removeServiceRecord return quickly without
blocking on native call.
bug 4999443

Change-Id: I302534baa381f4aca8192e1e4a9ea21793b07ba6
2011-08-29 16:24:50 -07:00
Jeff Sharkey
961e304583 Introduce immediate CONNECTIVITY_ACTION variant.
New broadcast that is dispatched immediately after connectivity
changes have been handled by ConnectivityService, bypassing any
applicable CONNECTIVITY_CHANGE_DELAY.

Also protect CONNECTIVITY_CHANGE broadcasts, since they should only
be sent by system.

Bug: 5198167
Change-Id: I75f1fb44b21da1879f0ab960bcaa481126d70fde
2011-08-29 16:10:43 -07:00
Fabrice Di Meglio
aef455fd5b Fix bug #5197549 android.text.cts.StaticLayoutTest#testGetEllipsisCount fails on IRK49E mysid-userdebug
- make the ellipsizing condition easier to read
- allow ellipsizing only and only if
	- not MARQUEE
	- single line
	- END only on the last visible line when multiple lines

Change-Id: I6b08e4a735ebc4875a208f0538d9cf937240316e
2011-08-29 16:07:05 -07:00
Jim Miller
f0eb7655ac Merge "Fix 5044158: Reduce overall memory footprint of lockscreen" 2011-08-29 16:04:10 -07:00
Jim Miller
4ae8cb9e73 Fix 5044158: Reduce overall memory footprint of lockscreen
On devices that do not require showing lock before unlock, we now only create
just the unlock screen.  In addition to simplifying the code, this also
prevents keeping around a potentially unusued lock screen and saves ~1MB
in the system process on devices with only a secure lockscreen.

Change-Id: I533f2692b44a7991d4850cecc874c76166e7ce71
2011-08-29 16:02:24 -07:00