OSDN Git Service
Jeff Brown [Fri, 12 Jul 2013 23:56:34 +0000 (16:56 -0700)]
Declare permission for accessing input flinger.
Change-Id: I2914b301b74e0d310a9e95e2d6fb5cb72d3e3703
Geremy Condra [Mon, 15 Jul 2013 21:57:18 +0000 (21:57 +0000)]
Merge "Support routing sockets as another user"
Geremy Condra [Mon, 15 Jul 2013 21:56:54 +0000 (21:56 +0000)]
Merge "Restricted profiles use Owner's VPN"
Geremy Condra [Mon, 15 Jul 2013 21:56:30 +0000 (21:56 +0000)]
Merge changes Ia6646363,I94389b64
* changes:
Add per user VPN support
Add NetworkUtil function for marking sockets
Igor Murashkin [Mon, 15 Jul 2013 20:45:35 +0000 (20:45 +0000)]
Merge "camera2: Implement CameraDevice#getCameraInfo"
Igor Murashkin [Sat, 13 Jul 2013 01:01:31 +0000 (18:01 -0700)]
camera2: Implement CameraDevice#getCameraInfo
Bug:
9529161
Change-Id: Ie37d1e07bb8416cbb141f4d49e52337bf7236610
Chris Craik [Mon, 15 Jul 2013 19:29:10 +0000 (19:29 +0000)]
Merge "Add webp to BitmapFactory.Options outMimetype"
Chad Brubaker [Thu, 11 Jul 2013 20:29:30 +0000 (13:29 -0700)]
Support routing sockets as another user
Add support for routing sockets as if they were another user's.
This is for services that handle delegated network tasks like MediaServer and DownloadManager.
Change-Id: Id20efc1f5c2cce6f8838d777762f6c0a703a9437
Chad Brubaker [Wed, 10 Jul 2013 21:46:23 +0000 (14:46 -0700)]
Restricted profiles use Owner's VPN
Restricted profiles cannot start their own VPN and will use the Owner's
VPN if one is running.
Change-Id: I1fc153742047f9149acb414c4c9d35305e97d8d0
Evan Charlton [Mon, 15 Jul 2013 18:31:20 +0000 (18:31 +0000)]
Merge "Add carrier setup app integration"
Svetoslav [Mon, 15 Jul 2013 17:25:59 +0000 (17:25 +0000)]
Merge "Allowing the root user to use the screen introspection APIs."
Svetoslav [Mon, 15 Jul 2013 17:20:27 +0000 (10:20 -0700)]
Allowing the root user to use the screen introspection APIs.
We were allowing the system and the shell user to access use the
screen introspection APIs but the root user was not able to to so.
This change enableS the root user to also use these APIs. Note that
we usually allow the root user to access privileged functionality
similarly to the shell user of the system.
bug:
8877685
Change-Id: Ie4008339e864b835bd3a2d5e06b042e4431c5270
The Android Open Source Project [Mon, 15 Jul 2013 16:37:54 +0000 (09:37 -0700)]
am
59734490: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
59734490f6a4f46308c39368a7b20f4fcf5e0e97':
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
John Spurlock [Mon, 17 Jun 2013 14:32:46 +0000 (10:32 -0400)]
Docfixes in IBinder, Context, View, and Intent.
Fix links in @throws clauses, typos, redundant "returns"
and use @code for true + false in returns.
Change-Id: Ic3c4c75d6061732d997a386dc3232475c992c188
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
Chad Brubaker [Fri, 14 Jun 2013 18:16:51 +0000 (11:16 -0700)]
Add per user VPN support
VPNs are now per user instead of global. A VPN set by user A routes only
user A's traffic and no other user can access it.
Change-Id: Ia66463637b6bd088b05768076a1db897fe95c46c
Chris Craik [Sat, 13 Jul 2013 02:46:19 +0000 (19:46 -0700)]
Add webp to BitmapFactory.Options outMimetype
Change-Id: Id0d5b4d6c2c5b21fa0b31f1a5ada6275fdc38f44
Dianne Hackborn [Sat, 13 Jul 2013 01:15:30 +0000 (01:15 +0000)]
Merge "Add new proc state constants and delivery."
Igor Murashkin [Sat, 13 Jul 2013 01:14:46 +0000 (01:14 +0000)]
Merge "camera2 api: Generate metadata keys and enums from XML"
Dianne Hackborn [Fri, 12 Jul 2013 19:02:55 +0000 (12:02 -0700)]
Add new proc state constants and delivery.
The activity manager now keeps a new "process state" for
each process, indicating the general execution and memory
state of the process. This closely follows the out-of-memory
adjustment and scheduling class that it currently tracks,
but roles these together (plus a little more info) into one
more semantically meaningful number.
This value is reported to each process as it changes, so they
can do things like tune the Dalvik garbage collector to match
the current process state.
I think I should also switch to this for process states. It
will give is more meaningful divisions of time for each process.
Also fix a problem in the activity stack where the previous
process was not being set correctly when moving between
activity stacks.
Change-Id: I598b1667dc46547f8fadae304e210c352cc9d41f
Dianne Hackborn [Sat, 13 Jul 2013 01:06:37 +0000 (01:06 +0000)]
Merge "Update SparseArray docs to be more informative."
Dianne Hackborn [Sat, 13 Jul 2013 00:46:45 +0000 (17:46 -0700)]
Update SparseArray docs to be more informative.
Change-Id: I5d8d17d46a69ccdcf6b29f93be3d44addd80ab61
Dianne Hackborn [Sat, 13 Jul 2013 01:02:32 +0000 (01:02 +0000)]
Merge "Reduce some event log noise:"
Dianne Hackborn [Sat, 13 Jul 2013 00:26:02 +0000 (17:26 -0700)]
Reduce some event log noise:
- Only log battery levels on level changes, not voltage or temp.
- Reduce the text in the start service log to only the suffix
of the service component, and a uid field.
Change-Id: I6d65e6700e021b3b005dccc90d64f36c1f97137f
Igor Murashkin [Fri, 12 Jul 2013 02:37:04 +0000 (19:37 -0700)]
camera2 api: Generate metadata keys and enums from XML
Change-Id: I9b04b5933c5922fc522e9216f4deebcd6fc24d78
keunyoung [Fri, 12 Jul 2013 23:55:44 +0000 (16:55 -0700)]
fix build
Change-Id: Ife4a1e33df2e4a71edba7b29844a06138103440d
keunyoung [Fri, 12 Jul 2013 23:03:21 +0000 (23:03 +0000)]
Merge "add TYPE_PRIVATE_PRESENTATION window type"
Adam Powell [Fri, 12 Jul 2013 22:13:55 +0000 (15:13 -0700)]
am
45130c62: am
1dc3b790: am
4b8cc94c: Merge "PreferenceActivity should not leave message in looper when destroyed"
* commit '
45130c62e1a17887bd27f12c834609159bba1c1a':
PreferenceActivity should not leave message in looper when destroyed
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"
Adam Powell [Fri, 12 Jul 2013 21:56:43 +0000 (21:56 +0000)]
Merge "Tweak error fallback behavior for view direction resolution"
keunyoung [Sat, 22 Jun 2013 02:07:57 +0000 (19:07 -0700)]
add TYPE_PRIVATE_PRESENTATION window type
- This window type can be used for Presentation created on top of virtual
private display.
- There can be PRIVATE_PRESENTATION specific policy / behavior, but for now,
there is nothing special.
Change-Id: I9fde0f0376e57fcc60000d3a3f8657a21ef58993
Adam Powell [Fri, 12 Jul 2013 21:36:07 +0000 (21:36 +0000)]
Merge "Fix MenuItemImpl#hasCollapsibleActionView for action providers"
Scott Main [Fri, 12 Jul 2013 21:31:27 +0000 (14:31 -0700)]
am
e86ba6dc: am
797a99ff: am
c0f5bb70: am
ca4b112e: am
546ac85a: am
ad17523d: add warning for Windows users and fix typos
* commit '
e86ba6dcbee541c9b1837799c3de67249ad48470':
add warning for Windows users and fix typos
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
Chet Haase [Fri, 12 Jul 2013 21:00:39 +0000 (21:00 +0000)]
Merge "Fix minor transition bugs and add capabilities"
Chet Haase [Fri, 12 Jul 2013 19:54:38 +0000 (12:54 -0700)]
Fix minor transition bugs and add capabilities
Some view changes require more flexible transitions than the
defaults provided by Crossfade and TextChange - this change supplies some
of that flexibility.
Also, starting a new transition on a hierarchy undergoing a transition
caused the first to get canceled, then the start values to be retrieved.
The new transition should actually get the start values from the intermediate
state of the views, so we now cancel the previous transition only after the
start values have been captured.
Issue #
9756349 Transitions: Crossfade does not handle interruption/reverse correctly
Issue #
9295863 Transitions: Add behavior API/flags to various transitions
Issue #
9275859 Transitions: Improve mechanism for transition interruption
Change-Id: I5a8c5a12466ddcab9e84e4880930563fa1216f3b
Christopher Tate [Fri, 12 Jul 2013 20:18:55 +0000 (20:18 +0000)]
Merge "Out-of-band apk pushes to the privileged install dir"
Glenn Kasten [Fri, 12 Jul 2013 20:12:59 +0000 (20:12 +0000)]
Merge "Return correct status for android.media.AudioTrack.write(short[]...)"
Chad Brubaker [Thu, 11 Jul 2013 20:30:36 +0000 (13:30 -0700)]
Add NetworkUtil function for marking sockets
Add NetworkUtil function for setting the SO_MARK field of sockets
Change-Id: I94389b64296d87ee928293f24a26f8dd08c3bf37
Geremy Condra [Fri, 12 Jul 2013 19:47:19 +0000 (19:47 +0000)]
Merge "Add NetworkManagement support for fwmark routes"
Christopher Tate [Fri, 12 Jul 2013 19:29:41 +0000 (12:29 -0700)]
Out-of-band apk pushes to the privileged install dir
The new apk will now correctly allow system permissions to an app
placed in the privileged install dir via 'adb push' on the fly.
Change-Id: Ie4284d12628e08d9562d18eee6a7e8f74ae6295e
Amith Yamasani [Fri, 12 Jul 2013 19:24:09 +0000 (19:24 +0000)]
Merge "Fix build"
Amith Yamasani [Fri, 12 Jul 2013 19:23:16 +0000 (12:23 -0700)]
Fix build
Change-Id: If4c4f1f104826b599c86bc1c924ebadc5223c8f0
Wink Saville [Fri, 12 Jul 2013 19:14:01 +0000 (12:14 -0700)]
am
97b077bc: am
42a85412: am
925ec03f: Merge "VZW wants the phoneNumber to be 10 zero\'s if there isn\'t one." into jb-mr2-dev
* commit '
97b077bc18752e7dafe041cb04c19e67ce69939c':
VZW wants the phoneNumber to be 10 zero's if there isn't one.
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
Adam Powell [Fri, 12 Jul 2013 18:33:44 +0000 (11:33 -0700)]
Tweak error fallback behavior for view direction resolution
If the required ViewParent methods aren't present for resolving text
direction or alignment, mark them resolved with default results and
skip further resolution steps.
Change-Id: I0ea6b0ce968cc24ffed77a2d1e66dfafbec49f9c
Amith Yamasani [Fri, 12 Jul 2013 18:25:24 +0000 (11:25 -0700)]
am
8361a9f7: am
1a1a7c08: am
06a441de: Merge "Pass along the user id to AttributeCache requests" into jb-mr2-dev
* commit '
8361a9f719b6a416a40134951daf28297b6e0670':
Pass along the user id to AttributeCache requests
Adam Powell [Fri, 12 Jul 2013 18:22:30 +0000 (18:22 +0000)]
Merge "Always show overflow buttons on action bars"
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
Marco Nelissen [Fri, 12 Jul 2013 14:34:40 +0000 (14:34 +0000)]
Merge "Add stopservice command to am"
The Android Open Source Project [Fri, 12 Jul 2013 14:30:00 +0000 (07:30 -0700)]
am
a4ee3088: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
a4ee3088e74bb9b38dcd469df4dc929f1c935ff3':
Recover from corrupt network stats.
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
Lorenzo Colitti [Fri, 12 Jul 2013 03:33:16 +0000 (03:33 +0000)]
Merge "Make legacy VPN work over stacked interfaces."
Elliott Hughes [Fri, 12 Jul 2013 02:01:40 +0000 (19:01 -0700)]
am
9c8685b7: am
f094eefc: am
c5de9c35: Merge "Track libcore API update."
* commit '
9c8685b714b38c2bbf09077b9cba73a95b734269':
Track libcore API update.
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:16:37 +0000 (18:16 -0700)]
am
a1063aa3: 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 '
a1063aa3fb6619caf59c2c139c1800a427bbafb5':
add Toshiba usb driver link delete Fujitsu-Toshiba bug:
9755017
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
Dirk Dougherty [Fri, 12 Jul 2013 01:09:59 +0000 (18:09 -0700)]
am
8b1cdd98: 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 '
8b1cdd9874e88569fcf46d848f8f3424dfa7afc9':
Doc change: Update gcore reference docs.
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.
Vinit Deshapnde [Fri, 12 Jul 2013 00:58:07 +0000 (00:58 +0000)]
Merge "Allow enabling TDLS on specific routes"
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:48:00 +0000 (17:48 -0700)]
am
717fb2b6: am
334f6ea6: am
24810c6f: am
3c13e528: am
536fa1bb: am
84ad0894: fix markup error in download button and fix transition to install/update guide
* commit '
717fb2b60d91604175f73984b1eaf8c169ae155b':
fix markup error in download button and fix transition to install/update guide
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
Romain Guy [Fri, 12 Jul 2013 00:41:24 +0000 (00:41 +0000)]
Merge "Trace bitmaps decoding"
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
Romain Guy [Fri, 12 Jul 2013 00:37:31 +0000 (17:37 -0700)]
Trace bitmaps decoding
Also remove dead code
Change-Id: Ie931b21858ccbe6ee4def54caf028fd2aed23317
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:12:35 +0000 (17:12 -0700)]
am
6f2b31fc: am
56a7e4ad: am
116d4665: Merge "Block Wifi P2p discovery while doing dhcp." into jb-mr2-dev
* commit '
6f2b31fcf57e4e7f5cd8af9b66619c8f5825a850':
Block Wifi P2p discovery while doing dhcp.
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