OSDN Git Service
Paul Jensen [Wed, 20 May 2015 13:09:12 +0000 (13:09 +0000)]
am
2e54f13b: Merge "Report invalid network after one failed attempt." into mnc-dev
* commit '
2e54f13b468a3abfc404ad5b7eed6bf2c73f55de':
Report invalid network after one failed attempt.
Paul Jensen [Wed, 20 May 2015 12:56:22 +0000 (12:56 +0000)]
Merge "Report invalid network after one failed attempt." into mnc-dev
Paul Jensen [Wed, 20 May 2015 10:55:28 +0000 (10:55 +0000)]
am
cb7c0350: Merge "Undeprecate android.net.ProxyInfo as it\'s still used." into mnc-dev
* commit '
cb7c035081c650ea356b625ed51865c6e3b18d21':
Undeprecate android.net.ProxyInfo as it's still used.
Paul Jensen [Wed, 20 May 2015 10:49:02 +0000 (10:49 +0000)]
Merge "Undeprecate android.net.ProxyInfo as it's still used." into mnc-dev
Andrei Stingaceanu [Wed, 20 May 2015 09:47:48 +0000 (09:47 +0000)]
am
8c44e745: Merge "Landscape extracted mode - floating toolbar interference" into mnc-dev
* commit '
8c44e74524a43ad7cb41b1641bb2dac75cf9c7e8':
Landscape extracted mode - floating toolbar interference
Andrei Stingaceanu [Wed, 20 May 2015 09:32:49 +0000 (09:32 +0000)]
Merge "Landscape extracted mode - floating toolbar interference" into mnc-dev
Andrei Stingaceanu [Tue, 19 May 2015 16:29:16 +0000 (17:29 +0100)]
Landscape extracted mode - floating toolbar interference
In landscape do not allow starting selection modes if the
extracted mode has not yet started. Also remove the single
tap selection delayed runnable.
This allows for a smooth transition (as in no floating
toolbar artifacts) into extracted mode. Also fixes
(more as in hides) the double selections.
Bug:
20930071
Change-Id: Idb9c375dc25777761b11ca17ccfd9f5eedc642b4
Erik Kline [Wed, 20 May 2015 08:20:58 +0000 (08:20 +0000)]
am
6f611d72: Merge "Set NLM_F_ACK in our RTM_NEWNEIGH requests" into mnc-dev
* commit '
6f611d72679f69f2a7eb544407a0c8ec02f74595':
Set NLM_F_ACK in our RTM_NEWNEIGH requests
Erik Kline [Wed, 20 May 2015 08:05:21 +0000 (08:05 +0000)]
Merge "Set NLM_F_ACK in our RTM_NEWNEIGH requests" into mnc-dev
Erik Kline [Tue, 19 May 2015 05:17:11 +0000 (14:17 +0900)]
Set NLM_F_ACK in our RTM_NEWNEIGH requests
With NLM_F_ACK set in RTM_NEWNEIGH requests we get some response from
the kernel, whether there was an error or not.
Additionally:
[1] add IpReachabilityMonitor#probeNeighbor() as a public
static method, since it actually depends very little on the
class internals and might be of larger use.
[2] add a unittest for parsing NetlinkErrorMessages.
Bug:
18581716
Change-Id: I5d62e7a9972c7440f0483c38c77677436d3a1a25
Lorenzo Colitti [Wed, 20 May 2015 07:03:11 +0000 (07:03 +0000)]
am
4b545dfb: Merge "Add a hidden method to clear the capabilities of a NetworkRequest" into mnc-dev
* commit '
4b545dfbcd6ed724d5fc01b7ba21506db99e881b':
Add a hidden method to clear the capabilities of a NetworkRequest
Nitin Arora [Wed, 20 May 2015 07:03:07 +0000 (07:03 +0000)]
am
11f83882: Bluetooth: Clear BLE always ON apps at Airplane mode
* commit '
11f83882f2a4448b5a2bbbb9e23b700096ed7536':
Bluetooth: Clear BLE always ON apps at Airplane mode
Dongwon Kang [Wed, 20 May 2015 07:03:02 +0000 (07:03 +0000)]
am
cf4f3d5c: TIF: Fix an incorrect conversion in timeShiftSetPlaybackParams()
* commit '
cf4f3d5c4cacd0cb350ad8fc7cbbe8b1df30feaa':
TIF: Fix an incorrect conversion in timeShiftSetPlaybackParams()
Lorenzo Colitti [Wed, 20 May 2015 05:49:02 +0000 (05:49 +0000)]
Merge "Add a hidden method to clear the capabilities of a NetworkRequest" into mnc-dev
Nitin Arora [Fri, 8 May 2015 01:45:44 +0000 (18:45 -0700)]
Bluetooth: Clear BLE always ON apps at Airplane mode
This patch clears the container managing the Ble Always On
apps while switching on, the airplane mode. The airplane mode
will completely turn Off the Bleutooth Adapter from any state
it is in.
Change-Id: Ib28d39d85efe3aac37e3a53a4fb892099568c702
Dongwon Kang [Wed, 20 May 2015 04:57:34 +0000 (13:57 +0900)]
TIF: Fix an incorrect conversion in timeShiftSetPlaybackParams()
Bug:
21313401
Change-Id: I73e55c454cf0e2cd90d922acf5c6efe727f59204
Erik Kline [Wed, 20 May 2015 03:57:30 +0000 (03:57 +0000)]
am
77b01b88: Merge "Close netlink socket when shutting down IpReachabilityMonitor" into mnc-dev
* commit '
77b01b887670b01f543558cd5cfd7d5d228d6c21':
Close netlink socket when shutting down IpReachabilityMonitor
Erik Kline [Wed, 20 May 2015 03:26:12 +0000 (03:26 +0000)]
Merge "Close netlink socket when shutting down IpReachabilityMonitor" into mnc-dev
Deepanshu Gupta [Wed, 20 May 2015 03:16:49 +0000 (03:16 +0000)]
am
1c5bf7f1: Merge "Make Context.getClassLoader() work." into mnc-dev
* commit '
1c5bf7f1ddc8c9c9844a1bc1a7e4ce53dcc5d5bd':
Make Context.getClassLoader() work.
Erik Kline [Fri, 15 May 2015 09:49:17 +0000 (18:49 +0900)]
Close netlink socket when shutting down IpReachabilityMonitor
This forces the NetlinkSocketObserver thread to exit quickly, rather
than lingering until the next random netlink neighbor multicast message
arrives.
Additionally, add a small unittest to verify that multiple calls to
NetlinkSocket#close() are safe.
Change-Id: I101730fad7eee72f9c6e8a7e7bd10c634f2ceab4
Deepanshu Gupta [Wed, 20 May 2015 03:05:51 +0000 (03:05 +0000)]
Merge "Make Context.getClassLoader() work." into mnc-dev
Deepanshu Gupta [Tue, 19 May 2015 01:47:07 +0000 (18:47 -0700)]
Make Context.getClassLoader() work.
Context.getClassLoader() is used by the LayoutInflater and can be used
by custom views. However, when called from the LayoutInflater, this
needs to return only the Framework classes. This is so that the IDE gets
a chance to instantiate the custom views, which helps in better error
reporting and better fallback in case of exceptions, like MockView.
To workaround this need of the same method returning different results
based on where it's called from, the method call in LayoutInflater is
renamed to getFrameworkClassLoader() and the new method is injected in
Context. The implementation of getFrameworkClassLoader() maintains the
existing behaviour of getClassLoader().
Context.getClassLoader() is now modified to return classes from both
Framework and the app namespace.
Also, update the list of packages to search for Framework views.
Change-Id: I1a6be4aa1fc5c1c5520b5440a348a52f10b6eb3b
Svetoslav [Wed, 20 May 2015 02:06:07 +0000 (02:06 +0000)]
am
f357c962: Merge "Prevent modification of system fixed permissions" into mnc-dev
* commit '
f357c96273ad8c0f7acc0e15213cced2f0b21883':
Prevent modification of system fixed permissions
Svetoslav [Wed, 20 May 2015 01:57:44 +0000 (01:57 +0000)]
Merge "Prevent modification of system fixed permissions" into mnc-dev
Simranjit Singh Kohli [Wed, 20 May 2015 01:15:45 +0000 (01:15 +0000)]
am
bdf2d1fa: Merge "[Fix Potential for error]:" into mnc-dev
* commit '
bdf2d1fa382d4016087b2046beb871e9b3edb8df':
[Fix Potential for error]:
Simranjit Singh Kohli [Wed, 20 May 2015 01:04:56 +0000 (01:04 +0000)]
Merge "[Fix Potential for error]:" into mnc-dev
Adrian Roos [Wed, 20 May 2015 00:50:43 +0000 (00:50 +0000)]
am
1bbe3d4b: Merge "Fix user switcher ripple emanation point" into mnc-dev
* commit '
1bbe3d4b75f2ab4afe6344ee778058eaf530e3f5':
Fix user switcher ripple emanation point
Adrian Roos [Wed, 20 May 2015 00:43:46 +0000 (00:43 +0000)]
Merge "Fix user switcher ripple emanation point" into mnc-dev
Simranjit Singh Kohli [Tue, 19 May 2015 17:58:01 +0000 (10:58 -0700)]
[Fix Potential for error]:
Init for accounts maybe called when non-system app asks for accounts.
That might lead to deletion of accounts and broadcast from the user,
which requires permission. Hence, we should clear calling identity
before requesting it.
Bug:
21140169
Change-Id: I057ac6778ea53d3f96b3e5c42fe3a2fe60c3cf28
Christopher Tate [Wed, 20 May 2015 00:16:34 +0000 (00:16 +0000)]
am
f7a9aaa1: Merge "Rebind backup transports only when clearly needed" into mnc-dev
* commit '
f7a9aaa12eb25bbd163fbc02c4fa638889dd67c2':
Rebind backup transports only when clearly needed
Christopher Tate [Wed, 20 May 2015 00:07:11 +0000 (00:07 +0000)]
Merge "Rebind backup transports only when clearly needed" into mnc-dev
Christopher Tate [Fri, 15 May 2015 23:06:58 +0000 (16:06 -0700)]
Rebind backup transports only when clearly needed
Significantly narrow the circumstances under which transports
will be re-bound. In particular, we now do not unbind + rebind
whenever any component in a bound transport's host package changes;
rather, we do so only when the transport component itself has
changed state, or when there is a state change that might cause
a new transport to become available.
Bug
19775237
Change-Id: Ib386875df19ffe9f2d3eb9f9788187338360644a
Jean-Michel Trivi [Tue, 19 May 2015 23:52:00 +0000 (23:52 +0000)]
am
1705113e: Merge "API for converting AudioAttributes to stream type" into mnc-dev
* commit '
1705113e91a553b4bad6435854295d0b7a7c6b8e':
API for converting AudioAttributes to stream type
Svetoslav [Tue, 19 May 2015 23:48:46 +0000 (16:48 -0700)]
Prevent modification of system fixed permissions
Change-Id: I061b993df305f27e52f08dad54f1bdbf162de4d9
Jean-Michel Trivi [Tue, 19 May 2015 23:42:33 +0000 (23:42 +0000)]
Merge "API for converting AudioAttributes to stream type" into mnc-dev
Svetoslav [Tue, 19 May 2015 23:39:29 +0000 (23:39 +0000)]
am
6d9a53ab: Merge "Handle downgrading a runtime permission to an install one" into mnc-dev
* commit '
6d9a53abbc94788dc02f7ebde30744753e0a5a3d':
Handle downgrading a runtime permission to an install one
Jean-Michel Trivi [Mon, 18 May 2015 18:50:50 +0000 (11:50 -0700)]
API for converting AudioAttributes to stream type
Bug
21267880
Change-Id: I3389dcb3a35a3786ecdb8f56a917a0ae619e8417
Joe Fernandez [Tue, 19 May 2015 23:31:28 +0000 (23:31 +0000)]
am
e56cce57: am
25a3b711: am
97c616cb: Merge "docs: M Preview - Updating image for Program Overview" into mnc-preview-docs
* commit '
e56cce575bc75674a1929700a8975afc280b1ae8':
docs: M Preview - Updating image for Program Overview
Yigit Boyar [Tue, 19 May 2015 23:31:23 +0000 (23:31 +0000)]
am
bf6d1ebc: am
9b716793: Merge "Revert "Make VPA.setInterpolator(null) unset the interpolator."" into lmp-mr1-ub-dev
* commit '
bf6d1ebc4b4425cc14cf45df85db9f45a82cee2f':
Revert "Make VPA.setInterpolator(null) unset the interpolator."
Svetoslav [Tue, 19 May 2015 23:30:47 +0000 (23:30 +0000)]
Merge "Handle downgrading a runtime permission to an install one" into mnc-dev
Svetoslav [Tue, 19 May 2015 23:26:53 +0000 (16:26 -0700)]
Handle downgrading a runtime permission to an install one
bug:
21300531
Change-Id: I5c020c0faae3e727bbe898441c58116e2ab892b8
Joe Fernandez [Tue, 19 May 2015 23:16:10 +0000 (23:16 +0000)]
am
25a3b711: am
97c616cb: Merge "docs: M Preview - Updating image for Program Overview" into mnc-preview-docs
* commit '
25a3b7117a174e2a0dccdaf84c8394e5bdf1e7ca':
docs: M Preview - Updating image for Program Overview
Yigit Boyar [Tue, 19 May 2015 23:15:48 +0000 (23:15 +0000)]
am
9b716793: Merge "Revert "Make VPA.setInterpolator(null) unset the interpolator."" into lmp-mr1-ub-dev
* commit '
9b7167937ab5ea456c45e735d3bd749ccf49c432':
Revert "Make VPA.setInterpolator(null) unset the interpolator."
Daichi Hirono [Tue, 19 May 2015 22:34:04 +0000 (22:34 +0000)]
am
b7d072f4: Merge "DocumentUI: Plish the design of footer bottons." into mnc-dev
* commit '
b7d072f42fd4fcb2e6e2d7a88ede2d4cee05127c':
DocumentUI: Plish the design of footer bottons.
Daichi Hirono [Tue, 19 May 2015 22:20:38 +0000 (22:20 +0000)]
Merge "DocumentUI: Plish the design of footer bottons." into mnc-dev
Wei Wang [Tue, 19 May 2015 22:13:00 +0000 (22:13 +0000)]
am
de35f0d9: Merge "setCallbackType should be public for onlost/onfound apis" into mnc-dev
* commit '
de35f0d9525d0ca0cd109a9e848a3885bd9c3c1d':
setCallbackType should be public for onlost/onfound apis
Jeff Sharkey [Tue, 19 May 2015 22:12:54 +0000 (22:12 +0000)]
am
891230b5: Merge "Push initial disk state, handle empty media." into mnc-dev
* commit '
891230b59e36f8220885d6c1f5c9be98370ee2ca':
Push initial disk state, handle empty media.
Fabrice Di Meglio [Tue, 19 May 2015 22:12:50 +0000 (22:12 +0000)]
am
b3793d72: Merge "Add IntentFilter auto verification - part 12" into mnc-dev
* commit '
b3793d7201c2555cc1f6b01dbed47429b7d31be4':
Add IntentFilter auto verification - part 12
Wei Wang [Tue, 19 May 2015 22:10:23 +0000 (22:10 +0000)]
Merge "setCallbackType should be public for onlost/onfound apis" into mnc-dev
Joe Fernandez [Tue, 19 May 2015 22:07:20 +0000 (22:07 +0000)]
am
97c616cb: Merge "docs: M Preview - Updating image for Program Overview" into mnc-preview-docs
* commit '
97c616cb113ba3144ff91b7f974d832fdc5ff0f0':
docs: M Preview - Updating image for Program Overview
Prerepa Viswanadham [Tue, 19 May 2015 21:55:09 +0000 (14:55 -0700)]
setCallbackType should be public for onlost/onfound apis
Bug:
21304922
Change-Id: I27ed4f3e00ac13354e3ef75e5686916be0d10918
Jeff Sharkey [Tue, 19 May 2015 22:04:53 +0000 (22:04 +0000)]
Merge "Push initial disk state, handle empty media." into mnc-dev
Fabrice Di Meglio [Tue, 19 May 2015 22:02:38 +0000 (22:02 +0000)]
Merge "Add IntentFilter auto verification - part 12" into mnc-dev
Joe Fernandez [Tue, 19 May 2015 21:59:14 +0000 (21:59 +0000)]
Merge "docs: M Preview - Updating image for Program Overview" into mnc-preview-docs
Jeff Sharkey [Tue, 19 May 2015 21:42:38 +0000 (14:42 -0700)]
Push initial disk state, handle empty media.
Stash volume count from last scan, and use it to push initial storage
notifications state when listener is first attached.
Also omit disks with invalid size, which usually means they're an
empty slot with no media.
Bug:
20503551
Change-Id: I75097035aebaad70ba32437179a863f6a0910aa5
Joe Fernandez [Tue, 19 May 2015 21:57:19 +0000 (14:57 -0700)]
docs: M Preview - Updating image for Program Overview
- also removing unused images
Change-Id: Ic120bc3b119ccda70e85fb0a7254d835677467dd
Fabrice Di Meglio [Tue, 19 May 2015 21:50:54 +0000 (14:50 -0700)]
Add IntentFilter auto verification - part 12
- again tune Intent resolution candidates filtering: first add always list
if not empty, other wise add undefined and browsers. If the list is still
empty at the end, then add all the initial candidates.
See bug #
19628271
Change-Id: I21f5313daf7bec1049c1e7c08275c825855d2935
Santos Cordon [Tue, 19 May 2015 20:38:59 +0000 (20:38 +0000)]
am
0e2d3f2f: Merge "Add enable/disable properties to phone accounts." into mnc-dev
* commit '
0e2d3f2f871ae11d642eb576173d73ada9dcc292':
Add enable/disable properties to phone accounts.
Santos Cordon [Tue, 19 May 2015 20:26:37 +0000 (20:26 +0000)]
Merge "Add enable/disable properties to phone accounts." into mnc-dev
Santos Cordon [Fri, 8 May 2015 20:52:09 +0000 (13:52 -0700)]
Add enable/disable properties to phone accounts.
Bug:
20303449
Change-Id: Ie6203a284454d43f4dd20917f0f1fda0b36484f8
Svet Ganov [Tue, 19 May 2015 20:04:50 +0000 (20:04 +0000)]
am
db6dab35: Merge "Clear binder identity before dispatching ap op mode changes." into mnc-dev
* commit '
db6dab359c0ab6e5ef3d2702c717e6f5908b8e3b':
Clear binder identity before dispatching ap op mode changes.
Svet Ganov [Tue, 19 May 2015 19:51:27 +0000 (19:51 +0000)]
Merge "Clear binder identity before dispatching ap op mode changes." into mnc-dev
Svet Ganov [Tue, 19 May 2015 19:45:52 +0000 (12:45 -0700)]
Clear binder identity before dispatching ap op mode changes.
bug:
21078841
Change-Id: I409b739bbda10542142c8aac1522ad49882f5ec5
Eino-Ville Talvala [Tue, 19 May 2015 19:45:53 +0000 (19:45 +0000)]
am
1975b0a4: Merge "Camera2: Fix session close callback" into mnc-dev
* commit '
1975b0a4bedb997f4f106ab35be4889eb207cf60':
Camera2: Fix session close callback
John Reck [Tue, 19 May 2015 19:40:56 +0000 (19:40 +0000)]
am
0bb478b7: Merge "Don\'t recreate the surface unnecessarily" into mnc-dev
* commit '
0bb478b7ff32ac3cd8f583f3852742e18a9c4bd6':
Don't recreate the surface unnecessarily
Selim Cinek [Tue, 19 May 2015 19:40:51 +0000 (19:40 +0000)]
am
4a21a7fa: Fixed Focusability issues with heads up
* commit '
4a21a7fab6c0cca2c668650969e9af50c9c5068e':
Fixed Focusability issues with heads up
Eino-Ville Talvala [Tue, 19 May 2015 19:39:10 +0000 (19:39 +0000)]
Merge "Camera2: Fix session close callback" into mnc-dev
John Reck [Tue, 19 May 2015 19:31:56 +0000 (19:31 +0000)]
Merge "Don't recreate the surface unnecessarily" into mnc-dev
Selim Cinek [Tue, 19 May 2015 18:00:38 +0000 (11:00 -0700)]
Fixed Focusability issues with heads up
The panel was focusable when a heads up came in which
lead to several bugs. Sometimes the user was not able to
type anymore and focus listeners fired.
Bug:
21153703
Bug:
20892889
Change-Id: Iab86e651ef827767225ca092bb2c1e3fe1ddf385
John Reck [Tue, 19 May 2015 18:09:32 +0000 (11:09 -0700)]
Don't recreate the surface unnecessarily
Bug:
19896200
The flicker is caused because ViewRootImpl is
requesting a change from OPAQUE to TRANSLUCENT due
to the presence of a GLSurfaceView. However, WindowManager
will use this as a signal to recreate the SurfaceControl.
This is not actually correct, as the underlying format
of the SurfaceControl was *already* TRANSLUCENT due to being
hardware accelerated. Add a fast-path for this step
where the format didn't actually change such that all that is
necessary is for the OPAQUE flag to be flushed through
to SurfaceFlinger.
This doesn't address the larger, more complex issue of a surface
flickering if the pixel format really did need to change, but
this should address the common case.
Change-Id: Ia5275705733123a3d7929bf5951829415753e2b2
Deepanshu Gupta [Tue, 19 May 2015 19:17:07 +0000 (19:17 +0000)]
am
5deaa138: Merge "Fix include tag rendering." into mnc-dev
* commit '
5deaa138443433f861a52f4cdc461a677437c416':
Fix include tag rendering.
Adrian Roos [Fri, 21 Nov 2014 14:50:16 +0000 (15:50 +0100)]
Fix user switcher ripple emanation point
Bug:
18444431
Change-Id: I35b053b151ba1e6e326d3a6c2bd2c3c8e3ad8c28
Paul Jensen [Tue, 19 May 2015 19:00:56 +0000 (15:00 -0400)]
Undeprecate android.net.ProxyInfo as it's still used.
It was deprecated as part of the Apache deprecation, however it is used
by ConnectivityManager.getLinkProperties() and .getDefaultProxy().
The alternatives (e.g. java.net.Proxy) do not offer a complete
replacement as they lack certain fields (e.g. PAC URL).
Bug:
21274137
Change-Id: I99163a2611a738f337fb9907349ef6255dbed6d6
Deepanshu Gupta [Tue, 19 May 2015 19:07:45 +0000 (19:07 +0000)]
Merge "Fix include tag rendering." into mnc-dev
Deepanshu Gupta [Tue, 19 May 2015 18:55:15 +0000 (11:55 -0700)]
Fix include tag rendering.
A missing catch clause caused rendering to be failed when there is an
include tag that doesn't specify layout_width and layout_height. Also
improve the error messages to make debugging easier next time.
Change-Id: I617762636973a010b34da167c7b5fcd328b7d178
Paul Jensen [Tue, 19 May 2015 18:51:47 +0000 (14:51 -0400)]
Report invalid network after one failed attempt.
Also, blame UID requesting re-evaluation for first 5 attempts.
Bug:
19648073
Change-Id: Ia04eeb1aeb59fcb21de098193dfad832d5fbe3a2
Yigit Boyar [Tue, 19 May 2015 18:40:36 +0000 (18:40 +0000)]
Merge "Revert "Make VPA.setInterpolator(null) unset the interpolator."" into lmp-mr1-ub-dev
Dianne Hackborn [Tue, 19 May 2015 18:34:59 +0000 (18:34 +0000)]
am
2d9c6015: Merge "Fix issue #
20679383: Add text style to assist.ViewNode..." into mnc-dev
* commit '
2d9c6015b32338f1b82f46ec7ea7328422f0330a':
Fix issue #
20679383: Add text style to assist.ViewNode...
Chih-Hung Hsieh [Tue, 19 May 2015 18:34:54 +0000 (18:34 +0000)]
am
fa5d3eea: Merge "Add missing const qualifier to compile with clang/llvm." into mnc-dev
* commit '
fa5d3eea925fcf636f8840590a3ea1a6e4ec5664':
Add missing const qualifier to compile with clang/llvm.
Paul McLean [Tue, 19 May 2015 18:34:49 +0000 (18:34 +0000)]
am
6f421764: Merge "Turning off logging in ALSA device connection routines." into mnc-dev
* commit '
6f421764fe5b9b7eafcdd413e5bb9aa25b4b7f76':
Turning off logging in ALSA device connection routines.
Dianne Hackborn [Tue, 19 May 2015 18:26:13 +0000 (18:26 +0000)]
Merge "Fix issue #
20679383: Add text style to assist.ViewNode..." into mnc-dev
Chih-Hung Hsieh [Tue, 19 May 2015 18:22:24 +0000 (18:22 +0000)]
Merge "Add missing const qualifier to compile with clang/llvm." into mnc-dev
Paul McLean [Tue, 19 May 2015 18:21:37 +0000 (18:21 +0000)]
Merge "Turning off logging in ALSA device connection routines." into mnc-dev
Dianne Hackborn [Tue, 19 May 2015 18:18:16 +0000 (11:18 -0700)]
Fix issue #
20679383: Add text style to assist.ViewNode...
...from text nodes in WebView
Add a new explicit API for setting the text style information associated
with a view structure.
Also, how about some documentation!
Change-Id: Ia948b2d66382b973d0d00a67172a281ad55ce592
Alex Klyubin [Tue, 19 May 2015 18:16:57 +0000 (18:16 +0000)]
am
8ec2bed8: Merge "Use consistent name for KeyPairGeneratorSpi." into mnc-dev
* commit '
8ec2bed833a6210d2e5b02e8cefb5c7e7da73610':
Use consistent name for KeyPairGeneratorSpi.
Alex Klyubin [Tue, 19 May 2015 18:16:52 +0000 (18:16 +0000)]
am
0b878e49: Merge "Switch from getSpi to getCurrentSpi." into mnc-dev
* commit '
0b878e496f0a5ec74d39a865ff160baa38d399b2':
Switch from getSpi to getCurrentSpi.
Alex Klyubin [Tue, 19 May 2015 18:07:21 +0000 (18:07 +0000)]
Merge "Use consistent name for KeyPairGeneratorSpi." into mnc-dev
Alex Klyubin [Tue, 19 May 2015 18:06:59 +0000 (18:06 +0000)]
Merge "Switch from getSpi to getCurrentSpi." into mnc-dev
Paul Jensen [Tue, 19 May 2015 18:03:26 +0000 (18:03 +0000)]
am
c1a9436d: Merge "Query HTTP proxy for network via a new API to avoid permissions exceptions" into mnc-dev
* commit '
c1a9436d27e41347e6063b1cfb77eaef7e191ca4':
Query HTTP proxy for network via a new API to avoid permissions exceptions
Jason Monk [Tue, 19 May 2015 18:03:21 +0000 (18:03 +0000)]
am
bf45b3f4: Merge "SysUI: Move BT receivers to bg" into mnc-dev
* commit '
bf45b3f4263768a420d92b320c5fb19697f5e9fb':
SysUI: Move BT receivers to bg
Eino-Ville Talvala [Tue, 19 May 2015 18:03:16 +0000 (18:03 +0000)]
am
77545f6a: Merge "Camera2: Add SDK annotations" into mnc-dev
* commit '
77545f6a19bda0d22e946497f29a8d191d68c212':
Camera2: Add SDK annotations
Jason Monk [Tue, 19 May 2015 18:03:11 +0000 (18:03 +0000)]
am
10bfd94a: Merge "Update 0th level icon for QS wifi sub panel" into mnc-dev
* commit '
10bfd94ae62d59a2008ec231256bf9d2ef519f8d':
Update 0th level icon for QS wifi sub panel
Nicolas Prevot [Tue, 19 May 2015 18:03:06 +0000 (18:03 +0000)]
am
5f645339: Merge "Allow creating a managed profile if there is only one user." into mnc-dev
* commit '
5f645339e4d0565cbe1bf2f1a3b77370f07b157a':
Allow creating a managed profile if there is only one user.
Paul Jensen [Tue, 19 May 2015 17:58:10 +0000 (17:58 +0000)]
Merge "Query HTTP proxy for network via a new API to avoid permissions exceptions" into mnc-dev
Jason Monk [Tue, 19 May 2015 17:56:31 +0000 (17:56 +0000)]
Merge "SysUI: Move BT receivers to bg" into mnc-dev
Eino-Ville Talvala [Tue, 19 May 2015 17:55:35 +0000 (17:55 +0000)]
Merge "Camera2: Add SDK annotations" into mnc-dev
Jason Monk [Tue, 19 May 2015 17:55:29 +0000 (17:55 +0000)]
Merge "Update 0th level icon for QS wifi sub panel" into mnc-dev
Nicolas Prevot [Tue, 19 May 2015 17:52:14 +0000 (17:52 +0000)]
Merge "Allow creating a managed profile if there is only one user." into mnc-dev
Jason Monk [Tue, 19 May 2015 17:46:00 +0000 (13:46 -0400)]
Update 0th level icon for QS wifi sub panel
Bug:
21019691
Change-Id: I3086c5105b418e618a7d4df9bb8b9cb4189beeb8
Chih-Hung Hsieh [Tue, 19 May 2015 17:44:53 +0000 (10:44 -0700)]
Add missing const qualifier to compile with clang/llvm.
BUG:
21298442
Change-Id: Iad211237fdb0128d8f4490419687bf1da1cd261c