58404 Commits

Author SHA1 Message Date
Gloria Wang
aab6ce448b am 3727e3d8: Merge "Stop the AudioSource in reset() of AwesomePlayer if AudioSource is not NULL and AudioPlayer was not started. Fix for 5236419."
* commit '3727e3d80d37fc8004ddaa4ec589bd8d9c304fad':
  Stop the AudioSource in reset() of AwesomePlayer if AudioSource is not NULL and AudioPlayer was not started. Fix for 5236419.
2011-08-31 10:39:35 -07:00
Gloria Wang
3727e3d80d Merge "Stop the AudioSource in reset() of AwesomePlayer if AudioSource is not NULL and AudioPlayer was not started. Fix for 5236419." 2011-08-31 10:37:48 -07:00
Fabrice Di Meglio
b40441c514 am e7197a99: Merge "Fix bug #5233207 android.graphics.cts.PaintTest#testBreakText fails on IRK56F trygon-userdebug"
* commit 'e7197a996ff9c4a51d32dd2f918aab97d2b191ef':
  Fix bug #5233207 android.graphics.cts.PaintTest#testBreakText fails on IRK56F trygon-userdebug
2011-08-31 10:32:41 -07:00
Tsu Chiang Chuang
1d4ad8c44f make sure the test apk gets added to the test zip
Change-Id: I6d79bb00f2ba96b50e2436053ad40c5246bc45fb
2011-08-31 10:31:27 -07:00
Fabrice Di Meglio
e7197a996f Merge "Fix bug #5233207 android.graphics.cts.PaintTest#testBreakText fails on IRK56F trygon-userdebug" 2011-08-31 10:30:27 -07:00
Gloria Wang
e28857c125 Stop the AudioSource in reset() of AwesomePlayer if AudioSource is not NULL
and AudioPlayer was not started.
Fix for 5236419.

Change-Id: I5eadd069118c3533a19b5d6f6dca2ce16d8505fb
2011-08-31 10:24:18 -07:00
Irfan Sheriff
f9cb1d7082 Remove persistent behavior
Until we figure out a good way to do it from both group owner
and client, remove persistent behavior

Bug: 5241839
Change-Id: I31bda672edaa17e6a500f185b6b879dcfdbd069d
2011-08-31 10:17:24 -07:00
Irfan Sheriff
e36fcea8cd Reload STA firmware on start
Bug: 5242253
Change-Id: If8e07bc96b46a0e5022cc9d12191de2e4dbec212
2011-08-31 10:07:59 -07:00
Mike J. Chen
da54844f32 MediaPlayer changes for Tungsten/Android@Home.
Squashed merge from master-tungsten of the following changes:

commit e8b156c6b224f0fe5b6a81d5f92bade36275027c
Author: Jason Simmons <jsimmons@google.com>
Date:   Fri Aug 12 10:28:48 2011 -0700

    Add a null check to handle failure of android::createPlayer

    Change-Id: Iacbbc90369a825838d4374b1f774c8880b25753b

commit 43be3231034ff8537fdd84422a7954780038671f
Author: John Grossman <johngro@google.com>
Date:   Mon Jun 27 18:59:12 2011 -0700

    Move libaah_rtp over from the vendor directory.

    Also move factor PipeEvent out into utils.

    Change-Id: Id3877c66efe22d771cf3ef4877107e431b828e37

commit 17526eb3148c9c3d4365b6d5b47e8dc13bca71b6
Author: John Grossman <johngro@google.com>
Date:   Mon Jun 27 17:06:49 2011 -0700

    Name changes for the TRTP Players s/tungsten/aah/g

    Change-Id: I55e9ad13003f6aa6a36955b54426a7efbe31ac51

commit cbf2903ab6893b6e662514e2f6d670e268a419df
Author: John Grossman <johngro@google.com>
Date:   Fri Apr 15 09:27:54 2011 -0700

    Migrate Tungsten code from the HC-Tungsten to the Master-Tungsten branch.

    Change-Id: I95372d913a0761d90168edb4016f5ece0ea74502

