OSDN Git Service
Tobias Thierer [Wed, 27 Jun 2018 15:26:11 +0000 (08:26 -0700)]
Merge "TextUtils: track behavior change of Pattern.split() when targeting > 28." am:
b5f35aeaf3
am:
5442964205
Change-Id: I4dfc6aa0a062998b186b7abfef2cae41463239b2
Tobias Thierer [Wed, 27 Jun 2018 15:14:58 +0000 (08:14 -0700)]
Merge "TextUtils: track behavior change of Pattern.split() when targeting > 28."
am:
b5f35aeaf3
Change-Id: I55ba23bfae8f578eb75a4cbfeb2ed4ad1492867d
Tobias Thierer [Wed, 27 Jun 2018 13:53:12 +0000 (13:53 +0000)]
Merge "TextUtils: track behavior change of Pattern.split() when targeting > 28."
Neil Fuller [Wed, 27 Jun 2018 12:10:18 +0000 (05:10 -0700)]
resolve merge conflicts of
bc38909bf3790331532c329a867d5a22fbf94016 to stage-aosp-master
am:
ca48eb7fa9
Change-Id: I350bcde63f1874d4a237e81d7f93bed00cbba6a3
Neil Fuller [Wed, 27 Jun 2018 10:40:06 +0000 (11:40 +0100)]
resolve merge conflicts of
bc38909bf3790331532c329a867d5a22fbf94016 to stage-aosp-master
BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ib06f2869e5aa1788c8d5fc281a8565420e93d8f7
Neil Fuller [Wed, 27 Jun 2018 08:45:36 +0000 (08:45 +0000)]
Merge "Prepare for migration to the time detector service"
Julia Reynolds [Wed, 27 Jun 2018 01:26:14 +0000 (18:26 -0700)]
Merge "DO NOT MERGE Log notification interruptions to TRON" into pi-dev
am:
694b4ae846
Change-Id: I54b861a2a4d72cfdc1734fc5528b10bce5f1d0ef
TreeHugger Robot [Wed, 27 Jun 2018 01:09:48 +0000 (01:09 +0000)]
Merge "DO NOT MERGE Log notification interruptions to TRON" into pi-dev
David Sehr [Wed, 27 Jun 2018 00:25:44 +0000 (17:25 -0700)]
[automerger skipped] Merge "Split fork and specialize in zygote" am:
f40f05229c -s ours
am:
984fc6eae1 -s ours
Change-Id: I0ac0bcd1c3f9242d4a2efab56627a61baf79676c
Josh Gao [Wed, 27 Jun 2018 00:16:03 +0000 (17:16 -0700)]
Merge "Fix memory leak in RenderThread::dumpGraphicsMemory." am:
c00dd28164
am:
258513f581
Change-Id: I7e9f930c94d4fbb4ac23473c017bc8762e8d55dc
David Sehr [Wed, 27 Jun 2018 00:13:55 +0000 (17:13 -0700)]
[automerger skipped] Merge "Split fork and specialize in zygote"
am:
f40f05229c -s ours
Change-Id: I3d5162e3967503d85aae73fe6bd37e0f50516b9d
Josh Gao [Wed, 27 Jun 2018 00:09:06 +0000 (17:09 -0700)]
Merge "Fix memory leak in RenderThread::dumpGraphicsMemory."
am:
c00dd28164
Change-Id: I788e8747361a5c0e3324aa7ac88951428b5f0829
Evan Laird [Tue, 26 Jun 2018 23:42:56 +0000 (16:42 -0700)]
Merge "Make BT icon more prominent" into pi-dev
am:
6c90bf605e
Change-Id: Ic9c9a19e49c32187c3d65f361fc7cae16a7d0a56
TreeHugger Robot [Tue, 26 Jun 2018 23:24:30 +0000 (23:24 +0000)]
Merge "Make BT icon more prominent" into pi-dev
Tyler Gunn [Tue, 26 Jun 2018 22:44:03 +0000 (15:44 -0700)]
[automerger skipped] Merge "Update onDeregistered docs to make capability change expectations clear." am:
690f008e3f -s ours
am:
6f8fef77de -s ours
Change-Id: Ibd0b306b9776821b84680894c14250e3d9a2913a
Tyler Gunn [Tue, 26 Jun 2018 22:26:09 +0000 (15:26 -0700)]
[automerger skipped] Merge "Update onDeregistered docs to make capability change expectations clear."
am:
690f008e3f -s ours
Change-Id: Ibb2c56554f0df15cf287c90aa1f183674e948f3d
Hall Liu [Tue, 26 Jun 2018 22:17:12 +0000 (15:17 -0700)]
Merge "Make RttTextStream's read interruptible" into pi-dev
am:
21ef4b3acb
Change-Id: Ifc793a3b59e7e9cc5c09cffa8d147feeb5a6e900
Lucas Dupin [Tue, 26 Jun 2018 22:04:34 +0000 (15:04 -0700)]
Merge "Do not animate scrims when launching camera" into pi-dev
am:
aa21ec053c
Change-Id: Ic3089144cb26864bd0e49846348441c7857cce49
David Sehr [Tue, 26 Jun 2018 22:02:16 +0000 (22:02 +0000)]
Merge "Split fork and specialize in zygote"
Hall Liu [Tue, 26 Jun 2018 22:00:17 +0000 (22:00 +0000)]
Merge "Make RttTextStream's read interruptible" into pi-dev
Lucas Dupin [Tue, 26 Jun 2018 21:48:16 +0000 (21:48 +0000)]
Merge "Do not animate scrims when launching camera" into pi-dev
Treehugger Robot [Tue, 26 Jun 2018 21:38:14 +0000 (21:38 +0000)]
Merge "Fix memory leak in RenderThread::dumpGraphicsMemory."
Tyler Gunn [Tue, 26 Jun 2018 21:14:27 +0000 (21:14 +0000)]
Merge "Update onDeregistered docs to make capability change expectations clear."
Steven Moreland [Tue, 26 Jun 2018 21:10:33 +0000 (14:10 -0700)]
Merge "services.core.unboosted: hidl manager->static_libs" into stage-aosp-master
am:
3c6186c474
Change-Id: Id03d6d4af7ea4713bf971d54798a55be086a0ca3
TreeHugger Robot [Tue, 26 Jun 2018 20:49:15 +0000 (20:49 +0000)]
Merge "services.core.unboosted: hidl manager->static_libs" into stage-aosp-master
Andrew Sapperstein [Tue, 26 Jun 2018 20:19:57 +0000 (13:19 -0700)]
Merge "Hide system apps until installed (1/2)" into pi-dev
am:
70a9f39e6a
Change-Id: Ide5ea4b18ca95ee061bf84cb349369b2468504d1
Julia Reynolds [Mon, 18 Jun 2018 13:29:19 +0000 (09:29 -0400)]
DO NOT MERGE Log notification interruptions to TRON
Test: manual
Bug:
110209821
Change-Id: Ic3521f36127aa0e928d0be5ce9819c78c2bc9bc5
Andrew Sapperstein [Tue, 26 Jun 2018 20:03:38 +0000 (20:03 +0000)]
Merge "Hide system apps until installed (1/2)" into pi-dev
Lucas Dupin [Tue, 12 Jun 2018 02:16:03 +0000 (19:16 -0700)]
Do not animate scrims when launching camera
There's already a black overlay with a camera icon, it's not necessary
to animate the scrims.
Change-Id: I52472372420eb8ba052a17cdde147d24dafadce0
Fixes:
109767309
Test: double tap power button from lock screen and aod
David Sehr [Wed, 23 May 2018 22:23:01 +0000 (15:23 -0700)]
Split fork and specialize in zygote
Separate the portions of the zygote jni library that perform forking
from specialization into system_server or app process. This is a small
step towards separating forking into a pre-launch activity, possibly
with a pool of pre-application processes.
Bug:
68253328
Test: boot and run
Change-Id: I6ce694d9a69bf7d10cf61cd39989091ee9cabd37
Merged-In: I6ce694d9a69bf7d10cf61cd39989091ee9cabd37
Josh Gao [Tue, 26 Jun 2018 18:41:34 +0000 (11:41 -0700)]
Fix memory leak in RenderThread::dumpGraphicsMemory.
This would have been a double-close of fd, except we just leak the
FILE* instead.
Test: treehugger
Change-Id: I519366fbcf0eb6f03f79c22abfa2b1b1b493a70a
Android Build Merger (Role) [Tue, 26 Jun 2018 16:52:04 +0000 (16:52 +0000)]
Merge "Merge "Docs: fixed variables" into pi-dev am:
116158689c" into pi-dev-plus-aosp
Laura Davis [Tue, 26 Jun 2018 16:51:30 +0000 (09:51 -0700)]
Merge "Docs: fixed variables" into pi-dev
am:
116158689c
Change-Id: Ia4219c6d6502b9348ed30453b46801d107dd2a2c
David Sehr [Tue, 26 Jun 2018 16:48:08 +0000 (09:48 -0700)]
Merge "Split fork and specialize in zygote" into stage-aosp-master
am:
3937fbb439
Change-Id: I129586249b68364b7813a146fc5b48936b948174
Laura Davis [Tue, 26 Jun 2018 16:42:43 +0000 (16:42 +0000)]
Merge "Docs: fixed variables" into pi-dev
David Sehr [Tue, 26 Jun 2018 16:34:43 +0000 (16:34 +0000)]
Merge "Split fork and specialize in zygote" into stage-aosp-master
Steven Moreland [Mon, 25 Jun 2018 19:42:51 +0000 (12:42 -0700)]
services.core.unboosted: hidl manager->static_libs
Bug:
77307025
Test: boot device w/o hidl libs on boot classpath, no loading
error
Change-Id: Iae2b0015a29de71c22e6bc31004613bbf4ca971b
Tobias Thierer [Thu, 21 Jun 2018 09:31:39 +0000 (10:31 +0100)]
TextUtils: track behavior change of Pattern.split() when targeting > 28.
Another CL in this topic changes the behavior of String.split() and
Pattern.split() to omit a "" generated by a leading zero-width match.
TextUtils.split() is implemented on top of these methods and therefore
adopts the behavior change by default.
The behavior change only affects apps targeting API versions > 28.
Test: cts-tradefed run singleCommand cts-dev -m CtsTextTestCases \
-t android.text.cts.TextUtilsTest
Test: cts-tradefed run singleCommand cts-dev -m CtsLibcoreTestCases
Bug:
109659282
Change-Id: I8abe251353f8eacf1429ac9a8e272d50a0944c29
Neil Fuller [Tue, 26 Jun 2018 12:23:26 +0000 (05:23 -0700)]
Merge "Add more behavior to TimeDetectorService" am:
b1fc5a4c7e
am:
325ecf7df4
Change-Id: I28d5b3dbd666dc9d097f6fb7c15dc5ba8cf931e9
Neil Fuller [Tue, 26 Jun 2018 12:14:31 +0000 (05:14 -0700)]
Merge "Add more behavior to TimeDetectorService"
am:
b1fc5a4c7e
Change-Id: Ibbda2d253bf807cc480a4218aa1d898d6737ec7b
Jorim Jaggi [Tue, 26 Jun 2018 11:44:36 +0000 (04:44 -0700)]
Merge "Defer stop for all activities becoming invisible" into pi-dev
am:
fd77e69f28
Change-Id: Ife380bd268aa2c760dff2dec4f7a8358721cbe95
Jorim Jaggi [Tue, 26 Jun 2018 11:34:03 +0000 (11:34 +0000)]
Merge "Defer stop for all activities becoming invisible" into pi-dev
Neil Fuller [Tue, 26 Jun 2018 11:05:36 +0000 (04:05 -0700)]
resolve merge conflicts of
55c0a6682574b881b0ccdf2b08fdc4b6c84d1b81 to stage-aosp-master
am:
e01a7adf5a
Change-Id: I993dc856b8fe0f42d7ad5f766727be32d3d611fe
Neil Fuller [Tue, 26 Jun 2018 10:55:46 +0000 (11:55 +0100)]
resolve merge conflicts of
55c0a6682574b881b0ccdf2b08fdc4b6c84d1b81 to stage-aosp-master
BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ie524607cabc6688911eee7e4f61c50fd406c71f4
Neil Fuller [Thu, 21 Jun 2018 14:16:36 +0000 (15:16 +0100)]
Prepare for migration to the time detector service
Paves the way for moving more behavior to the time detector
service from the NetworkTimeUpdateService.
The NewNetworkTimeUpdateService is effectively identical to
the OldNetworkTimeUpdateService in this initial commit.
Bug:
78217059
Test: build / boot
Merged-In: Ica9fa9b61c849e034d76c0faae5693b60a4a197f
Change-Id: Ica9fa9b61c849e034d76c0faae5693b60a4a197f
Neil Fuller [Tue, 26 Jun 2018 08:43:55 +0000 (08:43 +0000)]
Merge "Add more behavior to TimeDetectorService"
Erik Kline [Tue, 26 Jun 2018 08:40:33 +0000 (01:40 -0700)]
Merge "Make auto-upstream the default tethering behaviour" am:
e193298c4a
am:
1239734050
Change-Id: I85f4cc390ea69d3499e1f2341770d586a1cb2b51
Neil Fuller [Tue, 26 Jun 2018 08:34:56 +0000 (08:34 +0000)]
Merge "Minimum viable TimeZoneDetectorService"
Erik Kline [Tue, 26 Jun 2018 08:32:31 +0000 (01:32 -0700)]
Merge "Make auto-upstream the default tethering behaviour"
am:
e193298c4a
Change-Id: Ie160bb6422f7a8f218dbf1374fdfadb0b957150d
Treehugger Robot [Tue, 26 Jun 2018 07:11:02 +0000 (07:11 +0000)]
Merge "Make auto-upstream the default tethering behaviour"
Hall Liu [Tue, 26 Jun 2018 02:48:33 +0000 (19:48 -0700)]
Make RttTextStream's read interruptible
Wrap the FileInputStream in a java.nio.Channel so that sending a
Thread.interrupt() to the thread blocked on the read will actually do
something.
Change-Id: Icc11ba69167f448e2b33d9a1a13a1dfa5e5d0d58
Fixes:
110570772
Test: manual (follow repro steps in bug, but type really fast),treehugger
Rhed Jao [Wed, 13 Jun 2018 03:16:16 +0000 (11:16 +0800)]
Hide system apps until installed (1/2)
Applying this mechanism for system carrier apps to make visibility
reasonable from the user's perspective. In other words, before
hidden system apps have been installed, they wouldn't be listed
via APIs in PackageManager which are used at all apps list and
search in Settings and so on.
Test: atest CarrierAppUtilsTest
Test: atest PackageManagerTest
Test: cts DeviceOwnerTest
Test: gts ManagedProfileProvisioningHostsideTest
Bug:
74068582
Change-Id: I1f23aba589b98351a1871a44a3058b67c416f351
Amit Mahajan [Mon, 25 Jun 2018 23:41:09 +0000 (16:41 -0700)]
Merge "Update comments for TelephonyManager.getUiccSlotsInfo()" am:
3838ff457e
am:
12b08d00b8
Change-Id: Ibee5837f9db34c48d705e4e92673572c43d1eb49
Stan Iliev [Mon, 25 Jun 2018 23:33:36 +0000 (16:33 -0700)]
Merge "Don't apply filter in readback, when there is no scaling" into pi-dev
am:
cea247e135
Change-Id: Ibfcc41e052376d159886410d11130bb89ade168d
Amit Mahajan [Mon, 25 Jun 2018 23:31:55 +0000 (16:31 -0700)]
Merge "Update comments for TelephonyManager.getUiccSlotsInfo()"
am:
3838ff457e
Change-Id: I46a8a708e949e134b8e4cb05fe315b058ad500fc
TreeHugger Robot [Mon, 25 Jun 2018 23:20:23 +0000 (23:20 +0000)]
Merge "Don't apply filter in readback, when there is no scaling" into pi-dev
Treehugger Robot [Mon, 25 Jun 2018 22:22:25 +0000 (22:22 +0000)]
Merge "Update comments for TelephonyManager.getUiccSlotsInfo()"
Laura Davis [Mon, 25 Jun 2018 21:37:54 +0000 (14:37 -0700)]
Merge "docs: fixed broken link" into pi-dev
am:
e07aeea926
Change-Id: I02ad0efff278079682ff7eb63c06d0bf17be8ca1
Laura Davis [Mon, 25 Jun 2018 21:27:48 +0000 (21:27 +0000)]
Merge "docs: fixed broken link" into pi-dev
Jorim Jaggi [Mon, 25 Jun 2018 14:14:50 +0000 (16:14 +0200)]
Defer stop for all activities becoming invisible
If we are deferring a stop until a window is becoming visible,
it's a good idea to also defer stopping all other activities that
are go into stopping state to avoid flickers.
Furthermore we need to fix an issue where activities weren't
cleared from mActivitiesWaitingForVisibleActivity which messed
up the newly introduced logic.
This fixes an issue with quickstep when swiping right and the
previous activity hasn't finished pausing yet when we start the
new activity. In the normal case, prev=Launcher and all is fine,
as we wait with stopping launcher until the animation is done. In
the bad case, prev=the previous activity that was on screen before
swiping, so Launcher doesn't get added to the waiting list, which
means that it will be stopped too early, aborting the animation
because Launcher is also driving it.
Test: ActivityManagerDisplayLockedKeyguardTests
Test: go/wm-smoke
Test: Swipe right from Chrome to any other app, observe no jump
Fixes:
80313326
Bug:
110032866
Change-Id: I39454fe218ac10ef73cc4ca23efc7c9fb3bc87ad
Laura Davis [Mon, 25 Jun 2018 21:03:32 +0000 (14:03 -0700)]
Merge "docs: fixed typo in deprecation message" into pi-dev
am:
0dabb070b8
Change-Id: I74d4d900bd4b978791a1ca5c30b6f17fb3cb700b
Matthew Ng [Mon, 25 Jun 2018 20:54:19 +0000 (13:54 -0700)]
Merge "Quick scrub has gradient follow user drag" into pi-dev
am:
5f5c6e993f
Change-Id: I173202bab30b6b8b5c45d1841a5070cb0d282a04
Laura Davis [Mon, 25 Jun 2018 20:46:59 +0000 (20:46 +0000)]
Merge "docs: fixed typo in deprecation message" into pi-dev
TreeHugger Robot [Mon, 25 Jun 2018 20:39:46 +0000 (20:39 +0000)]
Merge "Quick scrub has gradient follow user drag" into pi-dev
Laura Davis [Mon, 25 Jun 2018 20:21:41 +0000 (13:21 -0700)]
Merge "docs: fixed broken link" into pi-dev
am:
0f949c4f9c
Change-Id: I77ef449243f094477d009cb94a595e5fb8624ef0
Laura Davis [Mon, 25 Jun 2018 20:09:17 +0000 (20:09 +0000)]
Merge "docs: fixed broken link" into pi-dev
Laura Davis [Mon, 25 Jun 2018 20:05:24 +0000 (13:05 -0700)]
Docs: fixed variables
Test: make ds-docs
Bug:
25134282
Change-Id: Ic91dd3820a409f0f28e23575090e3fd624a0fac0
Brad Ebinger [Mon, 25 Jun 2018 18:53:41 +0000 (11:53 -0700)]
Merge "Fix Possible Deadlock with getFeatureState" am:
6bebb8418c
am:
057f582e09
Change-Id: I3cb9d6457c0348739e57802099c51b0308bbe05d
Brad Ebinger [Mon, 25 Jun 2018 18:45:32 +0000 (11:45 -0700)]
Merge "Fix Possible Deadlock with getFeatureState"
am:
6bebb8418c
Change-Id: I675c116e54d961971d4a32f87dd247cca51b5069
Pavel Grafov [Mon, 25 Jun 2018 18:45:17 +0000 (11:45 -0700)]
Restore separate challenge state on error
am:
f10ae7e731
Change-Id: I70957dae31bbe98f8286d9c96bccd002f0acdf01
Neil Fuller [Tue, 12 Jun 2018 20:06:20 +0000 (21:06 +0100)]
Add more behavior to TimeDetectorService
The client code now "suggests" time updates
to the time detection service. The current implementation
of the time detection service will validate and set the
device system clock as needed. In future it will ignore
these suggestions if better information is available.
Responsibility for sending the
TelephonyIntents.ACTION_NETWORK_SET_TIME intent has
been moved to the time detection service until it can be
removed or replaced.
The telephony code is still responsible for basic rate
limiting but the majority of the decision logic has been
moved to the service.
There is an associated change in telephony code to switch to
using the server.
Bug:
78217059
Test: atest FrameworksServicesTests:com.android.server.timedetector
Test: atest FrameworksCoreTests:android.util.TimestampedValueTest
Change-Id: I4f7a10ac06b2d32da22689e1ddf309e0a2795f30
Matthew Ng [Tue, 12 Jun 2018 23:42:11 +0000 (16:42 -0700)]
Quick scrub has gradient follow user drag
Removed the track drawable and draws a gradient translated to the
position of the drag of the user as the track's background.
Test: quickscrub
Change-Id: Iee893e5f96f4954c77307c5ff9b762a04bd7de9a
Fixes:
109882517
Evan Laird [Mon, 25 Jun 2018 17:48:26 +0000 (13:48 -0400)]
Make BT icon more prominent
Bluetooth is now rated higher than work profile, cast, and vpn. Also
move volume to the other side of location per the spec.
Test: visual
Change-Id: I169ec5e6d09355e0237aad2f6ee586069d93fd36
Fixes:
110475634
Brad Ebinger [Mon, 25 Jun 2018 17:30:02 +0000 (17:30 +0000)]
Merge "Fix Possible Deadlock with getFeatureState"
Erik Kline [Mon, 25 Jun 2018 13:33:21 +0000 (06:33 -0700)]
[automerger skipped] Merge "Prefer default Internet network for upstream tethering." am:
3580a6a996
am:
fc1bde9261 -s ours
Change-Id: I965178ec99083dcd907841b4959e456f6d492516
Erik Kline [Mon, 25 Jun 2018 13:24:22 +0000 (06:24 -0700)]
Merge "Prefer default Internet network for upstream tethering."
am:
3580a6a996
Change-Id: I0990d077627aed71b03e7aa40a8acc460448a774
Erik Kline [Mon, 25 Jun 2018 12:58:04 +0000 (21:58 +0900)]
Make auto-upstream the default tethering behaviour
Test: as follows
- built
- flashed
- booted
- runtest --no-hidden-api-checks frameworks-net
Bug:
32163131
Bug:
62648872
Bug:
63282480
Bug:
110118584
Change-Id: I3af6594cd16ecefa3d4a44902f2138fa635fbae1
Treehugger Robot [Mon, 25 Jun 2018 12:08:46 +0000 (12:08 +0000)]
Merge "Prefer default Internet network for upstream tethering."
Pavel Grafov [Mon, 25 Jun 2018 11:13:38 +0000 (12:13 +0100)]
Restore separate challenge state on error
Otherwise if something goes wrong when tying the profile to the primary
user, challenge will remain in inconsistent state and the user won't
be able to unlock the profile.
Bug:
110262879
Test: manual, unified both compliant and uncompliant challenge.
Change-Id: I2bea3867541f43cbabd5cabbe8a0f61acc2602ca
Erik Kline [Thu, 14 Jun 2018 08:36:40 +0000 (17:36 +0900)]
Prefer default Internet network for upstream tethering.
Rather than use the crufty config.xml list of upstream transport types,
use ConnectivityService's notion of the default network for the upstream.
In cases where a DUN network is required and the default network is
currently a mobile network, look for a DUN network (code in Tethering
is currently responsible for requesting one).
Test: as follows
- built, flashed, booted
- runtest frameworks-net
- tethered via mobile, joined captive portal network, maintained
laptop access via mobile until captive passed (then used wifi)
- disabled client mode wifi, disabled mobile data, plugged in
ethernet adapter, observed connectivity via ethernet
Bug:
32163131
Bug:
62648872
Bug:
63282480
Bug:
109786760
Bug:
110118584
Bug:
110260419
Merged-In: I9cddf1fb7aa3b8d56bf048c563556244e74808c2
Merged-In: Icac3e5e20e99093ddb85aae1ca07ed7b5cf309fd
Change-Id: I925b75994e31df8046f3ef9916a2457b4210485e
(cherry picked from commit
4080a1bd15572caf149762e45c958627feceb74d)
Lucas Dupin [Sat, 23 Jun 2018 08:17:10 +0000 (01:17 -0700)]
Merge "Conserve expansion after re-inflation" into pi-dev
am:
0eb2be3a67
Change-Id: I44f868df5cafeac3bef09586403cf955bad1e581
TreeHugger Robot [Sat, 23 Jun 2018 08:05:06 +0000 (08:05 +0000)]
Merge "Conserve expansion after re-inflation" into pi-dev
Lucas Dupin [Thu, 21 Jun 2018 18:41:34 +0000 (11:41 -0700)]
Conserve expansion after re-inflation
We were updating most of the PhoneStatusBarView state during
re-inflation but not the expansion and its fraction.
Test: Pull down shade, run: adb shell service call overlay 4 s16 "com.android.systemui.theme.dark" i32 1 i32 0
Test: Switch to guest user, switch back
Test: Reboot, look at status bar
Change-Id: I41669fb32419ad02a11586ba248a68b47d450413
Merged-In: I41669fb32419ad02a11586ba248a68b47d450413
Fixes:
110530608
Fixes:
110147405
Fixes:
79122419
Emilian Peev [Sat, 23 Jun 2018 00:22:01 +0000 (17:22 -0700)]
Merge "Camera: Update surface sharing format restrictions" into pi-dev
am:
a749cd584e
Change-Id: I501835fdbc828564c0a06157c970853ed142896a
TreeHugger Robot [Sat, 23 Jun 2018 00:11:04 +0000 (00:11 +0000)]
Merge "Camera: Update surface sharing format restrictions" into pi-dev
Brad Ebinger [Thu, 21 Jun 2018 17:18:21 +0000 (10:18 -0700)]
Fix Possible Deadlock with getFeatureState
Use the ImsFeature lock for concurrency in MmTelFeature
instead of declaring its own lock.
Also, fixed up some other concurrency code.
Bug:
110507525
Test: Manual, Telephony Unit Tests
Change-Id: I5a7ef1beca619873a7c228bed0e1b82843d4de63
David Sehr [Fri, 22 Jun 2018 17:45:36 +0000 (10:45 -0700)]
Split fork and specialize in zygote
Separate the portions of the zygote jni library that perform forking
from specialization into system_server or app process. This is a small
step towards separating forking into a pre-launch activity, possibly
with a pool of pre-application processes.
Bug:
68253328
Test: boot and run
Change-Id: I6ce694d9a69bf7d10cf61cd39989091ee9cabd37
(cherry picked from commit
c5c8bcd506f081180660ad8714adb9ee8a5176e9)
Kevin Hufnagle [Fri, 22 Jun 2018 22:50:04 +0000 (15:50 -0700)]
Merge "docs: Edited UNINSTALL_SHORTCUT permission desc." into pi-dev
am:
d2aadbfd93
Change-Id: I38378cf68c2ab2e16fdc35504b44114e6648de42
Laura Davis [Mon, 11 Jun 2018 17:33:17 +0000 (10:33 -0700)]
docs: fixed typo in deprecation message
Test: make ds-docs
Bug:
68303139
Change-Id: I7fc9f35bc118f8b661740a46f52d62beea1e67f1
Kevin Hufnagle [Fri, 22 Jun 2018 21:58:38 +0000 (21:58 +0000)]
Merge "docs: Edited UNINSTALL_SHORTCUT permission desc." into pi-dev
Stan Iliev [Fri, 22 Jun 2018 21:33:43 +0000 (17:33 -0400)]
Don't apply filter in readback, when there is no scaling
Fix check for scaling in SkiaOpenGLReadback: old code was not
taking into account that matrix rotation swaps width/height.
Test: Passed PixelCopyTest#testWindowProducerCopyToRGBA16F
Bug:
110097060
Change-Id: I0d26416fa72a026bc376417773d5a73548b1f1a5
Matthew Ng [Fri, 22 Jun 2018 19:36:26 +0000 (12:36 -0700)]
Merge "Allow quickscrub after deadzone consumes touch" into pi-dev
am:
95b7c25a58
Change-Id: Id2e3d7e859a47936a63ebb5875bda69fbb64c816
TreeHugger Robot [Fri, 22 Jun 2018 19:24:08 +0000 (19:24 +0000)]
Merge "Allow quickscrub after deadzone consumes touch" into pi-dev
Andrii Kulian [Fri, 22 Jun 2018 18:48:11 +0000 (11:48 -0700)]
Merge "Skip updating stack config if it is detached from a display" into pi-dev
am:
3a09ade4d1
Change-Id: Iad7554e7b893563a23a0adb2a4174199ea55beb2
Rebecca Silberstein [Fri, 22 Jun 2018 18:26:10 +0000 (11:26 -0700)]
Merge "SettingsBackupAgent: notify of apBand conversion" into pi-dev
am:
cbf554b78b
Change-Id: I7f717d4d6d8a836fc86d67cc453a464830865508
Andrii Kulian [Fri, 22 Jun 2018 18:14:25 +0000 (18:14 +0000)]
Merge "Skip updating stack config if it is detached from a display" into pi-dev
TreeHugger Robot [Fri, 22 Jun 2018 17:52:26 +0000 (17:52 +0000)]
Merge "SettingsBackupAgent: notify of apBand conversion" into pi-dev
Amin Shaikh [Fri, 22 Jun 2018 17:23:46 +0000 (10:23 -0700)]
Merge "Do not announce selected state for QS tiles." into pi-dev
am:
bd62416618
Change-Id: I5336f81eed377c9d3dfe5932f91fe97a3f91108a
TreeHugger Robot [Fri, 22 Jun 2018 17:12:54 +0000 (17:12 +0000)]
Merge "Do not announce selected state for QS tiles." into pi-dev
Julia Reynolds [Fri, 22 Jun 2018 15:29:21 +0000 (08:29 -0700)]
Merge "Remove managed profile toast" into pi-dev
am:
7f4e9739e4
Change-Id: I78e08cc1e3a1ec52cc9bf813ab794c62a73da978