OSDN Git Service
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
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
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
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
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>
Kenny Root [Fri, 11 Mar 2011 23:45:34 +0000 (15:45 -0800)]
am
2fdf829a: Merge "Remove unnecessary SkImageDecoder_libjpeg.cpp"
* commit '
2fdf829a17fdac4e6d65f5a85a69d0ec9cfd0a7d':
Remove unnecessary SkImageDecoder_libjpeg.cpp
Nicolas Roard [Fri, 11 Mar 2011 23:11:14 +0000 (15:11 -0800)]
am
f0230cca: Merge "HTML5 Video improvements" into honeycomb-mr1
* commit '
f0230cca194c840684bab959856c56725fc40b87':
HTML5 Video improvements
Gloria Wang [Fri, 11 Mar 2011 22:07:21 +0000 (14:07 -0800)]
- 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.
Change-Id: I59c794f95ba1693425723224114fa975cf9b235f
Nicolas Roard [Fri, 11 Mar 2011 22:35:32 +0000 (14:35 -0800)]
Merge "HTML5 Video improvements" into honeycomb-mr1
James Dong [Fri, 11 Mar 2011 22:31:37 +0000 (14:31 -0800)]
am
68f66b94: Merge "MP3Extractor and MP3 decoder fixes - DO NOT MERGE" into gingerbread
* commit '
68f66b945e7a69549689becd2e656d9056f1e7f5':
MP3Extractor and MP3 decoder fixes - DO NOT MERGE
Nicolas Roard [Fri, 11 Mar 2011 22:29:05 +0000 (14:29 -0800)]
HTML5 Video improvements
- add support for the fullscreen button
counterpart webkit CL: https://android-git.corp.google.com/g/#change,101484
bug:
2126902
Change-Id: Ibcc8c5b115089ad1f30ebe76e4d5c31b2d6389f9
Kenny Root [Fri, 11 Mar 2011 22:22:22 +0000 (14:22 -0800)]
Merge "Remove unnecessary SkImageDecoder_libjpeg.cpp"
Robert Greenwalt [Fri, 11 Mar 2011 22:16:18 +0000 (14:16 -0800)]
Merge "resolved conflicts for merge of
55b53d35 to honeycomb-plus-aosp" into honeycomb-plus-aosp
Robert Greenwalt [Fri, 11 Mar 2011 22:05:14 +0000 (14:05 -0800)]
resolved conflicts for merge of
55b53d35 to honeycomb-plus-aosp
Change-Id: I7909f30fa5273693d115fd4b565f6c424c95dcc0
Dianne Hackborn [Fri, 11 Mar 2011 21:17:57 +0000 (13:17 -0800)]
Fix issues #
4087362 and #
4087356
4087362: Provide a safer way to call DialogFragment.dismiss()
4087356: PreferenceActivity.invalidateHeaders() can cause
IllegalStateException: Can not perform this action after onSaveInstanceState
These are very safe; the first is just a new public API that
allows you to use an existing feature in DialogFragment, and the
second just uses the version of commit that avoids the failure if
happening at a point where the operation would be lost if restored
from the last state (which is no big deal for preferences).
Change-Id: I53971c9fb1efdcd599694cdcd4585b81afc156b8
James Dong [Fri, 11 Mar 2011 21:38:02 +0000 (13:38 -0800)]
Merge "MP3Extractor and MP3 decoder fixes - DO NOT MERGE" into gingerbread
Mike Lockwood [Fri, 11 Mar 2011 21:26:14 +0000 (13:26 -0800)]
am
14c875ea: Merge "Clear default for USB device/accessory when new matching app is installed" into honeycomb-mr1
* commit '
14c875eac750ca096de439225b1a028b1facc58e':
Clear default for USB device/accessory when new matching app is installed
Mike Lockwood [Fri, 11 Mar 2011 21:24:01 +0000 (13:24 -0800)]
Merge "Clear default for USB device/accessory when new matching app is installed" into honeycomb-mr1
Joe Malin [Fri, 11 Mar 2011 21:12:37 +0000 (13:12 -0800)]
am
761b8440: am
9f187296: Merge "DOC CHANGE: Fix
4084450 monkeyrunner_concepts" into honeycomb
* commit '
761b84409135641ec27bb828dbd8a1d04a7252fe':
DOC CHANGE: Fix
4084450 monkeyrunner_concepts
Mike Lockwood [Fri, 11 Mar 2011 21:12:07 +0000 (16:12 -0500)]
Clear default for USB device/accessory when new matching app is installed
Bug:
4063041
Change-Id: Ia1b4f29d3e54ec21aa64407720d9d5db62855380
Signed-off-by: Mike Lockwood <lockwood@android.com>
Joe Malin [Fri, 11 Mar 2011 21:10:29 +0000 (13:10 -0800)]
am
9f187296: Merge "DOC CHANGE: Fix
4084450 monkeyrunner_concepts" into honeycomb
* commit '
9f18729676a58cdfcee98db3329de3397c657d48':
DOC CHANGE: Fix
4084450 monkeyrunner_concepts
Joe Malin [Fri, 11 Mar 2011 21:08:59 +0000 (13:08 -0800)]
Merge "DOC CHANGE: Fix
4084450 monkeyrunner_concepts" into honeycomb
Ying Wang [Fri, 11 Mar 2011 20:05:22 +0000 (12:05 -0800)]
am
69e725eb: Merge "Dist com.android.nfc_extras.jar." into gingerbread
* commit '
69e725eb8806180749b66903382754c86a15d0f6':
Dist com.android.nfc_extras.jar.
Robert Greenwalt [Fri, 11 Mar 2011 19:52:31 +0000 (11:52 -0800)]
am
b5c51d5f: Merge "DO NOT MERGE Backport of I1f55df8a from " into gingerbread
* commit '
b5c51d5fa88c56ebbfb56af89beb077aa4f1f2f8':
DO NOT MERGE Backport of I1f55df8a from master.
Adam Powell [Fri, 11 Mar 2011 19:44:08 +0000 (11:44 -0800)]
Fix bug
4083825 - Gesture zoom locked along content edges under some
circumstances
Tune the procedure used to handle "zoom slop" during a webview
pan+zoom gesture.
Change-Id: Ia706722ba6a46e64cce8814d4668e3857b16e562
Mike Lockwood [Fri, 11 Mar 2011 19:37:14 +0000 (11:37 -0800)]
am
0eb7b697: Merge changes Ib63ab95a,I585b0610,Ia84da0b5 into honeycomb-mr1
* commit '
0eb7b697b7c180660647b5cd0cd7dd067f6b6abb':
UsbManager: Hide APIs not needed for USB host or accessory support.
Remove MtpClient class from framework and public API
UsbDevice: Move IO related methods to new UsbDeviceConnection class
James Dong [Fri, 11 Mar 2011 19:02:17 +0000 (11:02 -0800)]
MP3Extractor and MP3 decoder fixes - DO NOT MERGE
cherry-picked the following patches from HC branch:
o PV's mp3 decoder mistreated inputBufferCurrentLength in unit of bytes as in unit of bits
o Do not enforce the rule in MP3Extractor that all audio frames in an mp3 file must have the same mode
o When the temp buffer wraps around, the next read position should start
from what have been read to avoid reading the same remaining bytes in
the buffer again.
o Speed up MP3Extractor using cached reads
bug -
4083532
Change-Id: I7bbd2bd358fd5ee322287866cb8ee0c2bb217fea
Mike Lockwood [Fri, 11 Mar 2011 18:57:06 +0000 (10:57 -0800)]
Merge changes Ib63ab95a,I585b0610,Ia84da0b5 into honeycomb-mr1
* changes:
UsbManager: Hide APIs not needed for USB host or accessory support.
Remove MtpClient class from framework and public API
UsbDevice: Move IO related methods to new UsbDeviceConnection class
Christopher Tate [Fri, 11 Mar 2011 18:48:46 +0000 (10:48 -0800)]
am
9856fbd4: Merge "Broaden the filter for wallpaper restore" into honeycomb-mr1
* commit '
9856fbd40470c9f441b6c38b980210cfdef821e9':
Broaden the filter for wallpaper restore
Christopher Tate [Fri, 11 Mar 2011 18:45:17 +0000 (10:45 -0800)]
Merge "Broaden the filter for wallpaper restore" into honeycomb-mr1
Dianne Hackborn [Fri, 11 Mar 2011 18:44:46 +0000 (10:44 -0800)]
am
7b076307: Merge "Fix issue #
4084124: Wingray Often see black screen after market ANR due to
4084121" into honeycomb-mr1
* commit '
7b076307bb1f78d3f5616b7f2f2ad496aa4a33d7':
Fix issue #
4084124: Wingray Often see black screen after market ANR due to
4084121
Dianne Hackborn [Fri, 11 Mar 2011 18:44:42 +0000 (10:44 -0800)]
am
492eb33d: Merge "Fix issue #
4081756: Crash when un-stopping applications" into honeycomb-mr1
* commit '
492eb33d549afa65e630d2f4886b1bdf3d979d04':
Fix issue #
4081756: Crash when un-stopping applications
Dianne Hackborn [Fri, 11 Mar 2011 18:39:46 +0000 (10:39 -0800)]
Merge "Fix issue #
4084124: Wingray Often see black screen after market ANR due to
4084121" into honeycomb-mr1
Dianne Hackborn [Fri, 11 Mar 2011 18:38:52 +0000 (10:38 -0800)]
Merge "Fix issue #
4081756: Crash when un-stopping applications" into honeycomb-mr1
Ying Wang [Fri, 11 Mar 2011 18:17:49 +0000 (10:17 -0800)]
Merge "Dist com.android.nfc_extras.jar." into gingerbread
Robert Greenwalt [Fri, 11 Mar 2011 18:14:28 +0000 (10:14 -0800)]
Merge "DO NOT MERGE Backport of I1f55df8a from " into gingerbread
Glenn Kasten [Fri, 11 Mar 2011 16:44:35 +0000 (08:44 -0800)]
am
92f2f3ff: Merge "Bug
3012968 DRM output control" into honeycomb-mr1
* commit '
92f2f3ff2ea5c5b474722f2055cfee4916010e26':
Bug
3012968 DRM output control
Glenn Kasten [Fri, 11 Mar 2011 16:43:05 +0000 (08:43 -0800)]
Merge "Bug
3012968 DRM output control" into honeycomb-mr1
Mike Lockwood [Fri, 11 Mar 2011 16:26:11 +0000 (11:26 -0500)]
UsbManager: Hide APIs not needed for USB host or accessory support.
Bug:
4067029
Change-Id: Ib63ab95a6571d6a691834bfb583a68d2e4cfd22e
Signed-off-by: Mike Lockwood <lockwood@android.com>
Mike Lockwood [Fri, 11 Mar 2011 15:55:44 +0000 (10:55 -0500)]
Remove MtpClient class from framework and public API
After reviewing this class I decided it would be best not to include it in the public API
since it adds no functionality that cannot be done using MtpDevice and other APIs directly.
So I am moving it to the CameraBrowser sample instead.
Also changed CameraBrowser to build against the SDK to ensure all the necessary APIs for
PTP support have been made public.
Bug:
4067029
Change-Id: I585b06104084953176d018ced08bba0cb4607490
Signed-off-by: Mike Lockwood <lockwood@android.com>
Mike Lockwood [Fri, 11 Mar 2011 13:18:08 +0000 (08:18 -0500)]
UsbDevice: Move IO related methods to new UsbDeviceConnection class
UsbDevice is now just an immutable parcelable object like UsbInterface and
UsbEndpoint.
All IO related functionality is now contained in UsbDeviceConnection
and UsbRequest.
Bug:
4067029
Change-Id: Ia84da0b512a697acc940eee0c3566711c62e1a68
Signed-off-by: Mike Lockwood <lockwood@android.com>
Mike Lockwood [Fri, 11 Mar 2011 14:02:57 +0000 (06:02 -0800)]
am
364903ba: Merge "Support for USB accessory URIs" into honeycomb-mr1
* commit '
364903bac6b9bfde694f1c0c5c40b6a2af628408':
Support for USB accessory URIs
Mike Lockwood [Fri, 11 Mar 2011 13:56:50 +0000 (05:56 -0800)]
Merge "Support for USB accessory URIs" into honeycomb-mr1