OSDN Git Service
Jamie Gennis [Mon, 14 Mar 2011 22:19:31 +0000 (15:19 -0700)]
am
071929b2: Merge "gl2_yuvtex: use the gralloc-provided stride." into honeycomb-mr1
* commit '
071929b202404da110c17fad4aba216558e7e785':
gl2_yuvtex: use the gralloc-provided stride.
James Wilson [Mon, 14 Mar 2011 22:19:30 +0000 (15:19 -0700)]
Merge branch 'honeycomb-LTE' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE
Huahui Wu [Mon, 14 Mar 2011 01:13:42 +0000 (18:13 -0700)]
b/
3392594 keep the remain touch points when one is ended.
This is the Java side code change for b/
3392594.
It adds an action index into the touch event data and pass it
to the native side.
Change-Id: Ibb393e62a590d0fff1dd3172041748e2b10501d6
Scott Main [Mon, 14 Mar 2011 21:59:11 +0000 (14:59 -0700)]
am
2213a4ac: am
462012db: am
abdf0d53: docs: update search dev guide with SearcView widget
* commit '
2213a4aca030151f6590a998200daa9865202343':
docs: update search dev guide with SearcView widget
Eric Fischer [Mon, 14 Mar 2011 21:58:50 +0000 (14:58 -0700)]
am
95176382: Merge branch \'honeycomb-LTE\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE
* commit '
951763824168d08d3f54ba22917756d769486b8b':
Eric Fischer [Mon, 14 Mar 2011 21:58:45 +0000 (14:58 -0700)]
am
9f7b4ba6: Import revised translations. DO NOT MERGE
* commit '
9f7b4ba69ca809d6909b8863d3570f970edcb7bf':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 14 Mar 2011 21:58:39 +0000 (14:58 -0700)]
am
aa3ea7be: Add "new incognito window" translations.
* commit '
aa3ea7be0c78e8aa5f3a32b0decba03edba00686':
Add "new incognito window" translations.
Jamie Gennis [Mon, 14 Mar 2011 21:49:37 +0000 (14:49 -0700)]
Merge "gl2_yuvtex: use the gralloc-provided stride." into honeycomb-mr1
Huahui Wu [Mon, 14 Mar 2011 21:46:27 +0000 (14:46 -0700)]
am
b71020ef: Merge "b/
3392594 keep the remain touch points when one is ended." into honeycomb-mr1
* commit '
b71020ef4018195a21d2538ea3767b901610daf4':
b/
3392594 keep the remain touch points when one is ended.
Huahui Wu [Mon, 14 Mar 2011 21:46:26 +0000 (14:46 -0700)]
Merge branch 'honeycomb-LTE' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE
Eric Fischer [Mon, 14 Mar 2011 21:06:03 +0000 (14:06 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I5d1b5c2891ffd19e45dbc6d20caf3449147f7218
Scott Main [Tue, 8 Feb 2011 18:20:27 +0000 (10:20 -0800)]
docs: update search dev guide with SearcView widget
Change-Id: Ieb0ccdb78760a3c90df2381e647463f7532b0efc
Eric Fischer [Mon, 14 Mar 2011 18:17:02 +0000 (11:17 -0700)]
Add "new incognito window" translations.
These are all unfortunately for the "window" version instead of the
"tab" version because I didn't realize that there were two versions.
Change-Id: If9a4bd6d0d70fe8992b4bf63e674865080f8c597
Huahui Wu [Mon, 14 Mar 2011 21:43:46 +0000 (14:43 -0700)]
Merge "b/
3392594 keep the remain touch points when one is ended." into honeycomb-mr1
Scott Main [Mon, 14 Mar 2011 21:42:51 +0000 (14:42 -0700)]
am
462012db: am
abdf0d53: docs: update search dev guide with SearcView widget
* commit '
462012db70fb73431bb25909d73e45fea9fc5911':
docs: update search dev guide with SearcView widget
Eric Fischer [Mon, 14 Mar 2011 21:42:50 +0000 (14:42 -0700)]
Merge branch 'honeycomb-LTE' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE
Scott Main [Mon, 14 Mar 2011 21:36:56 +0000 (14:36 -0700)]
am
abdf0d53: docs: update search dev guide with SearcView widget
* commit '
abdf0d533c292709e51cee2c1213d5e44baca963':
docs: update search dev guide with SearcView widget
Eric Fischer [Mon, 14 Mar 2011 21:06:03 +0000 (14:06 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I5d1b5c2891ffd19e45dbc6d20caf3449147f7218
Eric Fischer [Mon, 14 Mar 2011 18:17:02 +0000 (11:17 -0700)]
Add "new incognito window" translations.
These are all unfortunately for the "window" version instead of the
"tab" version because I didn't realize that there were two versions.
Change-Id: If9a4bd6d0d70fe8992b4bf63e674865080f8c597
Eric Fischer [Mon, 14 Mar 2011 21:29:05 +0000 (14:29 -0700)]
am
175121a5: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit '
175121a513f4cea91d7950d6b3978383d3b2a352':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 14 Mar 2011 21:28:58 +0000 (14:28 -0700)]
am
9f70f526: Merge "Add "new incognito window" translations." into honeycomb-mr1
* commit '
9f70f5268fac9c2dd5ed4cb9582da5931c846a91':
Add "new incognito window" translations.
Eric Fischer [Mon, 14 Mar 2011 21:17:01 +0000 (14:17 -0700)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
Eric Fischer [Mon, 14 Mar 2011 21:13:29 +0000 (14:13 -0700)]
Merge "Add "new incognito window" translations." into honeycomb-mr1
Eric Fischer [Mon, 14 Mar 2011 21:06:03 +0000 (14:06 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I5d1b5c2891ffd19e45dbc6d20caf3449147f7218
Ramesh Sudini [Mon, 14 Mar 2011 20:49:36 +0000 (13:49 -0700)]
am
e62dee25: Do not merge: Telephony: Rename lte_on_cdma property.
* commit '
e62dee25e50c04c235cd37df66e4ef123b761663':
Do not merge: Telephony: Rename lte_on_cdma property.
Ramesh Sudini [Mon, 14 Mar 2011 20:47:48 +0000 (13:47 -0700)]
am
f5727615: Do not merge: Telephony: Corrections to LTE and eHRPD constant values.
* commit '
f57276154aaa587524374db8e0d7228383611bf3':
Do not merge: Telephony: Corrections to LTE and eHRPD constant values.
Wink Saville [Mon, 14 Mar 2011 20:47:44 +0000 (13:47 -0700)]
am
f90c2609: Do not merge: Add outputting "on" or "off" setRadioPower.
* commit '
f90c26090402a517aa68cade7f452bc1ad85e654':
Do not merge: Add outputting "on" or "off" setRadioPower.
Ramesh Sudini [Mon, 14 Mar 2011 20:47:42 +0000 (13:47 -0700)]
am
c06c5c1a: Do not merge: Telephony: Fix config to reflect the correct CM conn type.
* commit '
c06c5c1a13da26c8435f2d4b72a41a38e1d463b8':
Do not merge: Telephony: Fix config to reflect the correct CM conn type.
Wink Saville [Mon, 14 Mar 2011 20:47:39 +0000 (13:47 -0700)]
am
124e2872: Do not merge: Have createAllDataConnectionList create the RetryManager inside the loop.
* commit '
124e28728b16cb63c700a323b9dfb1348580c896':
Do not merge: Have createAllDataConnectionList create the RetryManager inside the loop.
Wink Saville [Mon, 14 Mar 2011 20:47:36 +0000 (13:47 -0700)]
am
321b730a: Do not merge: Remove mRetryMgr and directly use DataConnection retry mgr.
* commit '
321b730a9d34b237c26075d963c8febf8d62eff1':
Do not merge: Remove mRetryMgr and directly use DataConnection retry mgr.
Wink Saville [Mon, 14 Mar 2011 20:44:50 +0000 (13:44 -0700)]
am
d6398ad3: Merge "Do not merge: Fix 3G connectivity bug
3513741." into honeycomb-LTE
* commit '
d6398ad3ce962a6345d18b166ae8484a4259f6f2':
Do not merge: Fix 3G connectivity bug
3513741.
Wink Saville [Mon, 14 Mar 2011 20:44:48 +0000 (13:44 -0700)]
am
08d79acc: Merge "Do not merge: RIL: Merge Issue. LTE SIM additions." into honeycomb-LTE
* commit '
08d79acc462a395a6fb6d0b126eb4d97466962c7':
Do not merge: RIL: Merge Issue. LTE SIM additions.
Wink Saville [Mon, 14 Mar 2011 20:44:45 +0000 (13:44 -0700)]
am
7fbae1d2: Merge "Do not merge: ApnSettings: Removal of Enabled, Class and Inactivity Timer." into honeycomb-LTE
* commit '
7fbae1d23c99383d0dbaa1be35a41246934e3ce4':
Do not merge: ApnSettings: Removal of Enabled, Class and Inactivity Timer.
Wink Saville [Mon, 14 Mar 2011 20:44:43 +0000 (13:44 -0700)]
am
16b7f051: Merge "Do not merge: LTE: Fix SST for CDMALTEPhone." into honeycomb-LTE
* commit '
16b7f051f71e276f4dd45455e92c33a0894bab10':
Do not merge: LTE: Fix SST for CDMALTEPhone.
Wink Saville [Mon, 14 Mar 2011 20:44:40 +0000 (13:44 -0700)]
am
9e22c33c: Merge "Do not merge: Clean up LTE code change" into honeycomb-LTE
* commit '
9e22c33c2b6ff5c9a45ebac88d048f6f61557e82':
Do not merge: Clean up LTE code change
Wink Saville [Mon, 14 Mar 2011 20:44:37 +0000 (13:44 -0700)]
am
c3853f36: Merge "Do not merge: Add some input checking to prevent problems" into honeycomb-LTE
* commit '
c3853f36645f2f4f4801d6465e82095cf38ea043':
Do not merge: Add some input checking to prevent problems
Ramesh Sudini [Wed, 9 Mar 2011 20:22:39 +0000 (14:22 -0600)]
Do not merge: Telephony: Rename lte_on_cdma property.
Fix Issue:
3479211. Dont use Mot property in Android Framework.
Change-Id: I1c13af5d00bf8c246ee6ecbedd1d1977a75c7142
Ramesh Sudini [Tue, 8 Mar 2011 21:51:52 +0000 (15:51 -0600)]
Do not merge: Telephony: Corrections to LTE and eHRPD constant values.
LTE and EHRPD values are not consistent with ril.h
Change-Id: I76d1ff408a37960873f537772637ff3ae3ac056f
Wink Saville [Fri, 4 Mar 2011 22:46:22 +0000 (14:46 -0800)]
Do not merge: Add outputting "on" or "off" setRadioPower.
Change-Id: I0865f17e63f4b9867a8d33e7e147613010683a27
Ramesh Sudini [Tue, 8 Mar 2011 00:19:47 +0000 (18:19 -0600)]
Do not merge: Telephony: Fix config to reflect the correct CM conn type.
Reflect the correct connectivity manager connection type in the config.xml.
Change-Id: Ida4d0a6275addda6fe11878fa96dbac70283df91
Wink Saville [Tue, 8 Mar 2011 00:37:10 +0000 (16:37 -0800)]
Do not merge: Have createAllDataConnectionList create the RetryManager inside the loop.
Change-Id: I131c8323737b0b5122a5087c77d8c6102d74b138
Wink Saville [Mon, 7 Mar 2011 19:07:09 +0000 (11:07 -0800)]
Do not merge: Remove mRetryMgr and directly use DataConnection retry mgr.
DataConnection now wraps its retry manager instead of exporting it.
Change-Id: Ibda6a235430b8ec51d1518c2956de71f964e3f39
Wink Saville [Mon, 14 Mar 2011 20:43:05 +0000 (13:43 -0700)]
Merge "Do not merge: Fix 3G connectivity bug
3513741." into honeycomb-LTE
Wink Saville [Mon, 14 Mar 2011 20:42:50 +0000 (13:42 -0700)]
am
c15cf635: Merge "Do not merge: Revert the revert of "LTE Changes for Telephony including Multiple PDN support and IPV6 support"" into honeycomb-LTE
* commit '
c15cf6353ee1c1cae83039a19fb8d5e5c7d76804':
Do not merge: Revert the revert of "LTE Changes for Telephony including Multiple PDN support and IPV6 support"
Wink Saville [Mon, 14 Mar 2011 20:42:49 +0000 (13:42 -0700)]
Merge "Do not merge: RIL: Merge Issue. LTE SIM additions." into honeycomb-LTE
Wink Saville [Mon, 14 Mar 2011 20:42:24 +0000 (13:42 -0700)]
Merge "Do not merge: ApnSettings: Removal of Enabled, Class and Inactivity Timer." into honeycomb-LTE
Wink Saville [Mon, 14 Mar 2011 20:42:07 +0000 (13:42 -0700)]
Merge "Do not merge: LTE: Fix SST for CDMALTEPhone." into honeycomb-LTE
Wink Saville [Mon, 14 Mar 2011 20:41:42 +0000 (13:41 -0700)]
Merge "Do not merge: Clean up LTE code change" into honeycomb-LTE
Wink Saville [Mon, 14 Mar 2011 20:41:26 +0000 (13:41 -0700)]
Merge "Do not merge: Add some input checking to prevent problems" into honeycomb-LTE
Gilles Debunne [Mon, 14 Mar 2011 20:41:14 +0000 (13:41 -0700)]
am
816dd3d4: (-s ours) resolved conflicts for merge of
9c06c0ff to gingerbread-plus-aosp
* commit '
816dd3d443108b473965f97123eef7300f53615f':
Double tap on a word no longer opens context menu. DO NOT MERGE
Wink Saville [Mon, 14 Mar 2011 20:40:57 +0000 (13:40 -0700)]
Merge "Do not merge: Revert the revert of "LTE Changes for Telephony including Multiple PDN support and IPV6 support"" into honeycomb-LTE
Scott Main [Tue, 8 Feb 2011 18:20:27 +0000 (10:20 -0800)]
docs: update search dev guide with SearcView widget
Change-Id: Ieb0ccdb78760a3c90df2381e647463f7532b0efc
Huahui Wu [Mon, 14 Mar 2011 01:13:42 +0000 (18:13 -0700)]
b/
3392594 keep the remain touch points when one is ended.
This is the Java side code change for b/
3392594.
It adds an action index into the touch event data and pass it
to the native side.
Change-Id: Ibb393e62a590d0fff1dd3172041748e2b10501d6
Gilles Debunne [Mon, 14 Mar 2011 19:57:01 +0000 (12:57 -0700)]
resolved conflicts for merge of
9c06c0ff to gingerbread-plus-aosp
Change-Id: I7f9c71eeb9fc5e01856f764930c6f168741cc9da
Wink Saville [Sat, 5 Mar 2011 06:54:41 +0000 (22:54 -0800)]
Do not merge: Fix 3G connectivity bug
3513741.
ServiceStateTracker the registerForDataConnectionDetached needed to
test for !STATE_IN_SERVICE so that the other values for state also cause
the detached notifciation.
CdmaServiceStateTracker needed to use the ServiceStateTracker lists
and not the cdma specific lists for registration, which are now deleted.
Also removed an unused import.
CdmaLteServiceStateTracker cannot use the deleted cdma specific
registration lists.
Bug:
3513741
Change-Id: I0939a47251ffc70ea5c9e4675a4b4179d9c718b1
Ramesh Sudini [Thu, 3 Mar 2011 16:30:49 +0000 (10:30 -0600)]
Do not merge: RIL: Merge Issue. LTE SIM additions.
Change-Id: Ide70b523d376e1c3f2979051c083365346bf41f6
Ramesh Sudini [Tue, 1 Mar 2011 15:27:09 +0000 (09:27 -0600)]
Do not merge: ApnSettings: Removal of Enabled, Class and Inactivity Timer.
Bug:
3479209
Change-Id: I08b30c4868a12342221b6428eca8ffbb08f2b22a
Ramesh Sudini [Fri, 4 Mar 2011 16:01:06 +0000 (10:01 -0600)]
Do not merge: LTE: Fix SST for CDMALTEPhone.
Change-Id: I4dc3d3bb4dba968694a5856624448b7ba1e35601
Robert Greenwalt [Mon, 28 Feb 2011 19:03:48 +0000 (11:03 -0800)]
Do not merge: Clean up LTE code change
Promoting RestrictedState so fewer callsites need be technology specific.
Promoting ServiceState change registration code.
bug:
3487388
Change-Id: Iac3abca1a2943c1626553e1fd4bdd5baace86492
Robert Greenwalt [Thu, 3 Mar 2011 01:03:37 +0000 (17:03 -0800)]
Do not merge: Add some input checking to prevent problems
Adding nulls can cause unhappiness. It's suspected as a cause of
3495045.
bug:
3495045
Change-Id: I925c965ef64032fc57849bf15fe9b11f4bc99351
Wink Saville [Sat, 12 Mar 2011 22:52:01 +0000 (14:52 -0800)]
Do not merge: Revert the revert of "LTE Changes for Telephony including Multiple PDN support and IPV6 support"
This reverts commit
eca208fae6d1b6ae9c8c0e42eee092e86dbddbb7
and is the first of the LTE commits in master being back ported
to the LTE branch.
Change-Id: I17d4a1b779ed74bc7dfb409d2c1a30f60fdb27c7
Irfan Sheriff [Mon, 14 Mar 2011 18:56:03 +0000 (11:56 -0700)]
am
9b1ea0bd: am
e21110f8: Merge "Backup and restore IP and proxy settings" into honeycomb-mr1
* commit '
9b1ea0bd2c9af64c424fa4fef327108cb376b74f':
Backup and restore IP and proxy settings
Irfan Sheriff [Mon, 14 Mar 2011 18:50:38 +0000 (11:50 -0700)]
am
e21110f8: Merge "Backup and restore IP and proxy settings" into honeycomb-mr1
* commit '
e21110f8b1e4aa884f7a4e2164ae90dab8d5f3fa':
Backup and restore IP and proxy settings
Kenny Root [Mon, 14 Mar 2011 18:49:56 +0000 (11:49 -0700)]
am
206c62ed: am
2fdf829a: Merge "Remove unnecessary SkImageDecoder_libjpeg.cpp"
* commit '
206c62ed34dc8a48fd6c907d95456226949f42dd':
Remove unnecessary SkImageDecoder_libjpeg.cpp
Irfan Sheriff [Mon, 14 Mar 2011 18:48:35 +0000 (11:48 -0700)]
Merge "Backup and restore IP and proxy settings" into honeycomb-mr1
Gilles Debunne [Mon, 14 Mar 2011 18:30:17 +0000 (11:30 -0700)]
Merge "Double tap on a word no longer opens context menu. DO NOT MERGE" into gingerbread
Jamie Gennis [Thu, 10 Mar 2011 22:49:00 +0000 (14:49 -0800)]
gl2_yuvtex: use the gralloc-provided stride.
This change fixes the gl2_yuvtex test to use the stride chosen by the
gralloc implementation rather than hard-coding it.
Bug:
4081948
Change-Id: If7c96a20fc3fb1df2ff25e6afaa9f34dbad2002c
Gilles Debunne [Mon, 14 Mar 2011 18:27:54 +0000 (11:27 -0700)]
am
8503af84: Merge "Paste popup uses a disabled icon when there is nothing to paste." into honeycomb-mr1
* commit '
8503af848657356411a9bb4cf15d798d4f15111b':
Paste popup uses a disabled icon when there is nothing to paste.
Gilles Debunne [Mon, 14 Mar 2011 18:26:36 +0000 (11:26 -0700)]
Merge "Paste popup uses a disabled icon when there is nothing to paste." into honeycomb-mr1
Eric Laurent [Mon, 14 Mar 2011 18:23:56 +0000 (11:23 -0700)]
am
3cbfd10b: Merge "Partial fix for issue
3515250: video chat and SCO" into honeycomb-mr1
* commit '
3cbfd10bbb869f763880060ebe01dd66da62bbc3':
Partial fix for issue
3515250: video chat and SCO
Eric Laurent [Mon, 14 Mar 2011 18:21:50 +0000 (11:21 -0700)]
Merge "Partial fix for issue
3515250: video chat and SCO" into honeycomb-mr1
Eric Fischer [Mon, 14 Mar 2011 18:17:02 +0000 (11:17 -0700)]
Add "new incognito window" translations.
These are all unfortunately for the "window" version instead of the
"tab" version because I didn't realize that there were two versions.
Change-Id: If9a4bd6d0d70fe8992b4bf63e674865080f8c597
James Dong [Mon, 14 Mar 2011 17:53:51 +0000 (10:53 -0700)]
am
7d93b757: (-s ours) am
68f66b94: Merge "MP3Extractor and MP3 decoder fixes - DO NOT MERGE" into gingerbread
* commit '
7d93b7574f741a9cd8872771faefa3c92bed6576':
MP3Extractor and MP3 decoder fixes - DO NOT MERGE
Ying Wang [Mon, 14 Mar 2011 17:53:44 +0000 (10:53 -0700)]
am
e5570255: am
69e725eb: Merge "Dist com.android.nfc_extras.jar." into gingerbread
* commit '
e5570255636b60ae2eb56d2f7adf270a8cc40843':
Dist com.android.nfc_extras.jar.
Robert Greenwalt [Mon, 14 Mar 2011 17:53:38 +0000 (10:53 -0700)]
am
2e741556: (-s ours) am
b5c51d5f: Merge "DO NOT MERGE Backport of I1f55df8a from " into gingerbread
* commit '
2e7415564ad1d77537f9f3d5151ed480fcfc6ef9':
DO NOT MERGE Backport of I1f55df8a from master.
Nick Pelly [Mon, 14 Mar 2011 17:28:11 +0000 (10:28 -0700)]
resolved conflicts for merge of
38d0d562 to honeycomb-plus-aosp
Change-Id: Iff9ea08b810b0d142a9227272492c0305a9bcf42
Mike Lockwood [Mon, 14 Mar 2011 16:44:15 +0000 (09:44 -0700)]
am
3ec9d06f: Merge "MtpDevice: Handle zero length packets in readResponse()" into honeycomb-mr1
* commit '
3ec9d06f070db3a8899ad235736abd0ffaf6f578':
MtpDevice: Handle zero length packets in readResponse()
Mike Lockwood [Mon, 14 Mar 2011 16:43:14 +0000 (09:43 -0700)]
Merge "MtpDevice: Handle zero length packets in readResponse()" into honeycomb-mr1
Gloria Wang [Mon, 14 Mar 2011 16:35:08 +0000 (09:35 -0700)]
am
7ea3c7f5: Merge "- Some change on the DrmManager in order to support feature request
4082089. In DrmManager, we currently lock both processDrmInfo() and onInfo() which is ok for now since processDrmInfo() is async call, and it will return without waitin
* commit '
7ea3c7f5a31dcc40d3b5042e3eb724916b66384e':
- Some change on the DrmManager in order to support feature request
4082089. In DrmManager, we currently lock both processDrmInfo() and onInfo() which is ok for now since processDrmInfo() is async call, and it will return without waiting for onInfo() call. However, if we send an event in processDrmInfo(), we will got deadlock here because we need to invoke onInf() which will wait for processDrmInfo() to release the lock. Use different lock for onInfo(). - Remove some redundent mutex lock.
Gloria Wang [Mon, 14 Mar 2011 16:32:58 +0000 (09:32 -0700)]
Merge "- Some change on the DrmManager in order to support feature request
4082089. In DrmManager, we currently lock both processDrmInfo() and onInfo() which is ok for now since processDrmInfo() is async call, and it will return without waiting for onInfo() call. However, if we send an event in processDrmInfo(), we will got deadlock here because we need to invoke onInf() which will wait for processDrmInfo() to release the lock. Use different lock for onInfo(). - Remove some redundent mutex lock." into honeycomb-mr1
Mike Lockwood [Mon, 14 Mar 2011 14:33:22 +0000 (10:33 -0400)]
MtpDevice: Handle zero length packets in readResponse()
Bug:
3509060
Change-Id: I291eefeaa667688c9e6e75da74ec3025b84065e9
Signed-off-by: Mike Lockwood <lockwood@android.com>
Mike Lockwood [Mon, 14 Mar 2011 13:55:24 +0000 (06:55 -0700)]
am
e976ff4a: Merge "Add a dialog to ask user to start an application for a USB device or accessory" into honeycomb-mr1
* commit '
e976ff4a2203e5a01c9a1c1a018ba9e5ab7777f7':
Add a dialog to ask user to start an application for a USB device or accessory
Mike Lockwood [Mon, 14 Mar 2011 13:55:21 +0000 (06:55 -0700)]
am
dec0b755: Merge "MTP host: Fix problems reading large data packets" into honeycomb-mr1
* commit '
dec0b755fff1bf87aafd397ef0dd864f54c587cf':
MTP host: Fix problems reading large data packets
Mike Lockwood [Mon, 14 Mar 2011 11:02:50 +0000 (04:02 -0700)]
Merge "Add a dialog to ask user to start an application for a USB device or accessory" into honeycomb-mr1
Mike Lockwood [Mon, 14 Mar 2011 11:02:29 +0000 (04:02 -0700)]
Merge "MTP host: Fix problems reading large data packets" into honeycomb-mr1
Mike Lockwood [Sun, 13 Mar 2011 21:26:52 +0000 (17:26 -0400)]
Add a dialog to ask user to start an application for a USB device or accessory
This is used when there is only one application available and the user has
not chosen to start it by default.
If more than one application is available we continue to use UsbResolverActivity
Bug:
4074719
Change-Id: Id61f2ccc6de5b9ac70fb4670006ff1fee2028d55
Signed-off-by: Mike Lockwood <lockwood@android.com>
Eric Laurent [Sat, 12 Mar 2011 23:59:51 +0000 (15:59 -0800)]
Partial fix for issue
3515250: video chat and SCO
Do not call directly into AudioSystem in setBluetoothScoOn() but
send a message to the AudioService handler instead. As the
procedure to switch audio path to BT SCO can last some time we should
not block the caller which can run in the UI thread.
Change-Id: I6ac4b5a934d69781db3aebe5d0e8137b52a0ada4
Mike Lockwood [Sat, 12 Mar 2011 19:03:23 +0000 (14:03 -0500)]
MTP host: Fix problems reading large data packets
Fixes problem reading large thumbnails via PTP
Bug:
4065217
Change-Id: I643672512829c93ab0827091f39103dbb1918071
Signed-off-by: Mike Lockwood <lockwood@android.com>
Christopher Tate [Sat, 12 Mar 2011 02:24:49 +0000 (18:24 -0800)]
am
767d7a03: Merge "Add a test app: quota exceeded doing a backup" into honeycomb-mr1
* commit '
767d7a03733c867da7cad466a9303208eb51699f':
Add a test app: quota exceeded doing a backup
Christopher Tate [Sat, 12 Mar 2011 02:22:37 +0000 (18:22 -0800)]
Merge "Add a test app: quota exceeded doing a backup" into honeycomb-mr1
Dianne Hackborn [Sat, 12 Mar 2011 02:04:04 +0000 (18:04 -0800)]
am
9ff64838: Merge "Fix issues #
4087362 and #
4087356" into honeycomb-mr1
* commit '
9ff6483843bfa23751b1acf32b169fca9ad97f7f':
Fix issues #
4087362 and #
4087356
Dianne Hackborn [Sat, 12 Mar 2011 02:01:47 +0000 (18:01 -0800)]
Merge "Fix issues #
4087362 and #
4087356" into honeycomb-mr1
Christopher Tate [Fri, 11 Mar 2011 20:39:17 +0000 (12:39 -0800)]
Add a test app: quota exceeded doing a backup
This is a simple test app (a clone of the Backup/Restore sample code)
that deliberately backs up 20 megabytes of data every time it performs
a backup pass. This is to trigger the quota-exceeded logic both on
the client and on the backend, for testing purposes.
Change-Id: I01f04d0f85c827baadf1990c09643d5eb5f88266
Mike Lockwood [Sat, 12 Mar 2011 01:54:23 +0000 (17:54 -0800)]
am
9fffd9a8: Merge "USB: minor cleanup work" into honeycomb-mr1
* commit '
9fffd9a8bb73e9b225878686862d49b27e98c659':
USB: minor cleanup work
Mike Lockwood [Sat, 12 Mar 2011 01:52:36 +0000 (17:52 -0800)]
Merge "USB: minor cleanup work" into honeycomb-mr1
Adam Powell [Sat, 12 Mar 2011 00:41:50 +0000 (16:41 -0800)]
am
87584f51: Merge "Fix bug
4083825 - Gesture zoom locked along content edges under some circumstances" into honeycomb-mr1
* commit '
87584f51a865cfe8ef19c2b24e858a63cb3e475c':
Fix bug
4083825 - Gesture zoom locked along content edges under some circumstances
Adam Powell [Sat, 12 Mar 2011 00:39:42 +0000 (16:39 -0800)]
Merge "Fix bug
4083825 - Gesture zoom locked along content edges under some circumstances" into honeycomb-mr1
Glenn Kasten [Sat, 12 Mar 2011 00:34:30 +0000 (16:34 -0800)]
am
76470914: Merge "Bug
3515073 Add ANativeWindow_fromSurfaceTexture" into honeycomb-mr1
* commit '
7647091436c45af2d82f12c9ea9ec77fa309b49b':
Bug
3515073 Add ANativeWindow_fromSurfaceTexture
Glenn Kasten [Sat, 12 Mar 2011 00:31:55 +0000 (16:31 -0800)]
Merge "Bug
3515073 Add ANativeWindow_fromSurfaceTexture" into honeycomb-mr1
Mike Lockwood [Fri, 11 Mar 2011 23:39:03 +0000 (18:39 -0500)]
USB: minor cleanup work
Bug:
4067029
Change-Id: Icd8f912ab8732b5f770a217b9b3731092597ce02
Signed-off-by: Mike Lockwood <lockwood@android.com>