Change-Id: Ic8fd28b1bbd85e86a325f99013e7aa0c763f5f05
Signed-off-by: Mike J. Chen <mjchen@google.com>
Signed-off-by: John Grossman <johngro@google.com>
2011-08-31 10:05:05 -07:00
Mike J. Chen
0d2ddec34b Add media/libaah_rtp
RTP library used to broadcast media from one device to a collection
of listeners.  Handles failures/retries/etc.

This is a squashed merge from master-tungsten of the following changes:

commit e1a5101fe627d71739a7c4263bb3a65c7bc44385
Author: Jason Simmons <jsimmons@google.com>
Date:   Fri Aug 12 13:24:21 2011 -0700

    Hold ThreadWrapper in a ref-counting pointer

    Change-Id: Iaf3343182e37bcc0ca99fbaf8f9bbb8c4984072a

commit 89b90d62e164ff3db27c9cba85255fc476d2dd96
Author: Jason Simmons <jsimmons@google.com>
Date:   Wed Aug 10 13:08:25 2011 -0700

    Update the Tungsten TX player to use HTTPBase

    Change-Id: I9f7ecf1b4b496cec1815284dbcdb958a43284169

commit 43be3231034ff8537fdd84422a7954780038671f
Author: John Grossman <johngro@google.com>
Date:   Mon Jun 27 18:59:12 2011 -0700

    Move libaah_rtp over from the vendor directory.

    Also move factor PipeEvent out into utils.

    Change-Id: Id3877c66efe22d771cf3ef4877107e431b828e37

Change-Id: I190ecddf1dc919761c2e4ec740c2f3b2c9541156
Signed-off-by: Mike J. Chen <mjchen@google.com>
Signed-off-by: John Grossman <johngro@google.com>
Signed-off-by: Jason Simmons <jsimmons@google.com>
2011-08-31 10:05:05 -07:00
Andreas Huber
8be95298ba am 49fb943d: Merge "ATSParser now supports a mode in which PTS is considered to be absolute time"
* commit '49fb943db85c748fc7dd4f5ee4a461d7489fb1b0':
  ATSParser now supports a mode in which PTS is considered to be absolute time
2011-08-31 09:48:07 -07:00
Eric Laurent
3d4c06f907 Change condition to enter silent mode.
Previously, silent mode was entered if volume was already at 0 and
volume down key was pressed once.

The new volume management policy specifies that silent mode is entered when
volume is at last audible step and volume down key is pressed once.

Change-Id: Id3e75a99c522d8afe276868010b6e73495d23fde
2011-08-31 09:47:24 -07:00
Andreas Huber
49fb943db8 Merge "ATSParser now supports a mode in which PTS is considered to be absolute time" 2011-08-31 09:44:57 -07:00
Justin Ho
b2c56123d7 am 83c8ad6d: Merge "Fixing formatting, removing tabs"
* commit '83c8ad6de581ad3a68421587e0fe8145c5f335af':
  Fixing formatting, removing tabs
2011-08-31 09:37:58 -07:00
Justin Ho
83c8ad6de5 Merge "Fixing formatting, removing tabs" 2011-08-31 09:36:03 -07:00
Russell Brenner
30f96511e8 Add DroidSansArmenian font file
This file is not yet added to any device configuration.
Its size is 25268 bytes.

Bug: 5240378
Change-Id: Ie4902e3b46742500c679bbfecb09fe19e1c2a290
2011-08-31 09:34:03 -07:00
Justin Ho
84ecfd2cb3 Fixing formatting, removing tabs
Change-Id: I3b3254ae96d8375f1b5029e96db94a551304420f
2011-08-31 09:33:04 -07:00
Russell Brenner
3187ab7bf4 Add DroidSansGeorgian font file
This file is not yet added to any device configuration.
Its size is 46788 bytes.

Bug: 5240378
Change-Id: If7b0f54de841e47e821526f7fcca91248bcf48be
2011-08-31 09:30:21 -07:00
Xia Wang
d7de8b28c7 am e124e94e: Merge "Integreate surfacetexture test into our continuous test framework."
* commit 'e124e94ee9f3cf5a51b4a21f0c536d0d4e00e0d4':
  Integreate surfacetexture test into our continuous test framework.
