OSDN Git Service
Dianne Hackborn [Thu, 22 Oct 2015 00:37:33 +0000 (00:37 +0000)]
Merge "Hopefully fix issue #
25153459: Sandboxed_process1 thrashing" into mnc-dr-dev
Dianne Hackborn [Thu, 22 Oct 2015 00:12:53 +0000 (17:12 -0700)]
Hopefully fix issue #
25153459: Sandboxed_process1 thrashing
There is a race where if you unbind to a service before its
process has come up, we would leave the service record active
and keep it running. Fix this by checking the service state
after its process up and proceed to bring it down if it is no
longer needed.
Also added a similar check when restarting a service, just in
case there are other ways we can get into this situation.
And while I am at it, I tweaked the broadcast queue dump output
a bit to hopefully make it a lot easier to figure out how long
it is taking to process broadcasts.
Change-Id: I46b98f1fe394ab8039ea4cc81fb5d3afb6391a31
Daniel Sandler [Wed, 21 Oct 2015 23:14:50 +0000 (23:14 +0000)]
Merge "Delay hiding the cast icon for 3 seconds." into mnc-dr-dev
Dan Sandler [Tue, 20 Oct 2015 23:01:27 +0000 (16:01 -0700)]
Delay hiding the cast icon for 3 seconds.
Ensure that the user has had a chance to see it for a few
seconds after screen recording has ended.
Bug:
19121797
Change-Id: I52b69b2029439d42163ead5dc8748889b4f61934
Adam Powell [Wed, 21 Oct 2015 20:40:45 +0000 (20:40 +0000)]
Merge "Don't query ChooserTargetService apps that haven't been used recently" into mnc-dr-dev
Selim Cinek [Wed, 21 Oct 2015 20:39:28 +0000 (20:39 +0000)]
Merge "Changing the ordering for heads up notifications" into mnc-dr-dev
Todd Kennedy [Wed, 21 Oct 2015 20:33:31 +0000 (20:33 +0000)]
Merge "Maintain shared user list on OTA" into mnc-dr-dev
Todd Kennedy [Wed, 21 Oct 2015 20:09:10 +0000 (13:09 -0700)]
Maintain shared user list on OTA
When a package is removed during an OTA, we weren't removing it from the
shared user list. This means anyone asking for the packages for a shared
UID would continue to see the old package.
Bug:
24906701
Change-Id: Ifb6d64195e6b8af7454e19591611af66a40cbd10
Adam Powell [Wed, 21 Oct 2015 20:21:28 +0000 (13:21 -0700)]
Don't query ChooserTargetService apps that haven't been used recently
Resolver/ChooserActivity sort apps based on usage factors for the last
two weeks. A score of zero means no usage data within that timeframe.
For system health and UI relevance, don't bother even waking up apps
that have zero scores.
Bug
25126166
Change-Id: Iae34a9667eb1985d6fe986670f3fb3f1177576da
Jeff Sharkey [Wed, 21 Oct 2015 16:59:55 +0000 (09:59 -0700)]
Narrow permission re-granting to specific volume.
When mounting a storage volume after an SDK upgrade, the platform
grants install permissions requested by apps. This patch fixes a
bug that was causing us to re-grant permissions for all installed
apps; we now narrow the granting to just the storage volume of
interest.
Also fixes a bug where scanning of internal ASECs would bump the
VersionInfo of the legacy apps-on-SD volume.
There is still a bug here around internal ASECs not being considered
for re-grants, but that needs to be fixed in a more invasive CL that
creates a separate VersionInfo. In addition, internal ASECs (also
known as forward locked apps) have been deprecated for some time.
Bug:
24583803
Change-Id: I9115fd484ec083bc10a970f5f612860d5a53e520
Geoff Mendal [Wed, 21 Oct 2015 16:39:56 +0000 (16:39 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Wed, 21 Oct 2015 16:24:14 +0000 (11:24 -0500)]
Import translations. DO NOT MERGE
Change-Id: Iafe3e615aa33308b7fb6e2b71df40e190371b7f3
Auto-generated-cl: translation import
Andrei Stingaceanu [Wed, 21 Oct 2015 15:56:26 +0000 (15:56 +0000)]
Merge "Fix toolbar flickering in ExtractedMode when longpressing." into mnc-dr-dev
Andrei Stingaceanu [Tue, 20 Oct 2015 18:11:23 +0000 (19:11 +0100)]
Fix toolbar flickering in ExtractedMode when longpressing.
onPreDraw starts an action mode in extract mode only which
does not consider the type of motion event and since extracted
mode never gets the focus event it never hides so it does not
need to show again.
Stop starting an action mode onPreDraw in extracted mode and
let the onTouchEvent handle starting the mode.
Also re-enabled dragging and dropping for ExtractedMode (most
of the issues were caused by starting the action mode
onPreDraw).
Bug:
25102276
Change-Id: I90d8e9f42f395b6b529e4d023ba6939e0dfb147f
Paul Lawrence [Wed, 21 Oct 2015 14:27:33 +0000 (14:27 +0000)]
Merge "Don't include password on default encryption command" into mnc-dr-dev
Geoff Mendal [Wed, 21 Oct 2015 14:18:52 +0000 (07:18 -0700)]
Import translations. DO NOT MERGE
Change-Id: I03353dbedeb1204ce7cd07577257aa070ce19b2f
Auto-generated-cl: translation import
Lorenzo Colitti [Wed, 21 Oct 2015 01:10:10 +0000 (01:10 +0000)]
Merge "Don't buzz when automatically connecting to captive portals" into mnc-dr-dev
Lorenzo Colitti [Wed, 21 Oct 2015 00:15:41 +0000 (09:15 +0900)]
Don't buzz when automatically connecting to captive portals
Play a sound and vibrate (by setting DEFAULT_ALL) only if the
user manually selected the network. This applies to both captive
portals and networks with no Internet access.
Bug:
24126143
Change-Id: Idf075d5c85f9f4b07a3431a25d1a3f7089cf1ee2
Jeff Sharkey [Wed, 21 Oct 2015 00:48:47 +0000 (00:48 +0000)]
Merge "Correctly derive ABI for apps on adopted media." into mnc-dr-dev
Jeff Sharkey [Wed, 21 Oct 2015 00:32:01 +0000 (17:32 -0700)]
Correctly derive ABI for apps on adopted media.
There was a bug causing PackageManager to think apps on adopted media
were actually in an ASEC, causing it to skip ABI derivation. This
change fixes the issue by copying the volume UUID into place early
in the scanning process.
Also fixes two places where we had incorrectly been including apps
on adopted media; switched them to check only for ASECs.
Bug:
24583803
Change-Id: If66d1bce02824a4d8e22f741b04a2abda0378cfb
Pavel Zhamaitsiak [Wed, 21 Oct 2015 00:27:27 +0000 (00:27 +0000)]
Merge "Carrier Config: Add KEY_CARRIER_IMS_GBA_REQUIRED_BOOL flag" into mnc-dr-dev
Rob Carr [Tue, 20 Oct 2015 23:30:12 +0000 (23:30 +0000)]
Merge "Catch exceptions thrown by pending activity launches." into mnc-dr-dev
Pavel Zhamaitsiak [Fri, 16 Oct 2015 23:39:00 +0000 (16:39 -0700)]
Carrier Config: Add KEY_CARRIER_IMS_GBA_REQUIRED_BOOL flag
Bug:
23731243
Change-Id: I3e08469ef293f0b619f95dd9fb48e8c582926270
Selim Cinek [Tue, 20 Oct 2015 23:07:12 +0000 (16:07 -0700)]
Changing the ordering for heads up notifications
In the new ranking, notifications with fullscreen
intents always take priority over those without,
such that when you get a call and a message
in succession, you would always see the
call on top and are able to pick it up.
Bug:
22778349
Change-Id: Ia9aaf009998fc9493f513dc71f2649d38ccf7a79
Kevin Cernekee [Tue, 20 Oct 2015 22:11:29 +0000 (22:11 +0000)]
Merge "ignore initial request to disable iptable chain" into mnc-dr-dev
Matthew Williams [Tue, 20 Oct 2015 22:03:17 +0000 (22:03 +0000)]
Merge "DO NOT MERGE Race condition in JobServiceContext" into mnc-dr-dev
Robert Carr [Tue, 20 Oct 2015 21:44:45 +0000 (14:44 -0700)]
Catch exceptions thrown by pending activity launches.
When we perform pendign activity launches from the handler
thread (as opposed to the a client binder thread), we must
take care exceptions from such will not bring the system
server down.
Bug:
24983901
Change-Id: I0e75f6b51bf6172a8e1b9cccc5fffb9d50c63e30
Alan Viverette [Tue, 20 Oct 2015 21:44:35 +0000 (21:44 +0000)]
Merge "DO NOT MERGE Use correct param for heightMode in RelativeLayout horizontal measure" into mnc-dr-dev
Matthew Williams [Sat, 17 Oct 2015 04:04:51 +0000 (21:04 -0700)]
DO NOT MERGE Race condition in JobServiceContext
BUG:
23981171
JobServiceContext has a reference to the running job which
1) needs to be copied before providing access to outside callers
2) was not guarded by a lock in one case which might result in an NPE
Change-Id: I7eb04052f3fe63e7b386c564a6bdebf9144e976a
(cherry picked from commit
0cc7654e109d232e5d9a9de06482d8d349a21f28)
Alan Viverette [Tue, 20 Oct 2015 21:29:39 +0000 (17:29 -0400)]
DO NOT MERGE Use correct param for heightMode in RelativeLayout horizontal measure
Bug:
22824701
Bug:
25107144
Change-Id: Ia0afd3edc20b8127605aef2653fa9b5472f41be2
(cherry picked from commit
130ce740d1aa4b9a7b024c76f8adec2c24278a81)
Xiaohui Chen [Tue, 20 Oct 2015 20:53:45 +0000 (13:53 -0700)]
ignore initial request to disable iptable chain
iptable child chains are disabled by default. Ignore the initial
disable request so netd won't throw errors when it cannot detach chains
that do not exist.
Bug:
22800189
Change-Id: I70b4b8b9e6a5dbffe32841941922b7fd92dcd3d6
Original-Change-Id: I9312dd558ba6d59dc6aa394afeb66a222daafcf9
[cernekee: backported from master branch]
Matthew Williams [Fri, 16 Oct 2015 19:01:31 +0000 (12:01 -0700)]
DO NOT MERGE Sync extras bundle comparison can throw NPE
BUG:
23591205
Change-Id: Ic6404c0befe70c34b078e0eae6a627826173d82c
(cherry picked from commit
9ad2c8403354a985258c098681067e74b9e2f638)
Rob Carr [Tue, 20 Oct 2015 18:20:27 +0000 (18:20 +0000)]
Merge "Correct ActivityInfo constructors." into mnc-dr-dev
Robert Carr [Tue, 15 Sep 2015 19:30:42 +0000 (12:30 -0700)]
Correct ActivityInfo constructors.
ActivityInfo was missing initialization for the
documentLaunchMode flag in the copy-constructor
and the Parcel constructor. The copy-constructor
is used in multi-user/profile mode to create a
seperate instance of the ActivityInfo per uid
and this was manifesting in the linked bug.
Bug:
21590916
Change-Id: I6f71d94ec32ec6326d23c9b62e9d8d319e2fa25e
(cherry picked from commit
3e2e0117858eb02fef55ca4c245e8b920aedc6eb)
Abodunrinwa Toki [Tue, 20 Oct 2015 17:47:28 +0000 (17:47 +0000)]
Merge "Re-set PROCESS_TEXT selection if nothing was returned." into mnc-dr-dev
Jeff Sharkey [Tue, 20 Oct 2015 17:22:27 +0000 (17:22 +0000)]
Merge "Add locking when mutating RecentTasks." into mnc-dr-dev
Jeff Sharkey [Tue, 20 Oct 2015 17:21:46 +0000 (17:21 +0000)]
Merge "Ignore network policies with missing IMSI." into mnc-dr-dev
Alan Viverette [Tue, 20 Oct 2015 16:54:12 +0000 (16:54 +0000)]
Merge "Update drawable matrix when bounds change in invalidateDrawable()" into mnc-dr-dev
George Mount [Tue, 20 Oct 2015 16:41:33 +0000 (16:41 +0000)]
Merge "Set the bounds on the drawable for ChangeBounds reparenting." into mnc-dr-dev
Abodunrinwa Toki [Mon, 19 Oct 2015 23:19:23 +0000 (00:19 +0100)]
Re-set PROCESS_TEXT selection if nothing was returned.
Bug:
25043887
Change-Id: If069a5e23f1adf6a2c3aac8fe7e3f19cff2e28ad
Michael Wright [Tue, 20 Oct 2015 15:31:01 +0000 (15:31 +0000)]
Merge "Add SystemUI component to watch for keyboard attachment." into mnc-dr-dev
Todd Kennedy [Tue, 20 Oct 2015 14:36:00 +0000 (14:36 +0000)]
Merge "Retain fragment loaders" into mnc-dr-dev
Alan Viverette [Tue, 20 Oct 2015 13:48:58 +0000 (09:48 -0400)]
Update drawable matrix when bounds change in invalidateDrawable()
Bug:
24797872
Change-Id: Ib2bcce6f7d6fab33633a915882821b00d94e4e44
Jeff Sharkey [Tue, 20 Oct 2015 00:46:04 +0000 (17:46 -0700)]
Add locking when mutating RecentTasks.
Otherwise there is a really rare race condition where we try tearing
down the tasks while we're still setting them up.
Bug:
25078914
Change-Id: Icf89241f9abec3fadc8606cfb4fbc029bbe91515
Adam Powell [Tue, 20 Oct 2015 00:33:37 +0000 (00:33 +0000)]
Merge "DO NOT MERGE Fix jank when intent resolver/chooser windows animate in" into mnc-dr-dev
Adam Powell [Mon, 19 Oct 2015 23:25:08 +0000 (16:25 -0700)]
DO NOT MERGE Fix jank when intent resolver/chooser windows animate in
An old optimization in ViewRoot prevents updating a window surface
while a window animation is playing. SystemUI and other small system
components that blend these animations disable this for a smoother
experience. Disable it in ResolverActivity as well.
Bug
24989381
Change-Id: Iac7d1c7b1101ed8d2bc4c3557277a773ce871beb
Jeff Sharkey [Mon, 19 Oct 2015 23:52:08 +0000 (16:52 -0700)]
Ignore network policies with missing IMSI.
In rare cases, we might have created a network policy before an IMSI
was available. Because this policy is persisted, and we incorrectly
think that it always applies, we end up annoying the user when data
usage goes over the 2GB default warning threshold.
This patch fixes the network matching logic to ignore these empty
network policies when present.
Bug:
24972775
Change-Id: Id26499b6716121dddf0f2c05b848b0bed5995e72
George Mount [Mon, 19 Oct 2015 19:14:01 +0000 (12:14 -0700)]
Set the bounds on the drawable for ChangeBounds reparenting.
Bug
24993183
The bounds for the drawable weren't being set, so the
drawable was never drawn to the correct size.
Change-Id: I992951f28ee6fac2ce8752d2dc0e23f51d3cf584
(cherry picked from commit
f2a3703696f5dc8b1a0d243051e0db65c2145452)
Todd Kennedy [Mon, 19 Oct 2015 22:31:51 +0000 (15:31 -0700)]
Retain fragment loaders
Remove the partial fix [it did not work for child fragment managers]
and replace with a more general fix that works with all fragments.
Bug:
23838271
Change-Id: I88b465f6a06a6ad627b9651b9e2eea41fae08972
Adrian Roos [Mon, 19 Oct 2015 23:26:47 +0000 (23:26 +0000)]
Merge "Reload content description of KeyButtonView" into mnc-dr-dev
Todd Kennedy [Mon, 19 Oct 2015 22:52:27 +0000 (22:52 +0000)]
Merge "Set host when restoring a fragment" into mnc-dr-dev
Mathieu Chartier [Mon, 19 Oct 2015 22:47:45 +0000 (22:47 +0000)]
Merge "Fix read_mapinfo to recognize free list large object space" into mnc-dr-dev
Mathieu Chartier [Mon, 19 Oct 2015 20:48:34 +0000 (13:48 -0700)]
Fix read_mapinfo to recognize free list large object space
Bug:
25081604
(cherry picked from commit
6421da8f46e2a60da55939d8a4f7d91ab286dfcf)
Change-Id: If676c2309e3e397676fa8cef21405c34db7d5db2
Svetoslav Ganov [Mon, 19 Oct 2015 22:41:35 +0000 (22:41 +0000)]
Merge "Don't allow concurrent permission requests." into mnc-dr-dev
Aravind Akella [Mon, 19 Oct 2015 21:15:28 +0000 (21:15 +0000)]
Merge "Fix a possible race condition in SensorManager initialization." into mnc-dr-dev
Todd Kennedy [Mon, 19 Oct 2015 19:48:55 +0000 (12:48 -0700)]
Set host when restoring a fragment
When we restore a fragment [i.e. on configuration change], we need to
make sure the host is set prior to calling into lifecycle methods
such as onInflate(). These use data contained within the host.
Bug:
22512520
Change-Id: I709365a858cfc555ec5b7fc200629fa8d022faad
Aravind Akella [Fri, 16 Oct 2015 21:18:40 +0000 (14:18 -0700)]
Fix a possible race condition in SensorManager initialization.
Bug:
24526176
Change-Id: Ib8bae6eee16a5b787d3c2da6ef03af311cfdfadc
Geoff Mendal [Mon, 19 Oct 2015 15:55:17 +0000 (15:55 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Mon, 19 Oct 2015 15:03:19 +0000 (08:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: I76444ef3a3911763f41010e0cd0f5015a2f756e9
Auto-generated-cl: translation import
Geoff Mendal [Mon, 19 Oct 2015 14:01:55 +0000 (07:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie8f3e950a4c69ad49e6f370b97398b507d488111
Auto-generated-cl: translation import
Chris Wren [Sat, 17 Oct 2015 21:30:37 +0000 (21:30 +0000)]
Merge "count notification peeks by window action" into mnc-dr-dev
Ruben Brunk [Thu, 15 Oct 2015 00:46:52 +0000 (17:46 -0700)]
Fix lens shading map origin calculation.
Bug:
24816235
Change-Id: Id4609f3349f86c811cbc3d5e1839f880da926486
Adrian Roos [Fri, 16 Oct 2015 23:51:04 +0000 (16:51 -0700)]
Reload content description of KeyButtonView
Reload the content description whenever the
configuration changes.
Bug:
24977838
Change-Id: I875f0d83976b7d007a9bb2e56b28ff8fb6365a38
Selim Cinek [Fri, 16 Oct 2015 23:28:46 +0000 (23:28 +0000)]
Merge "Stopping chronometers now when the shade is closed" into mnc-dr-dev
Selim Cinek [Mon, 21 Sep 2015 13:47:20 +0000 (15:47 +0200)]
Stopping chronometers now when the shade is closed
Bug:
23978877
Change-Id: I01a9e756d7eeef7aa239ca0c67d4084624aaed12
Matthew Williams [Thu, 15 Oct 2015 22:59:12 +0000 (15:59 -0700)]
DO NOT MERGE Sanity check loaded periodics and cap runtime.
BUG:
24900376
We've seen an issue where periodic run times can be massively
inflated after loading from disk.
As a safeguard, cap the period's loaded runtime to be [p, 2p]
from the time of loading.
Change-Id: Ie4464490c8d6702fee8efe9190c3da5dc5f013f6
(cherry picked from commit
fa8e5084eed63ab8d92c71fcff656690a30293c3)
Roozbeh Pournader [Fri, 16 Oct 2015 21:54:12 +0000 (21:54 +0000)]
Merge "Fix line height problem with inline images in StaticLayout." into mnc-dr-dev
Adrian Roos [Fri, 16 Oct 2015 20:43:32 +0000 (20:43 +0000)]
Merge "Fix wrongly laid out navigation color view" into mnc-dr-dev
Svetoslav [Thu, 15 Oct 2015 23:54:00 +0000 (16:54 -0700)]
Don't allow concurrent permission requests.
bug:
24690277
Change-Id: Ie8c6eae230cd20e40d32cf688d30f6d40f9a9acd
Chris Wren [Fri, 16 Oct 2015 20:24:20 +0000 (16:24 -0400)]
count notification peeks by window action
Bug:
20751989
Change-Id: I9b1093b98f303656a299c18b503c1d8c9f032335
Julia Reynolds [Fri, 16 Oct 2015 19:38:22 +0000 (19:38 +0000)]
Merge "Add 'until next alarm' option to QS zen panel." into mnc-dr-dev
Matthew Williams [Fri, 16 Oct 2015 18:51:48 +0000 (18:51 +0000)]
Merge "DO NOT MERGE Change scheduling logic to run network jobs sooner" into mnc-dr-dev
Adam Powell [Fri, 16 Oct 2015 18:08:36 +0000 (18:08 +0000)]
Merge "Fix ChooserTarget app scoring" into mnc-dr-dev
Adam Powell [Fri, 16 Oct 2015 17:47:32 +0000 (10:47 -0700)]
Fix ChooserTarget app scoring
An initial sorting step before applying modifiers to the ChooserTarget
scores provided by apps was backwards, causing subsequent target
scores to be heavily penalized. Targets are then heavily influenced by
the lowest score in the set relative to the targets from other apps.
Bug
25013559
Change-Id: I39d5d7c601712fc6a19e694d5846d2c8d17a214f
Tyler Gunn [Fri, 16 Oct 2015 17:36:40 +0000 (17:36 +0000)]
Merge "DO NOT MERGE Add a new carrier config for DTMF tone gap in CDMA." into mnc-dr-dev
Roshan Pius [Fri, 14 Aug 2015 19:58:08 +0000 (12:58 -0700)]
DO NOT MERGE Add a new carrier config for DTMF tone gap in CDMA.
Adding a new carrier config key to specify the gap between the DTMF
tones sent out to the network. Setting it to 100ms by default.
This is based on a similar set of changes for IMS calls: ag/747865.
BUG:
19118840
Change-Id: Ifb64fe406509fe7c401ad1c4b4e906d6643e327b
Abodunrinwa Toki [Fri, 16 Oct 2015 16:36:28 +0000 (16:36 +0000)]
Merge "DO NOT MERGE: Reduce delay of floating toolbar appearance." into mnc-dr-dev
Jeff Sharkey [Fri, 16 Oct 2015 16:18:38 +0000 (16:18 +0000)]
Merge "Update docs to reflect adoptable behavior." into mnc-dr-dev
Wale Ogunwale [Fri, 16 Oct 2015 16:14:45 +0000 (16:14 +0000)]
Merge "Disassociate system windows from apps" into mnc-dr-dev
tiger_huang [Tue, 13 Oct 2015 13:38:19 +0000 (21:38 +0800)]
Disassociate system windows from apps
With the original logic, if an app creates a system window, when the
user goes to home screen, the system window will be still there and
become unable to receive input events, because the system window will
be also changed to the stopped state with the app window, and the
current logic of ViewRootImpl forbid a stopped window receiving input
events.
This change prevents assigning the token of the app window to system
windows created by the app, so that when the app goes to the stopped
state, its system windows won't be affected (can still receive input
events).
This change is related to the following changes:
https://android.googlesource.com/platform/frameworks/base/+/
a5d29971f8f4d463348e9de0f7af7e2e92a377a0
https://android.googlesource.com/platform/frameworks/base/+/
15ed2754a308546a54ab1061b4e365d6fe9b898d
https://android.googlesource.com/platform/frameworks/base/+/
c3672cd3f7e2bd87d6de9dada499de82b62fae84
https://android.googlesource.com/platform/frameworks/base/+/
41725dedc33906aaafee36b2d6523596e2a8a52e
Bug:
24967303
Bug: https://code.google.com/p/android/issues/detail?id=189710
Change-Id: I515e47bafcf39a2b1bdf92f11f623bef8fb6263c
Abodunrinwa Toki [Fri, 16 Oct 2015 14:54:53 +0000 (15:54 +0100)]
DO NOT MERGE: Reduce delay of floating toolbar appearance.
Bug:
21956394
Change-Id: I3db39e84afd3474b5bb53522c5a4c738ec1511bf
Roozbeh Pournader [Fri, 16 Oct 2015 09:27:03 +0000 (02:27 -0700)]
Fix line height problem with inline images in StaticLayout.
Previously, paragraphs with ImageSpans in their middle would continue to
carry the height of the image into the line height of next lines. This was
a regression from L.
The bug was due to StaticLayout's out() method almost always
modifying the value of its parameter "fm", although that was only
intended when there were LineHeightSpans in the text. The method
generate() was assuming that it can restore fmTop etc to metrics of
the current span by setting them from "fm" after out() was run, while
"fm" was modified by out() and its original values was lost!
The fix makes sure to set chooseHt back to null if there were no
LineHeightSpans, so out() would not modify "fm" unless necessary.
AOSP bug: https://code.google.com/p/android/issues/detail?id=188042
Bug:
24548073
Change-Id: I0d00af384c35a9d863377972318da9db7668118f
Sanket Padawe [Fri, 16 Oct 2015 00:38:55 +0000 (00:38 +0000)]
Merge "Mask IccId which gets printed in bug reports & radio logs." into mnc-dr-dev
Matthew Williams [Thu, 15 Oct 2015 23:08:05 +0000 (16:08 -0700)]
DO NOT MERGE Change scheduling logic to run network jobs sooner
BUG:
24385082
BUG:
23144425
BUG:
18117279
Run jobs with connectivity constraints as soon as the developer-allotted
delay has expired, rather than waiting for the override deadline. This
is more in tune with what developers expect, although it reduces the
amount of batching the scheduler can theoretically do.
This will also have the side effect of fixing several failing cts
tests that started breaking b/c the signal to 'run connectivity
jobs early' was removed in M and nothing was put in to replace it.
Change-Id: I7e63c2b62f2882ee906f748445bbf10c32e19c5f
(cherry picked from commit
aa9843198dec910a581bdc509d3937a9ea6ceca9)
Dianne Hackborn [Thu, 15 Oct 2015 23:11:12 +0000 (23:11 +0000)]
Merge "Fix issue #
24571425: Device does not come out of idle mode for maintenance" into mnc-dr-dev
Alan Viverette [Thu, 15 Oct 2015 22:50:21 +0000 (15:50 -0700)]
Don't project ripple for adequately tall spinners
Bug:
24674907
Change-Id: I1674c14f321600a40ca20adab1d40459963d2d1b
Sanket Padawe [Thu, 15 Oct 2015 22:46:39 +0000 (15:46 -0700)]
Mask IccId which gets printed in bug reports & radio logs.
Bug:
24941148
Change-Id: Ibe397f5d9b0da245e3e64f626937db4792c7f3c2
Adrian Roos [Thu, 15 Oct 2015 22:38:38 +0000 (15:38 -0700)]
Fix wrongly laid out navigation color view
The SystemUI visibility listener in DecorView
gets called between the measure and layout passes
and is therefore not allowed to change layout parameters.
This change makes sure that changes to the color view
layout parameters are applied eagerly when the insets
change instead of waiting for the views to become visible.
Bug:
24614374
Change-Id: If9df18f582163d0869c28a852c36697b1ce50621
Dianne Hackborn [Thu, 15 Oct 2015 21:51:06 +0000 (14:51 -0700)]
Fix issue #
24571425: Device does not come out of idle mode for maintenance
Don't allow alarms to push the idle maintenance alarm later
than it was set for.
Change-Id: I947718ffc9d2b984a793d7e4f2d027d8ddeee41b
Julia Reynolds [Thu, 1 Oct 2015 18:34:22 +0000 (14:34 -0400)]
Add 'until next alarm' option to QS zen panel.
Unlike the implementation in LMR1, this is a countdown condition
(a countdown until the time of what was the next alarm when the
rule was created). The rule will not change if alarms change.
Also, alarms up to 7 days in the future will be considered.
Bug:
21648799
Change-Id: Id7fa9dbdbad1539e4da19b1d0e0c4395bb13e6cb
(cherry picked from commit
0842fe87b27b9e4a7aecfec25b93dba2d39f398a)
Rob Carr [Thu, 15 Oct 2015 18:38:28 +0000 (18:38 +0000)]
Merge "WindowStateAnimation: Clear transformation clip rect." into mnc-dr-dev
Julia Reynolds [Thu, 15 Oct 2015 13:44:04 +0000 (13:44 +0000)]
Merge "Update volume slider on device changed." into mnc-dr-dev
Julia Reynolds [Thu, 15 Oct 2015 13:29:51 +0000 (13:29 +0000)]
Merge "Selectively show zen footer." into mnc-dr-dev
Chris Thornton [Thu, 15 Oct 2015 01:24:45 +0000 (01:24 +0000)]
Merge "Don't call StopRecognition when recognition was aborted." into mnc-dr-dev
Dianne Hackborn [Thu, 15 Oct 2015 01:01:12 +0000 (01:01 +0000)]
am
e34445f1: Merge "Docs only change: update build version docs." into mnc-dev
* commit '
e34445f11a6a14dd30ba0e018b82e852ef82ecbc':
Docs only change: update build version docs.
Dianne Hackborn [Thu, 15 Oct 2015 00:56:05 +0000 (00:56 +0000)]
Merge "Docs only change: update build version docs." into mnc-dev
Robert Carr [Fri, 25 Sep 2015 21:56:38 +0000 (14:56 -0700)]
WindowStateAnimation: Clear transformation clip rect.
Ensure the clip rect taken from transformations is cleared
when there is no transformation. Normally the failure to
clear the clip would not cause a problem, as the final clip
would be equal to the window size. However, in the event that
the window scale goes on to change (WindowState::m(H/V)Scale that is)
the clip will now be specified at the inappropriate scale (notice the
way the clip must be divided by H/VScale as SurfaceFlinger will apply
the surface transform to the clip).
Bug:
24298694
Change-Id: I4548e8ecea8d66d4942e99823653a7b05f87cea0
(cherry picked from commit
2f0fe62c5426533ccdf9ec7ef28027c367286979)
Adrian Roos [Thu, 15 Oct 2015 00:35:33 +0000 (00:35 +0000)]
am
31f19c44: Merge "Send next alarm\'s show intent via PendingIntent" into mnc-dev
* commit '
31f19c444f5f9d22c81fcb339e51bee465ba10f9':
Send next alarm's show intent via PendingIntent
Adrian Roos [Thu, 15 Oct 2015 00:29:56 +0000 (00:29 +0000)]
Merge "Send next alarm's show intent via PendingIntent" into mnc-dev
Roozbeh Pournader [Thu, 15 Oct 2015 00:18:36 +0000 (00:18 +0000)]
Merge "Load binary hyphen data files" into mnc-dr-dev