OSDN Git Service
Elliott Hughes [Fri, 2 Aug 2013 16:39:59 +0000 (16:39 +0000)]
Merge "When wifi wants ASCII lowercasing, it needs to ask for it."
Elliott Hughes [Fri, 2 Aug 2013 16:07:54 +0000 (09:07 -0700)]
When wifi wants ASCII lowercasing, it needs to ask for it.
http://elliotth.blogspot.com/2012/01/beware-convenience-methods.html
Bug: https://code.google.com/p/android/issues/detail?id=58359
Change-Id: Ibf25d0bbc76015cf8353ec01ab2b743cbc2bde67
Elliott Hughes [Thu, 1 Aug 2013 00:49:09 +0000 (00:49 +0000)]
Merge changes I80eaecff,Ia2b4f79b
* changes:
Switch Process.myTid over to the libcore JNI too.
Replace native Process getpid/getuid with calls to libcore equivalents.
Elliott Hughes [Thu, 1 Aug 2013 00:38:11 +0000 (17:38 -0700)]
Switch Process.myTid over to the libcore JNI too.
Change-Id: I80eaecff014fabf809f4be3c9ee8b26aa64bf0cf
Jeff Hao [Tue, 30 Jul 2013 17:13:41 +0000 (10:13 -0700)]
Replace native Process getpid/getuid with calls to libcore equivalents.
The Process natives were getting called were getting called while
handling a jdwp packet before the vm had a chance to register them.
(cherry-pick of
5bce6a308fc8a3c1e449cf905b8b6e8ace4ef3e2.)
Change-Id: Ia2b4f79b11e427283a712b2d0c52948f394640bf
Jean-Baptiste Queru [Tue, 30 Jul 2013 22:24:15 +0000 (22:24 +0000)]
Merge "Fixed a leaked partial wakelock in AbstractThreadedSyncAdapter."
Elliott Hughes [Tue, 30 Jul 2013 21:04:52 +0000 (21:04 +0000)]
Merge "Update preloaded-classes"
Sungmin Choi [Tue, 30 Jul 2013 19:09:28 +0000 (12:09 -0700)]
Update preloaded-classes
Change-Id: I42247e498ad532e3f4699bc87c0d314cde74e3f6
Wink Saville [Tue, 30 Jul 2013 19:19:47 +0000 (19:19 +0000)]
Merge "Add support for MNC=00"
Elliott Hughes [Tue, 30 Jul 2013 18:37:59 +0000 (18:37 +0000)]
Merge "fix typo: Remove dulplicated comment line"
Sungmin Choi [Tue, 30 Jul 2013 18:31:19 +0000 (11:31 -0700)]
fix typo: Remove dulplicated comment line
Change-Id: I6b95998b4af5b27c7e1f9040aa5e7b7deb5d8609
Marco Nelissen [Tue, 30 Jul 2013 17:11:55 +0000 (17:11 +0000)]
Merge "MediaFormat: Explain that KEY_COLOR_FORMAT is used with decoders as well"
Lorenzo Colitti [Tue, 30 Jul 2013 16:50:40 +0000 (16:50 +0000)]
Merge "Make legacy VPN work over stacked interfaces."
Lorenzo Colitti [Tue, 30 Jul 2013 16:50:03 +0000 (16:50 +0000)]
Merge "464xlat: use a gatewayed route, not point-to-point"
Jean-Baptiste Queru [Tue, 30 Jul 2013 16:16:38 +0000 (16:16 +0000)]
Merge "Update getCheckedItemPositions() documentation"
Lorenzo Colitti [Fri, 28 Jun 2013 08:26:21 +0000 (17:26 +0900)]
Make legacy VPN work over stacked interfaces.
On stacked interfaces like 464xlat, Legacy VPN can't find the
default gateway because it uses getRoutes, which only returns
routes for the base link and not for the stacked links. It also
assumes that the interface that the default route points to is
the interface for the base link (e.g., rmnet0) instead of the
interface the route actually points to (e.g., clat4).
Fix this by calling getAllRoutes to find the default IPv4 route,
and get the interface name from the route we find instead of
assuming it's the base interface.
Bug:
9597516
Change-Id: Ia6ce0b6258a421cd22f60dedca7e94176b32176b
Lorenzo Colitti [Mon, 17 Jun 2013 18:10:27 +0000 (11:10 -0700)]
464xlat: use a gatewayed route, not point-to-point
Various applications such as Skype and our legacy VPN code
do not understand routes pointed directly at point-to-point
interfaces and require a default gateway IPv4 address in
order to function.
Grudgingly accept that routes without default gateways Are Hard
and use gatewayed routes instead. This causes routing to go from:
default dev clat4 scope link
to:
default via 192.0.0.4 dev clat4 scope link
192.0.0.4 dev clat4 scope link
and those apps now work.
Bug:
9597256
Bug:
9597516
Change-Id: I7b7890873802d3cb99affd6eb70b8ab75e7a2cf6
Michael Wright [Tue, 30 Jul 2013 02:26:01 +0000 (02:26 +0000)]
Merge "Remove deleted keylayout from Makefile"
Michael Wright [Tue, 30 Jul 2013 02:24:49 +0000 (19:24 -0700)]
Remove deleted keylayout from Makefile
Change-Id: I8aecc00861cf99d8e7278519f4e2e6fb726b7e17
Jean-Baptiste Queru [Mon, 29 Jul 2013 23:03:00 +0000 (23:03 +0000)]
Merge "MediaFormat: Fix the documentation link to the AAC profile constants"
Michael Wright [Mon, 29 Jul 2013 22:50:01 +0000 (22:50 +0000)]
Merge "Remove incorrect keymapping"
Michael Wright [Mon, 29 Jul 2013 22:48:55 +0000 (15:48 -0700)]
Remove incorrect keymapping
Turns out Snakebytes produce all 0s for their vendor / product IDs. This
somehow got the vendor / product ID of an international apple keyboard, which
will break them. Unfortunately, this also means we cannot map Snakebyte
controllers at all.
Relevant bug: https://code.google.com/p/android/issues/detail?id=58202
Change-Id: I09d246b1ab793ec04a19d558f6b98badac48b20f
Marco Nelissen [Fri, 26 Jul 2013 21:13:58 +0000 (21:13 +0000)]
Merge "Fix NullpointerException in MediaMetadataRetriever"
Mattias Petersson [Fri, 7 Oct 2011 07:33:52 +0000 (09:33 +0200)]
Add support for MNC=00
This adds support for operators with MNC (Mobile Network Code) zero
to add customized resources. For example, it makes it possible to
add a folder called "/res/values-mnc00/" in an application. This will
cause resources in that folder to be used when MNC is zero.
(There is a total of 14 countries that have an operator with MNC
zero.)
Without this fix, the resource framework gets confused, because MNC 0
is normally used when the MNC is undefined (not set).
Bug:
7170488
Change-Id: Icfd39fd0c739216e89446252ea0e7ceba6f002c6
Daniel Karlberg [Wed, 15 Aug 2012 08:00:41 +0000 (10:00 +0200)]
Fixed a leaked partial wakelock in AbstractThreadedSyncAdapter.
This fix ensures that onFinished() is always called in a syncClient
even if the application lacks the READ_SYNC_SETTINGS permission.
Change-Id: I944717e71ceae06a665f8a3b1199b41d73e12da4
Oscar Rydhé [Tue, 28 Aug 2012 05:55:36 +0000 (07:55 +0200)]
Fix NullpointerException in MediaMetadataRetriever
According to the API documentation and the ICS implementation
the setDataSource(String) method throws an
IllegalArgumentException if path is null. In JB a
NullpointerException is thrown instead. This fix restores
the earlier behaviour.
Change-Id: Ic47baadf91076acc227d92d84f6b8d1d6ecd0c03
Chet Haase [Thu, 25 Jul 2013 21:46:49 +0000 (21:46 +0000)]
Merge "Return the actual interpolator of the ViewPropertyAnimator"
Elliott Hughes [Thu, 25 Jul 2013 17:19:35 +0000 (17:19 +0000)]
Merge "Switch DateUtils.formatDateRange over to an icu4c-based implementation."
Martin Storsjo [Thu, 25 Jul 2013 09:46:56 +0000 (12:46 +0300)]
MediaFormat: Fix the documentation link to the AAC profile constants
Change-Id: If1780436baa2884cea05ccd8ab74745af790eb17
Cyril Mottier [Thu, 25 Jul 2013 08:08:29 +0000 (10:08 +0200)]
Return the actual interpolator of the ViewPropertyAnimator
The implementation of getInterpolator() was always returning null
(probably a quick copy-paste from the default Animator implementation).
This patch fixes the problem by returning the interpolator set by
setInterpolator(TimeInterpolator) or the default one if none has been
set yet.
This patch also avoid creating multiple instances of ValueAnimator in
order to retrieve some default values.
Change-Id: I8880f419f021a8b980fb32bebe927915fde19bf7
Martin Storsjo [Thu, 30 Aug 2012 14:20:42 +0000 (17:20 +0300)]
MediaFormat: Explain that KEY_COLOR_FORMAT is used with decoders as well
If reading the decoded pixel data (instead of letting the system
render it), this is critical for interpreting the data correctly.
The video MediaCodec CTS tests use this MediaFormat key in this
way as well.
Therefore, make sure the documentation reflects the actual use of
this field - claiming that it is encoder-only is misleading.
Change-Id: I9bfd295a95dd3e7d1fa3189886fd243b07bb82cc
Elliott Hughes [Wed, 24 Jul 2013 21:46:31 +0000 (14:46 -0700)]
Switch DateUtils.formatDateRange over to an icu4c-based implementation.
Bug:
7289514
Change-Id: Ia382f49aa23737bde91b7891d95545da084ec57c
Cyril Mottier [Tue, 23 Jul 2013 11:58:33 +0000 (13:58 +0200)]
Update getCheckedItemPositions() documentation
getCheckedItemPositions()'s documentation previously mentioned the
returned SparseBooleanArray was only containing checked item positions
(i.e. get(int position) always returning true). In practice, this is
wrong, because getCheckedItemPositions() returns mCheckStates which
basically contains all key-value mappings that have been used. As a
consequence if the item at position p is checked and unchecked, the
returned SparseBooleanArray will contain a (p, false) mapping.
Another option could be to delete all keys having a false value.
Change-Id: I15f8fc2a1ba3f1501af126c272b827402cfd8b14
Chet Haase [Mon, 22 Jul 2013 15:59:30 +0000 (08:59 -0700)]
am
53771e5f: Merge "Remove useless/repetitive code"
* commit '
53771e5f955f67035cf6b6432c34171a18ab14dc':
Remove useless/repetitive code
Chet Haase [Mon, 22 Jul 2013 15:55:52 +0000 (15:55 +0000)]
Merge "Remove useless/repetitive code"
Elliott Hughes [Thu, 18 Jul 2013 17:41:41 +0000 (10:41 -0700)]
am
0bad5370: Merge "Handle missing and invalid numeric values in XmlUtils."
* commit '
0bad537093ed5b493e4c2af778cf802a2cf2c15f':
Handle missing and invalid numeric values in XmlUtils.
Elliott Hughes [Thu, 18 Jul 2013 17:38:57 +0000 (17:38 +0000)]
Merge "Handle missing and invalid numeric values in XmlUtils."
Elliott Hughes [Thu, 18 Jul 2013 16:36:48 +0000 (09:36 -0700)]
am
15cb526e: Merge "Fix import after okhttp update."
* commit '
15cb526ece1420b1ae2061e20fd0982d82b41aae':
Fix import after okhttp update.
Elliott Hughes [Thu, 18 Jul 2013 16:33:40 +0000 (16:33 +0000)]
Merge "Fix import after okhttp update."
Narayan Kamath [Thu, 18 Jul 2013 12:42:50 +0000 (13:42 +0100)]
Fix import after okhttp update.
OkResponseCache moved packages in change
62321.
Change-Id: I2c08c4586405e767d1931ebc5f185c7916850fa1
Adam Powell [Wed, 17 Jul 2013 00:06:36 +0000 (17:06 -0700)]
am
30ad7203: Merge "Consider mScrollX when drawing the checkMarkDrawable"
* commit '
30ad720304790b07112b87f973a7e6ed5e1e6ee5':
Consider mScrollX when drawing the checkMarkDrawable
Adam Powell [Wed, 17 Jul 2013 00:04:28 +0000 (00:04 +0000)]
Merge "Consider mScrollX when drawing the checkMarkDrawable"
The Android Open Source Project [Mon, 15 Jul 2013 16:32:49 +0000 (09:32 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Ib08f5c3c72f9d6eee571e7f9dff130abadffbbec
The Android Automerger [Mon, 15 Jul 2013 15:19:11 +0000 (08:19 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Cyril Mottier [Mon, 15 Jul 2013 08:29:48 +0000 (10:29 +0200)]
Remove useless/repetitive code
fixScale(float) method has been extracted from the code but the original
code has been kept in place. Because of this, the animation scale is
"fixed" twice which is not necessary. This patch, simply call
fixScale(float) once and stores the result of it in the scale variable.
Change-Id: I50aeacbc2c13ebbf447506ae4309d50c0e313837
Adam Powell [Fri, 12 Jul 2013 22:11:41 +0000 (15:11 -0700)]
am
1dc3b790: am
4b8cc94c: Merge "PreferenceActivity should not leave message in looper when destroyed"
* commit '
1dc3b790df61aa95cb68da390045249c59049fcd':
PreferenceActivity should not leave message in looper when destroyed
Adam Powell [Fri, 12 Jul 2013 22:09:54 +0000 (15:09 -0700)]
am
4b8cc94c: Merge "PreferenceActivity should not leave message in looper when destroyed"
* commit '
4b8cc94cc67d760e724c56aee9301d1bcc2bbe89':
PreferenceActivity should not leave message in looper when destroyed
Adam Powell [Fri, 12 Jul 2013 22:07:04 +0000 (22:07 +0000)]
Merge "PreferenceActivity should not leave message in looper when destroyed"
Scott Main [Fri, 12 Jul 2013 21:28:40 +0000 (14:28 -0700)]
am
797a99ff: am
c0f5bb70: am
ca4b112e: am
546ac85a: am
ad17523d: add warning for Windows users and fix typos
* commit '
797a99ff3e7e1fd81f8def2e5ca4ea089c01ad06':
add warning for Windows users and fix typos
Scott Main [Fri, 12 Jul 2013 21:22:48 +0000 (14:22 -0700)]
am
c0f5bb70: am
ca4b112e: am
546ac85a: am
ad17523d: add warning for Windows users and fix typos
* commit '
c0f5bb70b72c25c0057d2318bbcc8d79553d1e12':
add warning for Windows users and fix typos
Scott Main [Fri, 12 Jul 2013 21:20:11 +0000 (14:20 -0700)]
am
ca4b112e: am
546ac85a: am
ad17523d: add warning for Windows users and fix typos
* commit '
ca4b112eb243b1350aba000c4f021574be25bd96':
add warning for Windows users and fix typos
Scott Main [Fri, 12 Jul 2013 21:17:30 +0000 (14:17 -0700)]
am
546ac85a: am
ad17523d: add warning for Windows users and fix typos
* commit '
546ac85a834cf033cf1f3ce82624f1f4a63d099f':
add warning for Windows users and fix typos
Scott Main [Fri, 12 Jul 2013 21:15:15 +0000 (14:15 -0700)]
am
ad17523d: add warning for Windows users and fix typos
* commit '
ad17523da976c2d6b7b70fd3aa9ad290e4731224':
add warning for Windows users and fix typos
Scott Main [Fri, 12 Jul 2013 18:28:01 +0000 (11:28 -0700)]
add warning for Windows users and fix typos
Change-Id: I694baa83cde2b97cf0159a75358fa129bd656da3
Wink Saville [Fri, 12 Jul 2013 19:03:53 +0000 (12:03 -0700)]
am
42a85412: am
925ec03f: Merge "VZW wants the phoneNumber to be 10 zero\'s if there isn\'t one." into jb-mr2-dev
* commit '
42a85412d12078f36c3fdeda1211bdc3800bab0c':
VZW wants the phoneNumber to be 10 zero's if there isn't one.
Wink Saville [Fri, 12 Jul 2013 19:01:41 +0000 (12:01 -0700)]
am
925ec03f: Merge "VZW wants the phoneNumber to be 10 zero\'s if there isn\'t one." into jb-mr2-dev
* commit '
925ec03fcd9651ff4c6b04982eb6d930b16493b9':
VZW wants the phoneNumber to be 10 zero's if there isn't one.
Wink Saville [Fri, 12 Jul 2013 18:59:03 +0000 (18:59 +0000)]
Merge "VZW wants the phoneNumber to be 10 zero's if there isn't one." into jb-mr2-dev
Amith Yamasani [Fri, 12 Jul 2013 18:21:27 +0000 (11:21 -0700)]
am
1a1a7c08: am
06a441de: Merge "Pass along the user id to AttributeCache requests" into jb-mr2-dev
* commit '
1a1a7c0878320b94d01da6bdfaa857c85b4199a3':
Pass along the user id to AttributeCache requests
Amith Yamasani [Fri, 12 Jul 2013 18:19:24 +0000 (11:19 -0700)]
am
06a441de: Merge "Pass along the user id to AttributeCache requests" into jb-mr2-dev
* commit '
06a441de3b6756cf49879ff445ac26c66da54d02':
Pass along the user id to AttributeCache requests
Amith Yamasani [Fri, 12 Jul 2013 18:17:09 +0000 (18:17 +0000)]
Merge "Pass along the user id to AttributeCache requests" into jb-mr2-dev
The Android Open Source Project [Fri, 12 Jul 2013 14:27:43 +0000 (07:27 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Ic45c05e30f974890e8c5320393f95adaf0d0a79f
Hiroaki Kuriyama [Fri, 16 Nov 2012 09:46:49 +0000 (18:46 +0900)]
PreferenceActivity should not leave message in looper when destroyed
When a PreferenceActivity is destroyed as soon as created,
there is a problematic case that messages for the activity are
sometimes left in the looper even after the activity is destroyed.
For example, by clearing user data of the selecting IME on
Settings apk, com.android.settings.Settings is re-launched
2 times successively. (Destory->Create->Destroy->Create)
Due to the left message, application crash can happen.
(NullPointerException at BackStackRecord.getBreadCrumbTitle())
Two cases have been found to observe this issue.
[Case 1]
1,Launch IME in advance.
2,Go to Settings >Apps > All and choose the IME package.
3,Click "Clear data"
4,Application crash occurs on com.android.settings.
[Case 2]
1,Go to Settings > Language&input > Language.
2,ListView dialog to choose language is shown.
3,Rotate the tablet 180 degree so that 90 degree rotation occurs twice.
4,Application crash occurs on com.android.settings.
Change-Id: I5ce36ea7a40ab7bc7737b7dca6641a4c3d77a480
Elliott Hughes [Fri, 12 Jul 2013 01:55:54 +0000 (18:55 -0700)]
am
f094eefc: am
c5de9c35: Merge "Track libcore API update."
* commit '
f094eefc34013c7167effa558b488709eaa54751':
Track libcore API update.
Elliott Hughes [Fri, 12 Jul 2013 01:52:11 +0000 (18:52 -0700)]
am
c5de9c35: Merge "Track libcore API update."
* commit '
c5de9c3509e6f91f1a6fca4541c5a2dfc9878dcc':
Track libcore API update.
Scott Main [Fri, 12 Jul 2013 01:14:52 +0000 (18:14 -0700)]
am
a60edcbe: am
c079e43f: am
e920ab1a: am
a618e938: am
c660c608: Merge "add Toshiba usb driver link delete Fujitsu-Toshiba bug:
9755017" into jb-mr1.1-ub-dev
* commit '
a60edcbee7d99058eb689761097826adac0593e7':
add Toshiba usb driver link delete Fujitsu-Toshiba bug:
9755017
Scott Main [Fri, 12 Jul 2013 01:12:01 +0000 (18:12 -0700)]
am
c079e43f: am
e920ab1a: am
a618e938: am
c660c608: Merge "add Toshiba usb driver link delete Fujitsu-Toshiba bug:
9755017" into jb-mr1.1-ub-dev
* commit '
c079e43fc317087ae5517ee7d9a376e97fef0f57':
add Toshiba usb driver link delete Fujitsu-Toshiba bug:
9755017
Scott Main [Fri, 12 Jul 2013 01:09:53 +0000 (18:09 -0700)]
am
e920ab1a: am
a618e938: am
c660c608: Merge "add Toshiba usb driver link delete Fujitsu-Toshiba bug:
9755017" into jb-mr1.1-ub-dev
* commit '
e920ab1a82327976e0a25842d7d57dc7a92ba604':
add Toshiba usb driver link delete Fujitsu-Toshiba bug:
9755017
Dirk Dougherty [Fri, 12 Jul 2013 01:08:36 +0000 (18:08 -0700)]
am
e34e6520: am
e4709679: am
c1addd47: am
c7da42d7: am
f7832a35: am
d6bbda24: am
bc5f9b66: Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs
* commit '
e34e65203f8188849cfebb901c4efe5b5b4ad8d5':
Doc change: Update gcore reference docs.
Scott Main [Fri, 12 Jul 2013 01:08:01 +0000 (18:08 -0700)]
am
a618e938: am
c660c608: Merge "add Toshiba usb driver link delete Fujitsu-Toshiba bug:
9755017" into jb-mr1.1-ub-dev
* commit '
a618e93891603f825fd2c0ec1a67c96c29863dcd':
add Toshiba usb driver link delete Fujitsu-Toshiba bug:
9755017
Dirk Dougherty [Fri, 12 Jul 2013 01:06:22 +0000 (18:06 -0700)]
am
e4709679: am
c1addd47: am
c7da42d7: am
f7832a35: am
d6bbda24: am
bc5f9b66: Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs
* commit '
e4709679198590fa37fbad67df0d7e3827c4f8cf':
Doc change: Update gcore reference docs.
Scott Main [Fri, 12 Jul 2013 01:05:44 +0000 (18:05 -0700)]
am
c660c608: Merge "add Toshiba usb driver link delete Fujitsu-Toshiba bug:
9755017" into jb-mr1.1-ub-dev
* commit '
c660c608e75791d5b4b286f34a9ec335f9e95ba6':
add Toshiba usb driver link delete Fujitsu-Toshiba bug:
9755017
Scott Main [Fri, 12 Jul 2013 01:03:22 +0000 (01:03 +0000)]
Merge "add Toshiba usb driver link delete Fujitsu-Toshiba bug:
9755017" into jb-mr1.1-ub-dev
Dirk Dougherty [Fri, 12 Jul 2013 01:03:17 +0000 (18:03 -0700)]
am
c1addd47: am
c7da42d7: am
f7832a35: am
d6bbda24: am
bc5f9b66: Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs
* commit '
c1addd4750be5b1721a8668a110e74fa59e476c6':
Doc change: Update gcore reference docs.
Dirk Dougherty [Fri, 12 Jul 2013 01:01:26 +0000 (18:01 -0700)]
am
c7da42d7: am
f7832a35: am
d6bbda24: am
bc5f9b66: Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs
* commit '
c7da42d76470c4e9fb541058e942e31163275b83':
Doc change: Update gcore reference docs.
Dirk Dougherty [Fri, 12 Jul 2013 00:59:22 +0000 (17:59 -0700)]
am
f7832a35: am
d6bbda24: am
bc5f9b66: Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs
* commit '
f7832a35f3961e1b6665b5428899cdad598f0544':
Doc change: Update gcore reference docs.
Dirk Dougherty [Fri, 12 Jul 2013 00:56:35 +0000 (17:56 -0700)]
am
d6bbda24: am
bc5f9b66: Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs
* commit '
d6bbda24150eddc59865133377f6b41c8a1ed3b5':
Doc change: Update gcore reference docs.
Dirk Dougherty [Fri, 12 Jul 2013 00:54:00 +0000 (17:54 -0700)]
am
bc5f9b66: Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs
* commit '
bc5f9b66744b76c676543902d31d324f2dd02d09':
Doc change: Update gcore reference docs.
Dirk Dougherty [Fri, 12 Jul 2013 00:50:59 +0000 (00:50 +0000)]
Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs
Scott Main [Fri, 12 Jul 2013 00:46:29 +0000 (17:46 -0700)]
am
334f6ea6: am
24810c6f: am
3c13e528: am
536fa1bb: am
84ad0894: fix markup error in download button and fix transition to install/update guide
* commit '
334f6ea68945dd642e6a924bf399d2afd21bf107':
fix markup error in download button and fix transition to install/update guide
Scott Main [Fri, 12 Jul 2013 00:44:09 +0000 (17:44 -0700)]
am
24810c6f: am
3c13e528: am
536fa1bb: am
84ad0894: fix markup error in download button and fix transition to install/update guide
* commit '
24810c6f5854e595b2c78f9c3e44b7d4045a7472':
fix markup error in download button and fix transition to install/update guide
Scott Main [Fri, 12 Jul 2013 00:41:48 +0000 (17:41 -0700)]
am
3c13e528: am
536fa1bb: am
84ad0894: fix markup error in download button and fix transition to install/update guide
* commit '
3c13e5284e83390301bf3306e5d77f7014483ea0':
fix markup error in download button and fix transition to install/update guide
Scott Main [Fri, 12 Jul 2013 00:38:31 +0000 (17:38 -0700)]
am
536fa1bb: am
84ad0894: fix markup error in download button and fix transition to install/update guide
* commit '
536fa1bbe10b793e7c5d585c974693349fb8a4f5':
fix markup error in download button and fix transition to install/update guide
Scott Main [Fri, 12 Jul 2013 00:36:53 +0000 (17:36 -0700)]
am
84ad0894: fix markup error in download button and fix transition to install/update guide
* commit '
84ad0894be13b374b9b75e204dabea6a1579e131':
fix markup error in download button and fix transition to install/update guide
Scott Main [Fri, 12 Jul 2013 00:26:13 +0000 (17:26 -0700)]
fix markup error in download button and fix transition to install/update guide
Change-Id: I54b6ed06247ff7456089058549e373a19d9e5016
Jeff Sharkey [Thu, 11 Jul 2013 18:18:53 +0000 (11:18 -0700)]
Recover from corrupt network stats.
When encountering corrupt stats, throw as IOException to allow
recovery at a higher level.
Bug:
9794832
Change-Id: I38d000b3bd8a4c99389c40a87ee0699efb6e9049
Robert Greenwalt [Fri, 12 Jul 2013 00:09:14 +0000 (17:09 -0700)]
am
56a7e4ad: am
116d4665: Merge "Block Wifi P2p discovery while doing dhcp." into jb-mr2-dev
* commit '
56a7e4ad43eb5288a80b34566db365aaaa845e87':
Block Wifi P2p discovery while doing dhcp.
Robert Greenwalt [Fri, 12 Jul 2013 00:07:06 +0000 (17:07 -0700)]
am
116d4665: Merge "Block Wifi P2p discovery while doing dhcp." into jb-mr2-dev
* commit '
116d46659889f588fa9ffa5e1bc4dda90067fce6':
Block Wifi P2p discovery while doing dhcp.
Robert Greenwalt [Fri, 12 Jul 2013 00:04:45 +0000 (00:04 +0000)]
Merge "Block Wifi P2p discovery while doing dhcp." into jb-mr2-dev
Scott Main [Thu, 11 Jul 2013 23:50:57 +0000 (16:50 -0700)]
am
7afc5ca3: am
57b0fed7: am
603c3d8a: am
3e82a9c9: am
276f0ce4: update Android Studio for v0.2.0. add release notes and troubleshooting topics
* commit '
7afc5ca353c9b4a3839c988fe6c281289495a18a':
update Android Studio for v0.2.0. add release notes and troubleshooting topics
Scott Main [Thu, 11 Jul 2013 23:47:53 +0000 (16:47 -0700)]
am
57b0fed7: am
603c3d8a: am
3e82a9c9: am
276f0ce4: update Android Studio for v0.2.0. add release notes and troubleshooting topics
* commit '
57b0fed7a9a1a1fe6ed5dce3bb6855f03c1b15a8':
update Android Studio for v0.2.0. add release notes and troubleshooting topics
Scott Main [Thu, 11 Jul 2013 23:44:58 +0000 (16:44 -0700)]
am
603c3d8a: am
3e82a9c9: am
276f0ce4: update Android Studio for v0.2.0. add release notes and troubleshooting topics
* commit '
603c3d8a9ac2b81be0ea09690ba324e2ed744ccd':
update Android Studio for v0.2.0. add release notes and troubleshooting topics
Scott Main [Thu, 11 Jul 2013 23:42:47 +0000 (16:42 -0700)]
am
3e82a9c9: am
276f0ce4: update Android Studio for v0.2.0. add release notes and troubleshooting topics
* commit '
3e82a9c9a5339dca5f4a91c6e5822906cd632ae2':
update Android Studio for v0.2.0. add release notes and troubleshooting topics
Scott Main [Thu, 11 Jul 2013 23:40:11 +0000 (16:40 -0700)]
am
276f0ce4: update Android Studio for v0.2.0. add release notes and troubleshooting topics
* commit '
276f0ce4df7f58786da08c34f548456129144aed':
update Android Studio for v0.2.0. add release notes and troubleshooting topics
Scott Main [Thu, 11 Jul 2013 22:31:10 +0000 (15:31 -0700)]
update Android Studio for v0.2.0.
add release notes and troubleshooting topics
Change-Id: Ic924d61f9ab9208ed3275edb8837d8593d752ae9
Scott Main [Tue, 9 Jul 2013 17:43:45 +0000 (10:43 -0700)]
add Toshiba usb driver link
delete Fujitsu-Toshiba
bug:
9755017
Change-Id: If1417c7e697a2bea9fbdd3086ffeaf1528627364
Jeff Sharkey [Thu, 11 Jul 2013 18:41:24 +0000 (11:41 -0700)]
am
f8b69275: am
1f99a483: Recover from corrupt network stats.
* commit '
f8b692754f7739e11c8438ab59c0760194cfacc5':
Recover from corrupt network stats.
Jeff Sharkey [Thu, 11 Jul 2013 18:38:50 +0000 (11:38 -0700)]
am
1f99a483: Recover from corrupt network stats.
* commit '
1f99a483e410811473b12d8efedd79c738df7af3':
Recover from corrupt network stats.
Jeff Sharkey [Thu, 11 Jul 2013 18:18:53 +0000 (11:18 -0700)]
Recover from corrupt network stats.
When encountering corrupt stats, throw as IOException to allow
recovery at a higher level.
Bug:
9794832
Change-Id: I38d000b3bd8a4c99389c40a87ee0699efb6e9049
Robert Greenwalt [Fri, 28 Jun 2013 22:55:28 +0000 (15:55 -0700)]
Block Wifi P2p discovery while doing dhcp.
bug:
9531609
bug:
9302399
Change-Id: Ie4b7c3a75245a0e7cc09fa89ddb1187d349779a1
Elliott Hughes [Thu, 11 Jul 2013 17:09:14 +0000 (17:09 +0000)]
Merge "Track libcore API update."