OSDN Git Service
Android Build Merger (Role) [Thu, 29 Jun 2017 16:20:48 +0000 (16:20 +0000)]
Merge "Merge "add links to Log class summary for methods and logcat doc" into oc-dev am:
ea6fea4d5d" into oc-dr1-dev
TreeHugger Robot [Thu, 29 Jun 2017 16:20:13 +0000 (16:20 +0000)]
Merge "Update WifiConfiguration in AccessPoint." into oc-dr1-dev
Scott Main [Thu, 29 Jun 2017 16:19:20 +0000 (16:19 +0000)]
Merge "add links to Log class summary for methods and logcat doc" into oc-dev
am:
ea6fea4d5d
Change-Id: I322405e6712ef9affb57d86e43b852e19cdc7f88
Scott Main [Thu, 29 Jun 2017 16:12:47 +0000 (16:12 +0000)]
Merge "add links to Log class summary for methods and logcat doc" into oc-dev
TreeHugger Robot [Thu, 29 Jun 2017 13:38:24 +0000 (13:38 +0000)]
Merge "Be more lenient when processing group headers" into oc-dr1-dev
Selim Cinek [Thu, 29 Jun 2017 08:28:17 +0000 (10:28 +0200)]
Be more lenient when processing group headers
We are now only looking at the contracted header instead of all
sorts of headers and if the current header is null, we don't
look any further but consider it to be equal.
Bug:
62378776
Test: add notification groups with multiple headers, observe correct icon / text behavior
Change-Id: I0b83b91caaace30df3bdcba7225e93bd0e195484
TreeHugger Robot [Thu, 29 Jun 2017 05:51:39 +0000 (05:51 +0000)]
Merge "Clear AccessPoints in WifiTracker when Wifi is Off." into oc-dr1-dev
TreeHugger Robot [Thu, 29 Jun 2017 05:38:33 +0000 (05:38 +0000)]
Merge "Change TRON counters to reflect cl/
159755374" into oc-dr1-dev
Sundeep Ghuman [Tue, 6 Jun 2017 02:47:36 +0000 (19:47 -0700)]
Update WifiConfiguration in AccessPoint.
Currently, calling AccessPoint.update(config, info, networkInfo) will
not store the new WifiConfiguration object if it has changed. This can
cause the summary statement to fall out of sync.
Bug: b/
38409294
Test: Open WifiNetworkDetails page with verbose logging. Stale state no
longer shown when config changes.
runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java
Change-Id: I86411527472621f86ab691ee772c0b3d2153d01f
TreeHugger Robot [Thu, 29 Jun 2017 04:31:36 +0000 (04:31 +0000)]
Merge "Add case sensitive sort to AccessPoint compareTo." into oc-dr1-dev
TreeHugger Robot [Thu, 29 Jun 2017 02:33:09 +0000 (02:33 +0000)]
Merge "hidl getService throw correct exceptions." into oc-dr1-dev
Winson Chung [Thu, 29 Jun 2017 02:32:55 +0000 (02:32 +0000)]
Merge "Updating dismiss button icon to be rounded." into oc-dr1-dev
Winson Chung [Thu, 29 Jun 2017 02:31:54 +0000 (02:31 +0000)]
Merge "Fixing black background when going back from assistant." into oc-dr1-dev
Tri Vo [Thu, 29 Jun 2017 02:26:14 +0000 (02:26 +0000)]
Merge "Fwk vibrator server handles vibrator hal dying." into oc-dr1-dev
Andrii Kulian [Thu, 29 Jun 2017 02:16:43 +0000 (02:16 +0000)]
Merge "Further restrict activity launch on virtual displays" into oc-dev
am:
36dbd3d43f
Change-Id: Iea0afa18746c4b04d12433902140d65d4af50c8e
Robert Carr [Thu, 29 Jun 2017 02:15:32 +0000 (02:15 +0000)]
Merge "Disable requestVisibleBehind." into oc-dev
am:
e33c33e38a
Change-Id: I29e5507d716e19060d4c0578d4b4df3bcfa30069
Eugene Susla [Thu, 29 Jun 2017 02:14:22 +0000 (02:14 +0000)]
Merge "[Companion] Dont crash if started with bluetooth off" into oc-dev
am:
c55f7d2180
Change-Id: I024af9dfe70fb340b2dc481f8aad6b12351b56cb
John Reck [Thu, 29 Jun 2017 02:13:18 +0000 (02:13 +0000)]
Merge "Selectively disable filtering if estimated safe" into oc-dev
am:
38c97237e3
Change-Id: Ic3be7167429e8cd6a291ac0465e883522afcf9e3
Jorim Jaggi [Thu, 29 Jun 2017 02:12:02 +0000 (02:12 +0000)]
Merge "Properly check for orientation mismatch" into oc-dev
am:
a96d749140
Change-Id: I5f11ef2c520e418242b44db32d087656c4eb3984
TreeHugger Robot [Thu, 29 Jun 2017 02:00:51 +0000 (02:00 +0000)]
Merge "resolve merge conflicts of
91870d158748 to oc-dr1-dev" into oc-dr1-dev
Andrii Kulian [Thu, 29 Jun 2017 01:47:41 +0000 (01:47 +0000)]
Merge "Further restrict activity launch on virtual displays" into oc-dev
TreeHugger Robot [Thu, 29 Jun 2017 01:43:52 +0000 (01:43 +0000)]
Merge changes from topic 'fix_broken_overlay' into oc-dr1-dev
* changes:
Revert "Replaced overlay target package"
Revert "Support dark text on Recents"
TreeHugger Robot [Thu, 29 Jun 2017 00:17:19 +0000 (00:17 +0000)]
Merge "Disable requestVisibleBehind." into oc-dev
TreeHugger Robot [Thu, 29 Jun 2017 00:09:25 +0000 (00:09 +0000)]
Merge "Fixes getting the wrong app transition going home after minimized (1/2)" into oc-dr1-dev
TreeHugger Robot [Wed, 28 Jun 2017 23:54:49 +0000 (23:54 +0000)]
Merge "[Companion] Dont crash if started with bluetooth off" into oc-dev
TreeHugger Robot [Wed, 28 Jun 2017 23:45:37 +0000 (23:45 +0000)]
Merge "Adjustments to PIP position while flinging" into oc-dr1-dev
Andrii Kulian [Wed, 28 Jun 2017 23:21:07 +0000 (16:21 -0700)]
Further restrict activity launch on virtual displays
Only callers with INTERNAL_SYSTEM_WINDOW permission can launch
an activity to a virtual display.
Bug:
63094482
Test: android.server.cts.ActivityManagerDisplayTests
Change-Id: I3f618fcbf3c07e5085e2b43b0f038f240df0c9d3
Sundeep Ghuman [Thu, 22 Jun 2017 05:35:30 +0000 (22:35 -0700)]
Clear AccessPoints in WifiTracker when Wifi is Off.
When Wifi is not Enabled, we should clear existing access points. This
avoids showing stale data when wifi is turned back on. Since this method can
now invoke onAccessPointsChanged callbacks, add extra gating for
mStaleScanResults.
Improve test flakiness by waiting for Work and Main handlers to
finish processing messages before continuing.
Bug: b/
37832771
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java
Change-Id: I34faabec01a7188debe3c3b2fe6a0e02f49b320f
Scott Main [Wed, 28 Jun 2017 22:57:01 +0000 (15:57 -0700)]
add links to Log class summary for methods and logcat doc
bug:
29123084
Change-Id: Ida1351ca3647faa133905c5ff85df716bffd3203
Lucas Dupin [Wed, 28 Jun 2017 23:00:39 +0000 (16:00 -0700)]
Revert "Replaced overlay target package"
This reverts commit
ae885416dddd684fab2369fde234dc9e48db5051.
Lucas Dupin [Wed, 28 Jun 2017 23:00:26 +0000 (16:00 -0700)]
Revert "Support dark text on Recents"
This reverts commit
512ce6c9b75ce7d3f4f70280a414ab8fb994e809.
John Reck [Wed, 28 Jun 2017 22:39:46 +0000 (22:39 +0000)]
Merge "Selectively disable filtering if estimated safe" into oc-dev
Evan Laird [Wed, 28 Jun 2017 22:00:02 +0000 (18:00 -0400)]
resolve merge conflicts of
91870d158748 to oc-dr1-dev
Test: mp sysuig; visual
Change-Id: Id329cd7f08667b29e8d430cff6576d8894cd9cf4
Jorim Jaggi [Wed, 28 Jun 2017 21:55:27 +0000 (21:55 +0000)]
Merge "Properly check for orientation mismatch" into oc-dev
Evan Laird [Wed, 28 Jun 2017 21:30:15 +0000 (21:30 +0000)]
Merge "Fix empty signal line thickness / color in status bar" into oc-dev
Charlie Wang [Wed, 28 Jun 2017 21:26:38 +0000 (21:26 +0000)]
Merge "Adding fields for time elapsed for headset device events." into oc-dr1-dev
Alison Cichowlas [Wed, 28 Jun 2017 21:23:49 +0000 (21:23 +0000)]
Merge "This import got lost in the merge. Restore to fix build." into oc-dr1-dev
Sundeep Ghuman [Wed, 21 Jun 2017 23:54:36 +0000 (16:54 -0700)]
Change TRON counters to reflect cl/
159755374
This updates to the newly defined TRON counters and futures proofs us
for new values. Prior to this change, introducing a new enum would throw
an IllegalArgumentException.
Bug: b/
35628911
Test: NA
Change-Id: I46662d53b31858396c9a5a6113b1166fba4dfc51
Phil Weaver [Wed, 28 Jun 2017 21:17:42 +0000 (21:17 +0000)]
Merge "Don't break key event stream when enabling a11y" into oc-dev
am:
bb8a7983ff
Change-Id: I0e796089c9768ddd8de1c371f0511d7967833e9d
Jason Monk [Wed, 28 Jun 2017 21:14:43 +0000 (21:14 +0000)]
Merge "NavBar: Don't reorient as much, its a waste of work" into oc-dr1-dev
Phil Weaver [Wed, 28 Jun 2017 21:09:03 +0000 (21:09 +0000)]
Merge "Don't break key event stream when enabling a11y" into oc-dev
Brad Ebinger [Wed, 28 Jun 2017 21:06:34 +0000 (21:06 +0000)]
Merge "IMS: Check for binderstate before calling endSession" into oc-dr1-dev
Alison Cichowlas [Wed, 28 Jun 2017 20:42:09 +0000 (16:42 -0400)]
This import got lost in the merge. Restore to fix build.
Test: built
Change-Id: Iba7e4449ed8ddfb535a45f087e3baf43b52a5f08
Brad Ebinger [Tue, 27 Jun 2017 17:08:55 +0000 (17:08 +0000)]
IMS: Check for binderstate before calling endSession
ImsRegistrationListenerProxy listener, which is registered
as part of ImsManager.open, is not cleared even after moving
feature state to NOT_AVAILABLE because end session
is never called.
Check for binder state instead of feature state READY before
calling end session. End session will be triggered after
moving feature state to NOT_AVAILABLE.
Notify Ims state change only for the supported feature state
change to clients.
Test: Manual
Bug:
62816014
Merged-In: Idfb6dfad51cca574c2ae25e2029ef7bdfe9d725b
Change-Id: Idfb6dfad51cca574c2ae25e2029ef7bdfe9d725b
(cherry picked from commit
913e11fcdfc9cbd7fd3eee1c94d1cb3fced37da9)
Mady Mellor [Wed, 7 Jun 2017 21:53:58 +0000 (14:53 -0700)]
Adjustments to PIP position while flinging
Rather than using a scroller, find the actual edge intercept
based on the trajectory of the fling.
This is done by finding the two points it could intersect with
and checking which point is 'closer' (i.e. would be hit first
by the PIP).
Bias towards using the intersection with the top / bottom edge
if the PIP is being flung along the side it's currently on.
Also increases the maximum time for the fling.
Bug:
35358634
Test: manual - fling PIP around screen while in landscape
and portrait
Change-Id: I26e943a5ddbc726ab86bc11e4271d4db034f3d47
Alison Cichowlas [Wed, 28 Jun 2017 20:08:21 +0000 (20:08 +0000)]
Merge "Disable failing RoundedCornersTest" into oc-dr1-dev
Andrii Kulian [Wed, 28 Jun 2017 19:56:33 +0000 (19:56 +0000)]
Merge "Restrict launching activities on virtual displays" into oc-dev
am:
b0c5d67bf1
Change-Id: Ic2361cab5ee66552f7d1714cfca0cc320c02ed30
Andrii Kulian [Wed, 28 Jun 2017 19:50:27 +0000 (19:50 +0000)]
Merge "Restrict launching activities on virtual displays" into oc-dev
Alison Cichowlas [Wed, 28 Jun 2017 19:12:50 +0000 (19:12 +0000)]
Merge "Revert "Hide power dialog when lockscreen comes and goes."" into oc-dr1-dev
Winson Chung [Wed, 28 Jun 2017 18:54:22 +0000 (11:54 -0700)]
Fixing black background when going back from assistant.
- When returning to a non-wallpaper task from the assistant, the
opaque animation background for the task-close animation was
drawing behind the assistant stack and occluding the fullscreen
task. The original change in ag/99642 no longer applies since
our task switcher has changed and we can remove this opaque
background.
Bug:
63072954
Test: Open fullscreen task, open assistant, hit back. Also ensure
that launching and closing new tasks don't result in additional
tasks being visible.
Change-Id: I3347a552b15d3cd5ed51f283b99e4caa5eb298a0
Alison Cichowlas [Wed, 28 Jun 2017 18:49:21 +0000 (14:49 -0400)]
Disable failing RoundedCornersTest
Bug:
63098063
Test: literally just test changes
Change-Id: Ibde220ccc049baa56f76c385543f97b241b4dc30
Jorim Jaggi [Wed, 28 Jun 2017 18:40:27 +0000 (14:40 -0400)]
Properly check for orientation mismatch
Previous check tested against the display, which is wrong. Now
we properly check against the configuration.
Test: go/wm-smoke
Test: Enter split screen, go home, launch app, go home, relaunch
app, ensure no splash screen shown
Test: Enter split screen with 2 apps, lock phone, unlock phone
Change-Id: I62d45b6d3e5aa91dcb5edffed4233a5fed7ac9aa
Fixes:
63075521
Lucas Dupin [Wed, 28 Jun 2017 18:34:28 +0000 (18:34 +0000)]
Merge changes from topic 'theme_overlay_sysui' into oc-dr1-dev
* changes:
Support dark text on Recents
Replaced overlay target package
Evan Laird [Wed, 28 Jun 2017 18:27:47 +0000 (14:27 -0400)]
Fix empty signal line thickness / color in status bar
Parameterize the line thickness to the height of the drawable. Also draw
the empty state as background signal instead of foreground.
Test: visual
Change-Id: I39a7ef3164b784008e3dba5284b7fe83e4666607
Fixes:
63097113
John Reck [Wed, 28 Jun 2017 18:08:07 +0000 (11:08 -0700)]
Selectively disable filtering if estimated safe
If the output matches the source rect then use
GL_NEAREST instead of GL_FILTER. This is a more
pixel-exact capture.
Bug:
38242146
Test: CtsUiRendering & CtsViewTestCases:.PixelCopyTest passes on fugu
Change-Id: I9f57a4124374568f83d45fdc8f83cc767ded888a
Mady Mellor [Wed, 28 Jun 2017 18:10:07 +0000 (18:10 +0000)]
If the menu hasn't been created yet don't do things with it
am:
104be2e019
Change-Id: I6bf4197736f6a6c6760ac091a2ca71402e44dec8
Winson Chung [Wed, 28 Jun 2017 18:05:49 +0000 (11:05 -0700)]
Updating dismiss button icon to be rounded.
Bug:
63096732
Test: Open recents, wait for dismiss icons to show, observe roundness
Change-Id: I954efd4b68e8f80f112ba813528f4afff120b8d8
Jason Monk [Wed, 28 Jun 2017 18:03:24 +0000 (18:03 +0000)]
Merge "Shrink the nav buttons some" into oc-dr1-dev
Jason Monk [Wed, 28 Jun 2017 18:01:17 +0000 (18:01 +0000)]
Merge "Enable "Reboot to safe mode" confirmation on GlobalActions" into oc-dr1-dev
Eugene Susla [Wed, 28 Jun 2017 17:58:46 +0000 (10:58 -0700)]
[Companion] Dont crash if started with bluetooth off
Bug:
63068644
Test: Turn BT off, and ensure the attached bud doesn't reproduce
Change-Id: I0de5ba6d28d7195dd3ebc7a3af36f057c762de60
Lei Yu [Wed, 28 Jun 2017 17:55:04 +0000 (17:55 +0000)]
Merge "Add API to RuntimePermissionPresenter" into oc-dr1-dev
Phil Weaver [Wed, 28 Jun 2017 16:46:32 +0000 (09:46 -0700)]
Don't break key event stream when enabling a11y
Bug:
62862624
Test: Enable magnification, then enable TalkBack with the
a11y shortcut. Verify that volume keys work.
A11y service CTS, a11y units tests.
Change-Id: I729ab17d24f758b5ce534ffde43d2126a1f9536c
Jeff Davidson [Wed, 28 Jun 2017 17:23:49 +0000 (17:23 +0000)]
Merge "Add EuiccManager#retainSubscriptionsOnFactoryReset API." into oc-dr1-dev
Steven Moreland [Wed, 28 Jun 2017 17:21:00 +0000 (10:21 -0700)]
hidl getService throw correct exceptions.
NoSuchElementException needs to be thrown when getService is
called and the service is not available.
Test: hidl_test_java
Bug:
63087967
Change-Id: I207098cfb732e888f91704f623e888e72e6ce7d9
Jason Monk [Wed, 28 Jun 2017 17:18:33 +0000 (13:18 -0400)]
NavBar: Don't reorient as much, its a waste of work
Test: runtest systemui
Change-Id: Iea9955fb48bc7f2a3da772af34109d972e11e7d7
Fixes:
62620242
Alison Cichowlas [Wed, 28 Jun 2017 14:58:05 +0000 (14:58 +0000)]
Revert "Hide power dialog when lockscreen comes and goes."
This reverts commit
0a2026430e789d5a7ddd837d6091b26bb190ac69.
Bug:
63092414,
37434614
Change-Id: I6b3e190b5107e0516ade0c93b586dfbdde00c9c1
Andrii Kulian [Wed, 28 Jun 2017 16:42:48 +0000 (09:42 -0700)]
Restrict launching activities on virtual displays
If an app creates a Surface and a virtual display backed by that
Surface, it can then launch activities and hijack their content.
This CL restrict activities that can be launched to virtual displays
created by apps only to those who set "allowEmbedded" attribute.
If a virtual display was created by system, apps won't get access to
the surface, so we're not limiting in this case.
Bug:
63094482
Test: android.server.cts.ActivityManagerDisplayTests
Test: #testLaunchNotEmbeddedOnVirtualDisplay
Change-Id: Ied216bdf33df4b5a6cc8cac0e006a4883a36f94f
Ying Xu [Wed, 28 Jun 2017 16:47:50 +0000 (16:47 +0000)]
Merge "Use Bundle for inter-process message" into oc-dr1-dev
Mady Mellor [Wed, 21 Jun 2017 00:18:53 +0000 (17:18 -0700)]
If the menu hasn't been created yet don't do things with it
Test: runtest systemui
Fixes:
62594598
Change-Id: I1050e2b2bf1ece960d19ad13cb6a9bf71512db57
(cherry picked from commit
0b3f004acbb0eef38ee5e8d920e934f7ab2f7cde)
Shunta Sato [Fri, 14 Apr 2017 07:01:54 +0000 (16:01 +0900)]
Enable "Reboot to safe mode" confirmation on GlobalActions
Android N or prior GlobalActions showed "Reboot to safe mode",
when user do long-press of "power off" button on GlobalActions.
Currently, no confirmation dialog is shown. It's not user friendly.
This commit make it enable again.
- Also dismiss global actions on long press.
Test: manual
Bug:
37333890
Change-Id: I3bfefff3cd34ba35b003281e94a4181cebb74fcf
TreeHugger Robot [Wed, 28 Jun 2017 15:27:02 +0000 (15:27 +0000)]
Merge "AOD: Proximity check doze triggers" into oc-dr1-dev
Bill Yi [Wed, 28 Jun 2017 15:21:46 +0000 (15:21 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
f36a995424 -s ours
Change-Id: Icf392e8e462ed9bb42b9b8b67850ab702078e559
TreeHugger Robot [Wed, 28 Jun 2017 15:11:54 +0000 (15:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Jason Monk [Wed, 28 Jun 2017 14:45:13 +0000 (10:45 -0400)]
Shrink the nav buttons some
Test: visual
Bug:
37115488
Change-Id: Ie013f1644ac9782c10000dc4e4019d99c91680f8
TreeHugger Robot [Wed, 28 Jun 2017 14:30:47 +0000 (14:30 +0000)]
Merge changes I66f2c52b,I95f72c9d into oc-dr1-dev
* changes:
Fixed the accessibility of the reply button
Avoiding weird icon positions
Jason Monk [Wed, 28 Jun 2017 13:37:51 +0000 (13:37 +0000)]
Merge "Add system to avoid a crash stopping tests from running" into oc-dr1-dev
Jason Monk [Wed, 28 Jun 2017 13:26:42 +0000 (13:26 +0000)]
Merge "Fix a11y volume not always being shown" into oc-dr1-dev
Jason Monk [Wed, 28 Jun 2017 13:15:54 +0000 (13:15 +0000)]
Merge "Add plugin to swap out recents" into oc-dr1-dev
TreeHugger Robot [Wed, 28 Jun 2017 13:06:58 +0000 (13:06 +0000)]
Merge "Limit when a ranking reconsidering can alert" into oc-dr1-dev
Selim Cinek [Wed, 28 Jun 2017 12:17:22 +0000 (14:17 +0200)]
Fixed the accessibility of the reply button
The new button didn't have a content description before
and could therefore not be read.
Change-Id: I66f2c52b50494f7347d5beebc44c7d4fecfd33b2
Fixes:
62639422
Test: manual add reply notification, observe talkback
Selim Cinek [Fri, 9 Jun 2017 02:11:50 +0000 (19:11 -0700)]
Avoiding weird icon positions
When expanding quickly we switch to a linear interpolation.
In this case the last icon may be stuck in between the
shelf position and the notification position, which looks pretty bad.
We therefore optimize this case better to avoid these weird
in-between cases.
Test: manual, expand with various notifications
Fixes:
63088105
Fixes:
62374617
Change-Id: I95f72c9defc6c941a5a6a71829d239529c3861e9
TreeHugger Robot [Wed, 28 Jun 2017 05:11:28 +0000 (05:11 +0000)]
Merge "Radio Interface changes to pass the encryption object, including the key,to the modem." into oc-dr1-dev
Jean-Michel Trivi [Wed, 28 Jun 2017 03:16:51 +0000 (03:16 +0000)]
Merge "AudioService: internal API for disabling audio playback for a UID" into oc-dr1-dev
Lucas Dupin [Wed, 28 Jun 2017 01:17:40 +0000 (18:17 -0700)]
Support dark text on Recents
Test: visual. Set light and dark wallpapers
Change-Id: I100c7d6dac066168636b1741ed1ed7fc309988ef
Fixes:
63080632
Lucas Dupin [Wed, 28 Jun 2017 00:02:02 +0000 (17:02 -0700)]
Replaced overlay target package
Changing from android to com.android.systemui
will keep it from showing up in the settings app.
Bug:
62346335
Bug:
62739503
Test: manual
Change-Id: Ie8864d4508f229f83aec58380136549f3e4fb759
Jean-Michel Trivi [Tue, 27 Jun 2017 02:32:38 +0000 (19:32 -0700)]
AudioService: internal API for disabling audio playback for a UID
Internal API, available through AudioManagerInternal, to flag
a UID as having lost the ability to play audio. When that
happens, all players associated with this UID are paused, and
future players are immediately paused when they report they
started.
Users of this API must "enable" a previously banned UID when
it is no longer in use.
Test: upcoming manual test with background apps
Bug:
34471029
Change-Id: Ic1c103aabe8f3897072b3ce938d84cb949540e23
pkanwar [Mon, 22 May 2017 22:23:38 +0000 (15:23 -0700)]
Radio Interface changes to pass the encryption object, including the
key,to the modem.
We will now pass the ImsiEncryptionInfo object which includes mnc/mcc.
BUG:
35606429
Test: manual
(cherry picked from commit
6d50fec388cf382a1f0a4886fe5cea16280f5bdf)
Merged-In: Idf835d9b99a26cb0c0d73fb70ffa9875843ac62b
Change-Id: Idf835d9b99a26cb0c0d73fb70ffa9875843ac62b
TreeHugger Robot [Wed, 28 Jun 2017 00:27:36 +0000 (00:27 +0000)]
Merge "AOD: Pause sensors while proximity is covered" into oc-dr1-dev
TreeHugger Robot [Wed, 28 Jun 2017 00:16:23 +0000 (00:16 +0000)]
Merge "Update fingerprint haptic patterns" into oc-dr1-dev
TreeHugger Robot [Tue, 27 Jun 2017 22:49:55 +0000 (22:49 +0000)]
Merge "Update nav bar layout for universal grid" into oc-dr1-dev
Matthew Ng [Wed, 21 Jun 2017 23:16:24 +0000 (16:16 -0700)]
Fixes getting the wrong app transition going home after minimized (1/2)
This is a side affect from ag/
2125707. When minimizing and unminimizing
back to home would cause the same affect in the bug, where the app
transition is from activity to activity and not app. The issue was a
"updateAllDrawn" is normally called at the end of the surface
transaction and therefore removing this call (that would run inbetween
the transaction) should fix prematurely calculating the app transition
before setting the wallpaper target.
Fixes:
62727547
Test: go/wm-smoke
Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test
CtsServicesHostTestCases
android.server.cts.ActivityManagerDockedStackTests#
testMinimizeAndUnminimizeThenGoingHome
Change-Id: Ia658cd7111ede386579eb5cd38c88c9e4a1bd312
TreeHugger Robot [Tue, 27 Jun 2017 22:30:11 +0000 (22:30 +0000)]
Merge "Don't apply locale as part of deferred restore" into oc-dr1-dev
yinxu [Tue, 27 Jun 2017 21:05:17 +0000 (14:05 -0700)]
Use Bundle for inter-process message
The message sent from NetworkScanRequestTracker to TelephonyScanManager
might be across different process, so we have to wrap the List<CellInfo> into
Bundle because List<> is not parcelable.
Test: Telephony sanity tests
Bug:
30954762
Change-Id: I77945b247530b85c0b82876d528549498a711550
Christine Franks [Tue, 27 Jun 2017 21:52:12 +0000 (21:52 +0000)]
Merge "Blacklist Night display settings for testing" into oc-dr1-dev
Michal Karpinski [Tue, 27 Jun 2017 21:47:36 +0000 (21:47 +0000)]
Merge "Fix an NPE when cancelling full backup in BMS#endFullBackup()" into oc-dev
am:
0d1b1a253a
Change-Id: Idd633c178416ababe623f02327a830939ee769ba
Android Build Merger (Role) [Tue, 27 Jun 2017 21:43:42 +0000 (21:43 +0000)]
Merge "Merge "Use content type specified on the command line" into oc-dev am:
f89bf30312" into oc-dr1-dev
Todd Kennedy [Tue, 27 Jun 2017 21:42:07 +0000 (21:42 +0000)]
Merge "Use content type specified on the command line" into oc-dev
am:
f89bf30312
Change-Id: I2eafecfbf73333541a8b28726dc2af0a456443c0
TreeHugger Robot [Tue, 27 Jun 2017 21:40:53 +0000 (21:40 +0000)]
Merge "Set bolt and plus colors together" into oc-dr1-dev
Jason Monk [Fri, 21 Apr 2017 17:48:19 +0000 (13:48 -0400)]
Update nav bar layout for universal grid
Test: visual
Bug:
37115488
Change-Id: I43fe6648f56d25f41fadefcaa27d2c0cf3f077ba
Robert Carr [Tue, 27 Jun 2017 20:46:14 +0000 (13:46 -0700)]
Disable requestVisibleBehind.
As there is no caller for the SystemAPI convertToTranslucent, there is no situation
where requestVisibleBehind will actually result in the activity becoming
visible behind. However we have bugs in the requestVisibleBehind code-path,
so rather than fix them...it seems better to just prevent ourselves from
running in to them. Full deletion of the code-path is scheduled for post-O
branches.
Change-Id: I6e7c79e036986564d2d443a603e63c341de23057
Fixes:
62512584
Test: Repro from bug. go/wm-smoke.