2011-08-31 09:28:07 -07:00
Xia Wang
e124e94ee9 Merge "Integreate surfacetexture test into our continuous test framework." 2011-08-31 09:26:34 -07:00
Jean-Michel Trivi
2deae8a05d am 2e2626f6: Merge "RemoteControlClient metadata: add method for metadata of long type"
* commit '2e2626f6c6404a0ce6c7d63b912a3ec2c748008d':
  RemoteControlClient metadata: add method for metadata of long type
2011-08-31 09:13:01 -07:00
Jean-Michel Trivi
2e2626f6c6 Merge "RemoteControlClient metadata: add method for metadata of long type" 2011-08-31 09:11:42 -07:00
satok
8d83c9c467 am bfe561c5: Merge "Add a comment for setAdditionalInputMethodSubtypes"
* commit 'bfe561c54a5addbc7c1fef75d87008ae2b9206eb':
  Add a comment for setAdditionalInputMethodSubtypes
2011-08-31 08:46:02 -07:00
satok
bfe561c54a Merge "Add a comment for setAdditionalInputMethodSubtypes" 2011-08-31 08:43:59 -07:00
satok
75917b603f Add a comment for setAdditionalInputMethodSubtypes
Change-Id: I3a19471b80a6f8a68473cba6f0fc934bd052af10
2011-09-01 00:33:40 +09:00
satok
a4a81714c6 am b59fcd51: Merge "Add a functionality to disable the spell checker"
* commit 'b59fcd516d998892fa0cc0b6ba60cce67e5a6779':
  Add a functionality to disable the spell checker
2011-08-31 05:59:45 -07:00
satok
04a68e59df am c593380d: Fix crash in setAdditionalInputMethodSubtypes
* commit 'c593380d1bccbfbd45c404954b2670b65acc287f':
  Fix crash in setAdditionalInputMethodSubtypes
2011-08-31 05:59:41 -07:00
satok
b59fcd516d Merge "Add a functionality to disable the spell checker" 2011-08-31 05:57:19 -07:00
satok
c593380d1b Fix crash in setAdditionalInputMethodSubtypes
Bug: 5142455
Change-Id: I5eca4c1a3d9a964db04c819fc671670ef1b81817
2011-08-31 21:26:04 +09:00
satok
0158a1e9ff Add a functionality to disable the spell checker
Change-Id: I1c2292f457d1911c149d594c175e638c92ad3917
2011-08-31 21:15:17 +09:00
satok
068d0931d7 am 6b14b23a: Merge "Fix the display name in the input method panel on tablet"
* commit '6b14b23ad586b664aa09dfb46d627782ac00eb74':
  Fix the display name in the input method panel on tablet
2011-08-31 04:48:12 -07:00
satok
6b14b23ad5 Merge "Fix the display name in the input method panel on tablet" 2011-08-31 04:43:36 -07:00
satok
209cf04353 Fix the display name in the input method panel on tablet
Bug: 5103300
Change-Id: I20cec2bb822be6f15abfe4a21053c8eb8d48b9cc
2011-08-31 20:16:17 +09:00
Narayan Kamath
3ee1420ae4 am 5b8f29d0: Merge "Change the heuristics for waiting for audiotracks to finish."
* commit '5b8f29d077577a94d480579b1d7673d037e4e3ae':
  Change the heuristics for waiting for audiotracks to finish.
2011-08-31 03:54:53 -07:00
Narayan Kamath
5b8f29d077 Merge "Change the heuristics for waiting for audiotracks to finish." 2011-08-31 03:53:03 -07:00
satok
e920070418 am 17b5635d: Merge "Improve the fallback of the locale of the spell checker"
* commit '17b5635d52b9a90b519307513dc7c5fe69c7aacb':
  Improve the fallback of the locale of the spell checker
2011-08-31 02:59:14 -07:00
satok
17b5635d52 Merge "Improve the fallback of the locale of the spell checker" 2011-08-31 02:57:23 -07:00
satok
a0315b91b6 am ed2b24ec: Fix set additional subtypes.
* commit 'ed2b24ecc7842b27178fc584a9e5bd5b1ab07635':
  Fix set additional subtypes.
