OSDN Git Service
Xiyuan Xia [Tue, 19 May 2015 22:00:41 +0000 (15:00 -0700)]
Do not show soft keyboard when locked out on keyguard UI
- Split password entry enabled and input enabled into two states;
- Disable input during lock check;
- Disable password entry when locked out;
- Don't show soft keyboard if password entry is disabled on resume;
- Auto show soft keyboard when password entry becomes enabled;
Bug:
20542149
Change-Id: Iffe3f205776143ac21e25e337d5b7a0e6994ebf2
John Reck [Wed, 20 May 2015 21:38:56 +0000 (21:38 +0000)]
Merge "Eliminate requireGlContext" into mnc-dev
Etan Cohen [Wed, 20 May 2015 21:37:37 +0000 (21:37 +0000)]
Merge "Add Carrier Presence to CP2: Phone" into mnc-dev
Jorim Jaggi [Wed, 20 May 2015 21:30:47 +0000 (14:30 -0700)]
Adjust clock size to spec
Bug:
21111048
Change-Id: I73c6e57421dec4d929e5f87d812b5c2c495d250d
Joseph Wen [Wed, 20 May 2015 21:19:17 +0000 (21:19 +0000)]
Merge "Update the Statement Service. DO NOT MERGE" into mnc-dev
fenglu [Wed, 20 May 2015 21:09:07 +0000 (21:09 +0000)]
Merge "LCE feature enhancement" into mnc-dev
Ruben Brunk [Wed, 20 May 2015 20:44:26 +0000 (20:44 +0000)]
Merge "camera: Add AIDL interface for CameraServiceProxy." into mnc-dev
Joseph Wen [Thu, 23 Apr 2015 19:45:07 +0000 (15:45 -0400)]
Update the Statement Service. DO NOT MERGE
For security reason, disallow HTTP include files if the source asset is
a HTTPS site or an Android app.
Change the include statement field name from "delegate" to "include".
Bug:
20323096
Change-Id: Ifc12b61657c9c89a670b9d7c3220853321c15dea
Svet Ganov [Wed, 20 May 2015 20:09:36 +0000 (20:09 +0000)]
Merge "Allow DO/PO to go back to normal permission state." into mnc-dev
Svet Ganov [Wed, 20 May 2015 17:45:43 +0000 (10:45 -0700)]
Allow DO/PO to go back to normal permission state.
We have APIs for a DO/PO to fix a permission in a granted or
denied state in which the user cannot manage this permission
through the UI. However, there is no way to go back to the
default state in which the user gets to choose the permission
grant state.
Change-Id: I2562a1d8b1385cd740b44812844ef14c895c2902
Jorim Jaggi [Wed, 20 May 2015 19:04:41 +0000 (12:04 -0700)]
Lower fingerprint permission protection level
Bug:
21307136
Change-Id: Iafdb42c6a82b27a5297ad14ffaa289b14fffad23
Jeff Sharkey [Wed, 20 May 2015 19:09:46 +0000 (19:09 +0000)]
Merge "Write packages.list when adding/removing users." into mnc-dev
Jeff Sharkey [Wed, 20 May 2015 19:04:42 +0000 (12:04 -0700)]
Write packages.list when adding/removing users.
FUSE daemons now rely on getting per-user GID information when
packages.list is written. Normal secondary user adding/removing
usually has enough PackageManager traffic to trigger a side-effect
rewrite, but this change writes explicitly to handle guest users.
Also obtain the user list once, and exclude dying users. During
user creation we manually splice in the user ID that we're bringing
online.
Bug:
19924661
Change-Id: Icc5b1b169300c9dc12099be12651acbf89d6bea9
Jorim Jaggi [Wed, 20 May 2015 19:01:49 +0000 (19:01 +0000)]
Merge "Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (1/2)" into mnc-dev
Stefan Kuhne [Wed, 20 May 2015 18:38:28 +0000 (18:38 +0000)]
Merge "Don't exceed max. allowed recent document tasks for an app." into mnc-dev
John Reck [Wed, 20 May 2015 14:18:55 +0000 (07:18 -0700)]
Eliminate requireGlContext
Bug:
20297820
Change-Id: I37c63bab6f6c0d2337c8c6002046d2ef17e74097
Mady Mellor [Wed, 20 May 2015 18:05:29 +0000 (18:05 +0000)]
Merge "Text selection: fix some issues with drag accelerator" into mnc-dev
Stefan Kuhne [Tue, 19 May 2015 23:00:12 +0000 (16:00 -0700)]
Don't exceed max. allowed recent document tasks for an app.
We were exceeding the maximum allowed recents document tasks entry
for an application package because the full Intent object was been
compared for equality which will be different for each task. Now
we are only comparing that the task components match which is
sufficient to determining that the task belongs to the same
application package.
Bug:
18642190
Change-Id: I831b0fcffb876d51e9439e7a7a4c75bb0881db7c
Brian Attwell [Thu, 14 May 2015 22:25:01 +0000 (15:25 -0700)]
Hide ProviderStatus and Authentication APIs
Bug:
21090207
Change-Id: I27b604b9c849e1aad8289c517f5e50c5d0faae0f
Mady Mellor [Wed, 20 May 2015 17:09:11 +0000 (17:09 +0000)]
Merge "Fix selection handles on older API versions" into mnc-dev
Mady Mellor [Wed, 20 May 2015 17:05:52 +0000 (10:05 -0700)]
Text selection: fix some issues with drag accelerator
Couple of overlapping issues that this CL fixes. The major change is to
offset the selection vertically this is similar to how the handles work
already (i.e. touch target is below what's being selected), and still
allows the user to see the selection start / end without covering it with
their finger.
This change fixes multiple issues:
1) Previously to ensure the finger wasn't covering the selection a
preceding or following offset was taken, this made it difficult to
select certain words and it made text on the edge of the screen hard
to select (b/
21098345 and b/
19965619)
2) The use of preceding and following on the word iterator was not correct
allowing grapheme clusters to be split, now the offset is calculated
with getWordStart/End which respect grapheme clusters (b/
21045116)
Bug:
21098345
Bug:
21045116
Bug:
19965619
Change-Id: Id8392426cce20ad0ff47a4279c92f6ed1b0ad30e
Eric Laurent [Wed, 20 May 2015 16:22:00 +0000 (16:22 +0000)]
Merge "AudioFormat: more compressed formats" into mnc-dev
Paul McLean [Wed, 20 May 2015 15:56:06 +0000 (15:56 +0000)]
Merge "Updating (and completing) documentation post API-council changes." into mnc-dev
Narayan Kamath [Wed, 20 May 2015 15:54:47 +0000 (15:54 +0000)]
Merge "Throw a checked exception on inconsistent installs." into mnc-dev
Paul McLean [Tue, 19 May 2015 18:13:41 +0000 (11:13 -0700)]
Updating (and completing) documentation post API-council changes.
1. Enum/Select/Notify API
2. (re)routing API
bug:
21151568
Change-Id: Idce969c8b8955022b7810cf5dddb800e6aa01000
John Reck [Wed, 20 May 2015 14:23:05 +0000 (14:23 +0000)]
Merge "Reduce wasted buffer allocations" into mnc-dev
John Reck [Wed, 20 May 2015 14:22:56 +0000 (14:22 +0000)]
Merge "Fix whitespace in TextureView" into mnc-dev
John Reck [Wed, 20 May 2015 14:22:40 +0000 (14:22 +0000)]
Merge "Fix NPE in setSurfaceTexure" into mnc-dev
John Reck [Mon, 18 May 2015 22:13:30 +0000 (15:13 -0700)]
Fix whitespace in TextureView
Change-Id: I22396b7205dc2b9cf0eda5bd8aa951cad8d8bd87
John Reck [Mon, 18 May 2015 22:11:52 +0000 (15:11 -0700)]
Fix NPE in setSurfaceTexure
Bug:
20088412
Change-Id: I9b78636a7d89438c8924bb1bf2adba00e74366eb
John Reck [Wed, 20 May 2015 14:18:32 +0000 (14:18 +0000)]
Merge "Fix Bitmap#sameAs NPE" into mnc-dev
Dan Sandler [Wed, 20 May 2015 14:04:35 +0000 (14:04 +0000)]
Merge "Deal more gracefully with null smallIcons." into mnc-dev
Dan Sandler [Wed, 20 May 2015 00:59:12 +0000 (20:59 -0400)]
Deal more gracefully with null smallIcons.
First, when parceling a notification with no small icon:
Well, you shouldn't attempt to do this anyway, since NoMan
will reject a notification without a valid smallIcon. But
setServiceForeground parcels up the Notification on its own
before handing it off to NoMan, so it will crash on an
invalid small icon. (In general, parceling code should never
ever crash, even if the object is in an undesirable state.)
And when build()ing a notification: Same thing---don't build
a notification with no icon; you're going to have a bad
time. But maybe you're going to fix it before you hand it
off to NoMan. Or maybe it's just one page of a wearable
notification, so it doesn't really need its own icon. Either
way, Notification shouldn't crash.
Bug:
21286186
Bug:
21298403
Change-Id: Ie482cde0a3afe3aaabf07be0536551b8e4bceba0
Jason Monk [Wed, 20 May 2015 13:16:01 +0000 (13:16 +0000)]
Merge "Don't crash in bugreport on devices without BT" into mnc-dev
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:49:02 +0000 (10:49 +0000)]
Merge "Undeprecate android.net.ProxyInfo as it's still used." into mnc-dev
Narayan Kamath [Wed, 20 May 2015 10:11:55 +0000 (11:11 +0100)]
Throw a checked exception on inconsistent installs.
Allows us to proceed without crashing the system process. Also,
complete an incomplete error message. Follow up comments from
change
b904863476991d8540d37d5.
bug:
21144503
Change-Id: Idb6a33f93b70b4e5e2bca95d2d3af0e2adaeedf3
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: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 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:26:12 +0000 (03:26 +0000)]
Merge "Close netlink socket when shutting down IpReachabilityMonitor" into mnc-dev
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 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:04:56 +0000 (01:04 +0000)]
Merge "[Fix Potential for error]:" into mnc-dev
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
Ruben Brunk [Wed, 20 May 2015 00:20:24 +0000 (17:20 -0700)]
camera: Add AIDL interface for CameraServiceProxy.
- Adds an AIDL interface to allow the proxy camera service
running in system server to accept RPCs from the camera
service running in mediaserver.
- Request an update to the valid user set from the proxy
camera service when mediaserver restarts to initialize
properly + avoid DOS after a crash.
Bug:
21267484
Change-Id: Ib821582794ddd1e3574b5dc6c79f7cb197b57f10
fenglu [Sat, 2 May 2015 00:04:36 +0000 (17:04 -0700)]
LCE feature enhancement
- space pollLceData calls every 500ms
- cluster multiple pending pollLceData calls into one
- cherry pick from mwd to mnc-dev
Bug:
21307957
Change-Id: I04513011db3ae29af02bd54fe91cb8e0d4ab9f12
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
Svetoslav [Tue, 19 May 2015 23:48:46 +0000 (16:48 -0700)]
Prevent modification of system fixed permissions
Change-Id: I061b993df305f27e52f08dad54f1bdbf162de4d9
Eric Laurent [Tue, 19 May 2015 23:46:52 +0000 (16:46 -0700)]
AudioFormat: more compressed formats
Add MP3 and AAC as valid AudioFormat encodings.
Only @hide for now to allow system components to manage
audio patches with those formats.
Bug:
18649264.
Change-Id: I5ef5f151783308e31d8ac5b29454589077ef62ea
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
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
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."
John Reck [Tue, 19 May 2015 22:50:51 +0000 (15:50 -0700)]
Fix Bitmap#sameAs NPE
Bug:
21281842
Change-Id: I4a1e33d7e642fa50e8789f1441e8587d1c15119c
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: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
John Reck [Tue, 19 May 2015 22:00:13 +0000 (15:00 -0700)]
Reduce wasted buffer allocations
Bug:
20170924
Don't pre-allocate buffers if there is a SurfaceView or other
View that has requested transparent regions. This doesn't fully
address the problem of allocating buffers when there's a full
screen SurfaceView but it at least gets back to KitKat levels
of only having 1 wasted buffer instead of 3 (the 1 being
a result of the fact that it will still draw one frame of emptiness
forcing a buffer dequeue).
Change-Id: Ied9553186bc7b111d180b63f87b92bd317cb4b97
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
Jorim Jaggi [Tue, 19 May 2015 21:01:07 +0000 (14:01 -0700)]
Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (1/2)
Change-Id: I071282032b4c4d6e19b5093a25cc541b0e83ebb4
Jason Monk [Tue, 19 May 2015 20:06:52 +0000 (16:06 -0400)]
Don't crash in bugreport on devices without BT
Bug:
21160862
Change-Id: Ia3295fc6ebbd8ad1b5d03c70c89370d09f9cbb03
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 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: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
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: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: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 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