58380 Commits

Author SHA1 Message Date
Eino-Ville Talvala
235ea3b0a3 am b2c4f0bf: Merge "Fix SurfaceMediaSource timestamp handling."
* commit 'b2c4f0bf11f38fd31d80f1256c89b9db043a2929':
  Fix SurfaceMediaSource timestamp handling.
2011-08-31 13:43:05 -07:00
Eino-Ville Talvala
b2c4f0bf11 Merge "Fix SurfaceMediaSource timestamp handling." 2011-08-31 13:41:06 -07:00
Russell Brenner
acbee07a33 am 6752d482: Merge "Add DroidSansGeorgian font file"
* commit '6752d4827dee6bf5fb52cae61c00690e23d0b779':
  Add DroidSansGeorgian font file
2011-08-31 13:34:43 -07:00
Russell Brenner
080fee806f am ac8ee3b9: Merge "Add DroidSansArmenian font file"
* commit 'ac8ee3b9d420b44dccebb099a73fb4cda8a926eb':
  Add DroidSansArmenian font file
2011-08-31 13:34:39 -07:00
Russell Brenner
6752d4827d Merge "Add DroidSansGeorgian font file" 2011-08-31 13:33:04 -07:00
Russell Brenner
ac8ee3b9d4 Merge "Add DroidSansArmenian font file" 2011-08-31 13:32:41 -07:00
Nick Pelly
666fa84e66 am 46848574: Merge "NFC API updates."
* commit '468485747970d9842d94e1d292fe4cced701cad2':
  NFC API updates.
2011-08-31 13:26:23 -07:00
Nick Pelly
4684857479 Merge "NFC API updates." 2011-08-31 13:24:14 -07:00
Jeff Brown
79753f387a am 9d4bc852: Merge "Fix input channel leak. Bug: 5156144"
* commit '9d4bc852ea459c2a4347a87ce0357b3328a25db8':
  Fix input channel leak. Bug: 5156144
2011-08-31 13:03:26 -07:00
Eric Laurent
29227e71ec am 16b241a5: Merge "Change condition to enter silent mode."
* commit '16b241a58f1ec4b317647b6fd0ad9b5cc3f7ba3d':
  Change condition to enter silent mode.
2011-08-31 13:01:19 -07:00
Jeff Brown
9d4bc852ea Merge "Fix input channel leak. Bug: 5156144" 2011-08-31 13:01:16 -07:00
Eric Laurent
16b241a58f Merge "Change condition to enter silent mode." 2011-08-31 12:59:28 -07:00
Jean-Michel Trivi
1d2bca9ccd am 528e382f: Merge "Fix 5242200 only update RemoteControlDisplay when a client is present"
* commit '528e382f48681a2175a24e7403f63a4493d7c44b':
  Fix 5242200 only update RemoteControlDisplay when a client is present
2011-08-31 12:05:22 -07:00
Jean-Michel Trivi
528e382f48 Merge "Fix 5242200 only update RemoteControlDisplay when a client is present" 2011-08-31 12:03:50 -07:00
Jean-Michel Trivi
3387945766 Fix 5242200 only update RemoteControlDisplay when a client is present
A precondition for updateRemoteControlDisplay_syncRcs() is that
 mRCStack is not null. This condition was not verified when
 registering a RemoteControlDisplay.

Change-Id: I0b152410e57c590114b387e9ab83f0c4d15d060d
2011-08-31 11:52:16 -07:00
Mike Lockwood
157468dfe9 Merge "ActivityManager: Make sure BOOT_COMPLETED Intent is sent when running headless" into ics-aah 2011-08-31 11:49:31 -07:00
Mike Lockwood
056d76183e ActivityManager: Make sure BOOT_COMPLETED Intent is sent when running headless
Change-Id: I7419d14e1f2ac1e045bb95d16f5658a0217a9d81
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-08-31 14:48:35 -04:00
Adam Powell
d077bbc993 am ac73e4bb: Merge "Fix bug 5220390 - action bar title metrics"
* commit 'ac73e4bb420dbda31a866f3b86b207c71ecfa2f6':
  Fix bug 5220390 - action bar title metrics
2011-08-31 11:43:28 -07:00
Adam Powell
ac73e4bb42 Merge "Fix bug 5220390 - action bar title metrics" 2011-08-31 11:42:02 -07:00
Irfan Sheriff
a5d37ea2b4 am 2a62b43e: Merge "Remove persistent behavior"
* commit '2a62b43e671ef893e606292e82bc9fb9a09a3bf5':
  Remove persistent behavior
2011-08-31 11:38:31 -07:00
Irfan Sheriff
eacb82cfac am 329b7971: Merge "Reload STA firmware on start"
* commit '329b79713c06944c02a431081e75ef5e1862d32f':
  Reload STA firmware on start
2011-08-31 11:38:24 -07:00
Adam Powell
07a047fdd6 Fix bug 5220390 - action bar title metrics
Adjust action bar title layout metrics to match UX specs.

Refresh new metrics properly after a config change.

Change-Id: If19fad837ca2919193d4a3a8eb01c1caff68ca67
2011-08-31 11:36:02 -07:00
Irfan Sheriff
2a62b43e67 Merge "Remove persistent behavior" 2011-08-31 11:35:45 -07:00
Irfan Sheriff
329b79713c Merge "Reload STA firmware on start" 2011-08-31 11:35:26 -07:00
Jeff Sharkey
797da18e45 am 1123de96: Merge "More robust check around TelephonyManager init."
* commit '1123de96b15b0ef8d4e9f50d8c3206ef91557e80':
  More robust check around TelephonyManager init.
2011-08-31 11:33:36 -07:00
Jeff Sharkey
1123de96b1 Merge "More robust check around TelephonyManager init." 2011-08-31 11:32:22 -07:00
Tsu Chiang Chuang
4a6736d514 am 09702a0e: Merge "make sure the test apk gets added to the test zip"
* commit '09702a0ef7f47874f91dccba84054be6700a9c54':
  make sure the test apk gets added to the test zip
2011-08-31 11:31:34 -07:00
Tsu Chiang Chuang
09702a0ef7 Merge "make sure the test apk gets added to the test zip" 2011-08-31 11:29:17 -07:00
Jeff Sharkey
52d0f9882f More robust check around TelephonyManager init.
Only complain when Context radically changed.

Bug: 4676714
Change-Id: Ia183f9ba51056c857e634d901c618a73e45d2d05
2011-08-31 11:15:34 -07:00
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