2011-08-31 02:52:11 -07:00
satok
b669d6d8d8 Improve the fallback of the locale of the spell checker
Change-Id: I79655dd13e60f221b07346596fb05cf7d3d5cf7d
2011-08-31 18:07:06 +09:00
satok
ed2b24ecc7 Fix set additional subtypes.
Bug: 5102787
Change-Id: Ic38db8c33b6496a083e8158cd79fb54c21187b04
2011-08-31 18:03:21 +09:00
satok
77eb4f3ec5 am 8da2a004: Merge "Fix DeadObjectException of the spell checker"
* commit '8da2a004b883dc4526bddb3198476414b2f3819c':
  Fix DeadObjectException of the spell checker
2011-08-31 00:52:22 -07:00
satok
8da2a004b8 Merge "Fix DeadObjectException of the spell checker" 2011-08-31 00:49:39 -07:00
satok
c7b60f72dd Fix DeadObjectException of the spell checker
Bug: 5119646
Change-Id: I2938a2206b79645c13a54cc7200f64c2c0aa3836
2011-08-31 16:30:27 +09:00
Peter Ng
6cb074156e Switches now have checked state
Bug: 5238933
Change-Id: I1ceca648f57d239c9c0935d4c8d2b129063fec04
2011-08-30 23:08:03 -07:00
Jeff Sharkey
92fbf93767 am 27c6837d: Merge "Disable clock in lockscreen; better flag logic."
* commit '27c6837d57be4e3a8de9b5d31ee5ee6da8675d1a':
  Disable clock in lockscreen; better flag logic.
2011-08-30 22:53:55 -07:00
Jeff Sharkey
27c6837d57 Merge "Disable clock in lockscreen; better flag logic." 2011-08-30 22:51:00 -07:00
Pannag Sanketi
e753750a82 Update SurfaceMediaSource_test to not use pbuffer configs
SurfaceMediaSource_test now does not use pbuffer configs
to create a surface. Always uses a window config.
Also, cleaned up the test a bit.

Change-Id: Idda40dcb8474249eccaa8d2dad20ee840d2dd484
2011-08-30 22:36:41 -07:00
Jeff Sharkey
f52c70b2cc Disable clock in lockscreen; better flag logic.
When showing lockscreen, hide clock and navigation.  Clean up logic
to be easier to understand.

Bug: 5112812
Change-Id: I20e3563aa36644db678c7839d47f01f223fe8d37
2011-08-30 22:30:07 -07:00
Jeff Brown
cc4f7db698 Fix input channel leak.
Bug: 5156144

Input channels could leak or simply live longer than they should
in some cases.

1. Monitor channels (used by the pointer location overlay) are never
   unregistered, so they would leak.

   Added code to handle failures in the receive callback by closing
   the input channel.

2. The DragState held onto its input window and application handles
   even after the input channel was disposed.

   Added code to null these handles out when they are no longer needed.

3. Input channels previously used as input event targets would stick
   around until the targets were cleared (usually on the next
   event).

   Added code to detect when the input dispatcher is in
   an idle state and to proactively clear the targets then
   to ensure that resources are released promptly.

4. Native input window handles held onto the input channel even
   after the input window was removed from the input dispatcher.
   Consequently, the input channel would not be disposed until
   the input window handle itself was freed.  Since the input
   window handle is held from managed code, this meant that the
   window's input channel could stick around until the next GC.

   Refactored the input window handle to separate the properties
   (info) and identify (handle) state into different objects.
   Then modified the dispatcher to release the properties (info)
   when no longer needed, including the input channel.

7. The pointer location overlay does not actually use its
   standard input channel, only the monitor input channel.

   Added INPUT_FEATURE_NO_INPUT_CHANNEL to allow windows to
   request that they not be provided with an input channel
   at all.

Improved some of the error handling logic to emit the status
code as part of the exception message.

Change-Id: I01988d4391a70c6678c8b0e936ca051af680b1a5
2011-08-30 21:40:28 -07:00
Nick Pelly
82328bfd40 NFC API updates.
o NfcAdapter.set*(): enforce at least one activity is provided at compile time.
o Unhide and update javadoc for some API's scheduled for ICS release.

Change-Id: I2bf4ea101442dcdeb359be26d3869f82e6e3748b
2011-08-30 21:16:32 -07:00