OSDN Git Service
Eric Laurent [Wed, 31 Aug 2011 20:01:19 +0000 (13:01 -0700)]
am
16b241a5: Merge "Change condition to enter silent mode."
* commit '
16b241a58f1ec4b317647b6fd0ad9b5cc3f7ba3d':
Change condition to enter silent mode.
Eric Laurent [Wed, 31 Aug 2011 19:59:28 +0000 (12:59 -0700)]
Merge "Change condition to enter silent mode."
Jean-Michel Trivi [Wed, 31 Aug 2011 19:05:22 +0000 (12:05 -0700)]
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
Jean-Michel Trivi [Wed, 31 Aug 2011 19:03:50 +0000 (12:03 -0700)]
Merge "Fix
5242200 only update RemoteControlDisplay when a client is present"
Jean-Michel Trivi [Wed, 31 Aug 2011 18:42:17 +0000 (11:42 -0700)]
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
Mike Lockwood [Wed, 31 Aug 2011 18:49:31 +0000 (11:49 -0700)]
Merge "ActivityManager: Make sure BOOT_COMPLETED Intent is sent when running headless" into ics-aah
Mike Lockwood [Wed, 31 Aug 2011 18:32:37 +0000 (14:32 -0400)]
ActivityManager: Make sure BOOT_COMPLETED Intent is sent when running headless
Change-Id: I7419d14e1f2ac1e045bb95d16f5658a0217a9d81
Signed-off-by: Mike Lockwood <lockwood@android.com>
Adam Powell [Wed, 31 Aug 2011 18:43:28 +0000 (11:43 -0700)]
am
ac73e4bb: Merge "Fix bug
5220390 - action bar title metrics"
* commit '
ac73e4bb420dbda31a866f3b86b207c71ecfa2f6':
Fix bug
5220390 - action bar title metrics
Adam Powell [Wed, 31 Aug 2011 18:42:02 +0000 (11:42 -0700)]
Merge "Fix bug
5220390 - action bar title metrics"
Irfan Sheriff [Wed, 31 Aug 2011 18:38:31 +0000 (11:38 -0700)]
am
2a62b43e: Merge "Remove persistent behavior"
* commit '
2a62b43e671ef893e606292e82bc9fb9a09a3bf5':
Remove persistent behavior
Irfan Sheriff [Wed, 31 Aug 2011 18:38:24 +0000 (11:38 -0700)]
am
329b7971: Merge "Reload STA firmware on start"
* commit '
329b79713c06944c02a431081e75ef5e1862d32f':
Reload STA firmware on start
Adam Powell [Wed, 31 Aug 2011 17:33:20 +0000 (10:33 -0700)]
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
Irfan Sheriff [Wed, 31 Aug 2011 18:35:45 +0000 (11:35 -0700)]
Merge "Remove persistent behavior"
Irfan Sheriff [Wed, 31 Aug 2011 18:35:26 +0000 (11:35 -0700)]
Merge "Reload STA firmware on start"
Jeff Sharkey [Wed, 31 Aug 2011 18:33:36 +0000 (11:33 -0700)]
am
1123de96: Merge "More robust check around TelephonyManager init."
* commit '
1123de96b15b0ef8d4e9f50d8c3206ef91557e80':
More robust check around TelephonyManager init.
Jeff Sharkey [Wed, 31 Aug 2011 18:32:22 +0000 (11:32 -0700)]
Merge "More robust check around TelephonyManager init."
Tsu Chiang Chuang [Wed, 31 Aug 2011 18:31:34 +0000 (11:31 -0700)]
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
Tsu Chiang Chuang [Wed, 31 Aug 2011 18:29:17 +0000 (11:29 -0700)]
Merge "make sure the test apk gets added to the test zip"
Jeff Sharkey [Wed, 31 Aug 2011 18:15:34 +0000 (11:15 -0700)]
More robust check around TelephonyManager init.
Only complain when Context radically changed.
Bug:
4676714
Change-Id: Ia183f9ba51056c857e634d901c618a73e45d2d05
Gloria Wang [Wed, 31 Aug 2011 17:39:35 +0000 (10:39 -0700)]
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.
Gloria Wang [Wed, 31 Aug 2011 17:37:48 +0000 (10:37 -0700)]
Merge "Stop the AudioSource in reset() of AwesomePlayer if AudioSource is not NULL and AudioPlayer was not started. Fix for
5236419."
Fabrice Di Meglio [Wed, 31 Aug 2011 17:32:41 +0000 (10:32 -0700)]
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
Tsu Chiang Chuang [Wed, 31 Aug 2011 17:31:27 +0000 (10:31 -0700)]
make sure the test apk gets added to the test zip
Change-Id: I6d79bb00f2ba96b50e2436053ad40c5246bc45fb
Fabrice Di Meglio [Wed, 31 Aug 2011 17:30:27 +0000 (10:30 -0700)]
Merge "Fix bug #
5233207 android.graphics.cts.PaintTest#testBreakText fails on IRK56F trygon-userdebug"
Gloria Wang [Wed, 31 Aug 2011 17:24:18 +0000 (10:24 -0700)]
Stop the AudioSource in reset() of AwesomePlayer if AudioSource is not NULL
and AudioPlayer was not started.
Fix for
5236419.
Change-Id: I5eadd069118c3533a19b5d6f6dca2ce16d8505fb
Irfan Sheriff [Tue, 30 Aug 2011 00:01:33 +0000 (17:01 -0700)]
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
Irfan Sheriff [Wed, 31 Aug 2011 17:07:59 +0000 (10:07 -0700)]
Reload STA firmware on start
Bug:
5242253
Change-Id: If8e07bc96b46a0e5022cc9d12191de2e4dbec212
Mike J. Chen [Mon, 15 Aug 2011 20:24:13 +0000 (13:24 -0700)]
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>
Mike J. Chen [Mon, 15 Aug 2011 18:26:02 +0000 (11:26 -0700)]
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>
Andreas Huber [Wed, 31 Aug 2011 16:48:07 +0000 (09:48 -0700)]
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
Eric Laurent [Tue, 16 Aug 2011 02:58:28 +0000 (19:58 -0700)]
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
Andreas Huber [Wed, 31 Aug 2011 16:44:57 +0000 (09:44 -0700)]
Merge "ATSParser now supports a mode in which PTS is considered to be absolute time"
Justin Ho [Wed, 31 Aug 2011 16:37:58 +0000 (09:37 -0700)]
am
83c8ad6d: Merge "Fixing formatting, removing tabs"
* commit '
83c8ad6de581ad3a68421587e0fe8145c5f335af':
Fixing formatting, removing tabs
Justin Ho [Wed, 31 Aug 2011 16:36:03 +0000 (09:36 -0700)]
Merge "Fixing formatting, removing tabs"
Justin Ho [Wed, 31 Aug 2011 16:33:04 +0000 (09:33 -0700)]
Fixing formatting, removing tabs
Change-Id: I3b3254ae96d8375f1b5029e96db94a551304420f
Xia Wang [Wed, 31 Aug 2011 16:28:07 +0000 (09:28 -0700)]
am
e124e94e: Merge "Integreate surfacetexture test into our continuous test framework."
* commit '
e124e94ee9f3cf5a51b4a21f0c536d0d4e00e0d4':
Integreate surfacetexture test into our continuous test framework.
Xia Wang [Wed, 31 Aug 2011 16:26:34 +0000 (09:26 -0700)]
Merge "Integreate surfacetexture test into our continuous test framework."
Jean-Michel Trivi [Wed, 31 Aug 2011 16:13:01 +0000 (09:13 -0700)]
am
2e2626f6: Merge "RemoteControlClient metadata: add method for metadata of long type"
* commit '
2e2626f6c6404a0ce6c7d63b912a3ec2c748008d':
RemoteControlClient metadata: add method for metadata of long type
Jean-Michel Trivi [Wed, 31 Aug 2011 16:11:42 +0000 (09:11 -0700)]
Merge "RemoteControlClient metadata: add method for metadata of long type"
satok [Wed, 31 Aug 2011 15:46:02 +0000 (08:46 -0700)]
am
bfe561c5: Merge "Add a comment for setAdditionalInputMethodSubtypes"
* commit '
bfe561c54a5addbc7c1fef75d87008ae2b9206eb':
Add a comment for setAdditionalInputMethodSubtypes
satok [Wed, 31 Aug 2011 15:43:59 +0000 (08:43 -0700)]
Merge "Add a comment for setAdditionalInputMethodSubtypes"
satok [Wed, 31 Aug 2011 14:27:39 +0000 (23:27 +0900)]
Add a comment for setAdditionalInputMethodSubtypes
Change-Id: I3a19471b80a6f8a68473cba6f0fc934bd052af10
satok [Wed, 31 Aug 2011 12:59:45 +0000 (05:59 -0700)]
am
b59fcd51: Merge "Add a functionality to disable the spell checker"
* commit '
b59fcd516d998892fa0cc0b6ba60cce67e5a6779':
Add a functionality to disable the spell checker
satok [Wed, 31 Aug 2011 12:59:41 +0000 (05:59 -0700)]
am
c593380d: Fix crash in setAdditionalInputMethodSubtypes
* commit '
c593380d1bccbfbd45c404954b2670b65acc287f':
Fix crash in setAdditionalInputMethodSubtypes
satok [Wed, 31 Aug 2011 12:57:19 +0000 (05:57 -0700)]
Merge "Add a functionality to disable the spell checker"
satok [Wed, 31 Aug 2011 12:26:04 +0000 (21:26 +0900)]
Fix crash in setAdditionalInputMethodSubtypes
Bug:
5142455
Change-Id: I5eca4c1a3d9a964db04c819fc671670ef1b81817
satok [Wed, 31 Aug 2011 12:15:17 +0000 (21:15 +0900)]
Add a functionality to disable the spell checker
Change-Id: I1c2292f457d1911c149d594c175e638c92ad3917
satok [Wed, 31 Aug 2011 11:48:12 +0000 (04:48 -0700)]
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
satok [Wed, 31 Aug 2011 11:43:36 +0000 (04:43 -0700)]
Merge "Fix the display name in the input method panel on tablet"
satok [Wed, 31 Aug 2011 11:16:17 +0000 (20:16 +0900)]
Fix the display name in the input method panel on tablet
Bug:
5103300
Change-Id: I20cec2bb822be6f15abfe4a21053c8eb8d48b9cc
Narayan Kamath [Wed, 31 Aug 2011 10:54:53 +0000 (03:54 -0700)]
am
5b8f29d0: Merge "Change the heuristics for waiting for audiotracks to finish."
* commit '
5b8f29d077577a94d480579b1d7673d037e4e3ae':
Change the heuristics for waiting for audiotracks to finish.
Narayan Kamath [Wed, 31 Aug 2011 10:53:03 +0000 (03:53 -0700)]
Merge "Change the heuristics for waiting for audiotracks to finish."
satok [Wed, 31 Aug 2011 09:59:14 +0000 (02:59 -0700)]
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
satok [Wed, 31 Aug 2011 09:57:23 +0000 (02:57 -0700)]
Merge "Improve the fallback of the locale of the spell checker"
satok [Wed, 31 Aug 2011 09:52:11 +0000 (02:52 -0700)]
am
ed2b24ec: Fix set additional subtypes.
* commit '
ed2b24ecc7842b27178fc584a9e5bd5b1ab07635':
Fix set additional subtypes.
satok [Wed, 31 Aug 2011 08:24:47 +0000 (17:24 +0900)]
Improve the fallback of the locale of the spell checker
Change-Id: I79655dd13e60f221b07346596fb05cf7d3d5cf7d
satok [Wed, 31 Aug 2011 09:03:21 +0000 (18:03 +0900)]
Fix set additional subtypes.
Bug:
5102787
Change-Id: Ic38db8c33b6496a083e8158cd79fb54c21187b04
satok [Wed, 31 Aug 2011 07:52:22 +0000 (00:52 -0700)]
am
8da2a004: Merge "Fix DeadObjectException of the spell checker"
* commit '
8da2a004b883dc4526bddb3198476414b2f3819c':
Fix DeadObjectException of the spell checker
satok [Wed, 31 Aug 2011 07:49:39 +0000 (00:49 -0700)]
Merge "Fix DeadObjectException of the spell checker"
satok [Wed, 31 Aug 2011 07:30:27 +0000 (16:30 +0900)]
Fix DeadObjectException of the spell checker
Bug:
5119646
Change-Id: I2938a2206b79645c13a54cc7200f64c2c0aa3836
Jeff Sharkey [Wed, 31 Aug 2011 05:53:55 +0000 (22:53 -0700)]
am
27c6837d: Merge "Disable clock in lockscreen; better flag logic."
* commit '
27c6837d57be4e3a8de9b5d31ee5ee6da8675d1a':
Disable clock in lockscreen; better flag logic.
Jeff Sharkey [Wed, 31 Aug 2011 05:51:00 +0000 (22:51 -0700)]
Merge "Disable clock in lockscreen; better flag logic."
Jeff Sharkey [Wed, 31 Aug 2011 05:05:47 +0000 (22:05 -0700)]
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
Xia Wang [Wed, 31 Aug 2011 01:48:11 +0000 (18:48 -0700)]
Integreate surfacetexture test into our continuous test framework.
Change-Id: Ic481f3a431166851947676d676749543c7afbbf7
Jeff Sharkey [Wed, 31 Aug 2011 02:55:50 +0000 (19:55 -0700)]
am
4596eba7: Merge "Accessors for frame count and duration."
* commit '
4596eba795898674186c800dcc0f5910467008a5':
Accessors for frame count and duration.
Jeff Sharkey [Wed, 31 Aug 2011 02:54:34 +0000 (19:54 -0700)]
Merge "Accessors for frame count and duration."
Mathias Agopian [Wed, 31 Aug 2011 02:25:50 +0000 (19:25 -0700)]
am
c21843a8: Merge "fix Surface positions are not floats"
* commit '
c21843a8b5c395cbaae6db0f786bdee556075f5d':
fix Surface positions are not floats
Mathias Agopian [Wed, 31 Aug 2011 02:24:04 +0000 (19:24 -0700)]
Merge "fix Surface positions are not floats"
Mathias Agopian [Wed, 31 Aug 2011 02:01:57 +0000 (19:01 -0700)]
am
66b665ab: Merge "fix display artifacts in preview screen in timelapse video mode"
* commit '
66b665ab8b8b52450310b1a551bfa8f52dbb2c10':
fix display artifacts in preview screen in timelapse video mode
Mathias Agopian [Wed, 31 Aug 2011 02:00:15 +0000 (19:00 -0700)]
Merge "fix display artifacts in preview screen in timelapse video mode"
Mathias Agopian [Wed, 31 Aug 2011 01:51:54 +0000 (18:51 -0700)]
fix Surface positions are not floats
Added Surface.setPosition(float, float) which allows to set a surface's
position in float.
Bug:
5239859
Change-Id: I903aef4ad5b5999142202fb8ea30fe216d805711
Jean-Michel Trivi [Tue, 30 Aug 2011 23:52:05 +0000 (16:52 -0700)]
RemoteControlClient metadata: add method for metadata of long type
Update to the RemoteControlClient.Editor API:
- new method for setting metadata of type long
- methods for setting metadata throw an exception if using
the wrong key with the wrong method.
Note that this change will cause the Music2 application to
throw an exception when it tries to set the duration as a string.
Change-Id: I17cff86467851a0aff313c07653e752ae6b6180f
Christopher Tate [Wed, 31 Aug 2011 01:36:50 +0000 (18:36 -0700)]
am
8ec83219: Merge "Properly handle PACKAGE_REPLACED in addition to _ADDED and _REMOVED"
* commit '
8ec83219e8cbac105054fb60101e6d98a972bcc2':
Properly handle PACKAGE_REPLACED in addition to _ADDED and _REMOVED
Christopher Tate [Wed, 31 Aug 2011 01:34:30 +0000 (18:34 -0700)]
Merge "Properly handle PACKAGE_REPLACED in addition to _ADDED and _REMOVED"
Bart Sears [Wed, 31 Aug 2011 01:30:12 +0000 (18:30 -0700)]
am
b394df92: Revert to version 2.51 of DroidSansFallback.ttf
* commit '
b394df9224c9f3c99bf4e808cd81d129c2dd1eb7':
Revert to version 2.51 of DroidSansFallback.ttf
Christopher Tate [Tue, 16 Aug 2011 23:06:53 +0000 (16:06 -0700)]
Properly handle PACKAGE_REPLACED in addition to _ADDED and _REMOVED
Certain kinds of application update generate this broadcast regime rather
than the REMOVE / ADD sequence that results from e.g. using the -r option
when invoking 'adb install'.
We also push the agent classname lookup to the last moment before
actually running the backup, rather than caching it as part of the
record of what apps need a backup pass in the future. This was causing
a bug in which a package reinstall that renamed the app's agent class
would wind up with a crash at backup time, trying to load the wrong
class.
Fixes bug
5156094 / bug
4308977
Change-Id: I4e3e12d86e6ee40809f14fd12ab762116dbee0b5
Bart Sears [Wed, 31 Aug 2011 01:14:15 +0000 (18:14 -0700)]
Revert to version 2.51 of DroidSansFallback.ttf
Version 2.53 of DroidSansFallback.ttf included:
1) Currency: \u060B\u09F2\u09F3\u09FB\u0AF1\u0BF9\u17DB\u20B6-\u20B9
\uA838\uFDFC
2) Geometric right arrow: \u25BA
3) CJK Ext A (about 6000 Simplified Chinese Glyphs)
Item 3 (the ~6000 Simplified Chinese Glyphs) increased the file size by
about 1.6M. To reduce ROM pressure, we are reverting back to version
2.51. Version 2.53 has been renamed to DroidSansFallbackFull.ttf and is
available for builds that have enough ROM space. We are generating a
new version of DroidSansFallback.ttf that has items 1 and 2 and not 3 and
will update DroidSansFallback.ttf once we have that version.
Bug:
5239728
Change-Id: I7467109a9ffec452446a636d35a3befffff09f10
Adam Powell [Wed, 31 Aug 2011 00:42:48 +0000 (17:42 -0700)]
am
38e1c7a8: Merge "Ellipsize marquee TextViews that aren\'t currently animating"
* commit '
38e1c7a8a614a491747d08f91aa6eceaee8123fb':
Ellipsize marquee TextViews that aren't currently animating
Adam Powell [Wed, 31 Aug 2011 00:40:40 +0000 (17:40 -0700)]
Merge "Ellipsize marquee TextViews that aren't currently animating"
Adam Powell [Tue, 30 Aug 2011 23:51:11 +0000 (16:51 -0700)]
Ellipsize marquee TextViews that aren't currently animating
On some devices the fading edge effect can be expensive. Offer an
alternative for screens full of textviews.
Change-Id: I0382b4ea0f8b0c6948cb68611f3679dbf5e2898a
Jeff Brown [Wed, 31 Aug 2011 00:04:59 +0000 (17:04 -0700)]
am
25614758: Merge "Pick up device configuration "device.internal = 0". Before, only "device.internal = 1" had an effect."
* commit '
256147581959868044bd92bad281c5c75a1068d7':
Pick up device configuration "device.internal = 0". Before, only "device.internal = 1" had an effect.
Jeff Brown [Wed, 31 Aug 2011 00:03:37 +0000 (17:03 -0700)]
Merge "Pick up device configuration "device.internal = 0". Before, only "device.internal = 1" had an effect."
Jeff Sharkey [Tue, 30 Aug 2011 23:42:23 +0000 (16:42 -0700)]
Accessors for frame count and duration.
Bug:
5233703
Change-Id: If6a758540248dc9bff56b64add04984ebd7b6833
Wink Saville [Tue, 30 Aug 2011 23:06:58 +0000 (16:06 -0700)]
am
960ba913: Merge "CDMALTE: Start reading SIM record on SIM_READY"
* commit '
960ba9132c02bfe2655268c2e5cb441c025c607f':
CDMALTE: Start reading SIM record on SIM_READY
Andreas Huber [Tue, 30 Aug 2011 23:06:28 +0000 (16:06 -0700)]
ATSParser now supports a mode in which PTS is considered to be absolute time
i.e. PTS 0 <=> media time 0
Change-Id: If10a0f98c129b95e8430dc419664b1def92e547e
Wink Saville [Tue, 30 Aug 2011 23:05:04 +0000 (16:05 -0700)]
Merge "CDMALTE: Start reading SIM record on SIM_READY"
Gilles Debunne [Tue, 30 Aug 2011 22:56:04 +0000 (15:56 -0700)]
am
b5305007: Merge "Add EditTextShortcutSpan to provide edit short cut in the text view."
* commit '
b5305007a6eb10457aa97b9791fed62d3542e3c1':
Add EditTextShortcutSpan to provide edit short cut in the text view.
Gilles Debunne [Tue, 30 Aug 2011 22:53:33 +0000 (15:53 -0700)]
Merge "Add EditTextShortcutSpan to provide edit short cut in the text view."
Dianne Hackborn [Tue, 30 Aug 2011 22:50:35 +0000 (15:50 -0700)]
am
9c93db60: Merge "Fix issues #
5233826 and #
5209847 -- live wallpapers."
* commit '
9c93db60e6d9172e1957e5e31a6c5b82e2494420':
Fix issues #
5233826 and #
5209847 -- live wallpapers.
Dianne Hackborn [Tue, 30 Aug 2011 22:47:17 +0000 (15:47 -0700)]
Merge "Fix issues #
5233826 and #
5209847 -- live wallpapers."
Justin Ho [Tue, 30 Aug 2011 22:43:36 +0000 (15:43 -0700)]
am
9b718682: Merge "Updated action bar/CAB assets Bug:
5156319 5076695"
* commit '
9b718682ed8fd06e38598f1a0a24d42025e9267d':
Updated action bar/CAB assets Bug:
5156319 5076695
Justin Ho [Tue, 30 Aug 2011 22:42:26 +0000 (15:42 -0700)]
Merge "Updated action bar/CAB assets Bug:
5156319 5076695"
Mathias Agopian [Tue, 30 Aug 2011 22:02:41 +0000 (15:02 -0700)]
fix display artifacts in preview screen in timelapse video mode
We were not updating the h/w composer state when the buffer size
changed.
We also didn't update the h/w composer state when the transformation
matrix changed (which is related to the above issue, since it would
probably change when the buffer size changes).
Also moved updating the crop to setGeometry(), since we decided
that the "crop" change requires the GEOMETRY_CHANGED flag (ie:
not need to do this every frame)
Bug:
5238473
Change-Id: Ia7b47e145b48581b568d89d9aa2c14ff778be862
Jean-Michel Trivi [Tue, 30 Aug 2011 22:15:14 +0000 (15:15 -0700)]
am
2261c7d6: Merge "Bug
5045498 Force display update when display registers"
* commit '
2261c7d6456376ed10a97643fc74a1e4eb2c1c9f':
Bug
5045498 Force display update when display registers
Jean-Michel Trivi [Tue, 30 Aug 2011 22:14:12 +0000 (15:14 -0700)]
Merge "Bug
5045498 Force display update when display registers"
Christopher Tate [Tue, 30 Aug 2011 22:12:05 +0000 (15:12 -0700)]
am
95901a1b: Merge "Fix JNI for warning about failure to unlink DeathRecipients"
* commit '
95901a1b8b9ee85a8cfe5603f6fa3cca15b2cb85':
Fix JNI for warning about failure to unlink DeathRecipients
Christopher Tate [Tue, 30 Aug 2011 22:09:54 +0000 (15:09 -0700)]
Merge "Fix JNI for warning about failure to unlink DeathRecipients"
Chia-chi Yeh [Tue, 30 Aug 2011 22:04:45 +0000 (15:04 -0700)]
am
1c75e966: Merge "SIP: add the check for expiry time in Contact header."
* commit '
1c75e966b28e3d13b91ec47e6d883f7c58a1f247':
SIP: add the check for expiry time in Contact header.
Chia-chi Yeh [Tue, 30 Aug 2011 22:02:59 +0000 (15:02 -0700)]
Merge "SIP: add the check for expiry time in Contact header."
Fabrice Di Meglio [Tue, 30 Aug 2011 01:38:27 +0000 (18:38 -0700)]
Fix bug #
5233207 android.graphics.cts.PaintTest#testBreakText fails on IRK56F trygon-userdebug
- Paint.breakText() API was regressing on the argument validation: a count < 0 is a valid one
Change-Id: I6d09294ee9f21901ba00017ce0d73f757fc7b147