OSDN Git Service
TreeHugger Robot [Wed, 9 Aug 2017 22:33:34 +0000 (22:33 +0000)]
Merge "Support copying from index8 into another index8." into oc-dr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 22:23:14 +0000 (22:23 +0000)]
Merge "WifiManager: update docs on setWifiEnabled" into oc-dr1-dev
Paul Mclean [Wed, 9 Aug 2017 21:59:55 +0000 (21:59 +0000)]
Merge "Update isWiredHeadsetOn() to support USB headsets." into oc-dr1-dev
Vinay Kalia [Wed, 9 Aug 2017 21:11:53 +0000 (21:11 +0000)]
Merge "Fix BLE scan leaks" into oc-dev
am:
6e749c392b
Change-Id: I35705a81a45d2c7fd48f021a5e0e93e1709c6876
TreeHugger Robot [Wed, 9 Aug 2017 21:03:15 +0000 (21:03 +0000)]
Merge "Worked around a bug where the a group child could be leaked" into oc-dr1-dev
Vinay Kalia [Wed, 9 Aug 2017 21:02:32 +0000 (21:02 +0000)]
Merge "Fix BLE scan leaks" into oc-dev
TreeHugger Robot [Wed, 9 Aug 2017 20:38:49 +0000 (20:38 +0000)]
Merge "Make rounded corners handle color inversion" into oc-dr1-dev
Bryce Lee [Wed, 9 Aug 2017 20:21:03 +0000 (20:21 +0000)]
Merge "Bring home to front behind assistant stack when needed." into oc-dr1-dev
Christine Franks [Wed, 9 Aug 2017 20:06:35 +0000 (20:06 +0000)]
Merge "Allow SMS and calling for demo users" into oc-dr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 19:28:49 +0000 (19:28 +0000)]
Merge "Add future consideration for USB rndis notification handling" into oc-dr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 19:24:16 +0000 (19:24 +0000)]
Merge "Fix race condition in binder thread" into oc-dr1-dev
Paul McLean [Fri, 4 Aug 2017 17:12:19 +0000 (11:12 -0600)]
Update isWiredHeadsetOn() to support USB headsets.
Bug:
64250808
Test: Manual from an App (UsbDescriptors app)
Change-Id: Ic979636025e871d69853a7460befce4e1b1a6ed8
Winson Chung [Wed, 9 Aug 2017 18:52:42 +0000 (18:52 +0000)]
Merge changes I52152223,I49db5cab into oc-dr1-dev
* changes:
Ensure that we register the media session listener for the current user.
Fix issue with PiP callbacks not being handled for secondary users.
Derek Sollenberger [Fri, 4 Aug 2017 18:13:57 +0000 (14:13 -0400)]
Support copying from index8 into another index8.
Both bitmap's must share the same color table as we essentially
memcopy the pixel data between the buffers.
Bug:
64112829
Test: CtsGraphicsTestCases
Merged-In: I317e3a814dbd102925fe412d2e19111b0af3af38
Change-Id: I5d99627fe7dd0639bb47a2eb8790510beebe6c6f
Zheng Zhang [Wed, 9 Aug 2017 18:24:15 +0000 (18:24 +0000)]
Catch (and ignore) any timeout exceptions when releasing WakeLock am:
9468b48565 -s ours am:
4542686e42
am:
c915b7f703
Change-Id: If08c8029ad5054f947ada0c5f4923f62761bf47c
Wei Wang [Wed, 9 Aug 2017 18:23:00 +0000 (18:23 +0000)]
Fix Wakelock underlock in GnssLocationProvider. am:
2ed0166808 -s ours am:
5d60709dc3
am:
17669d31df
Change-Id: I7e5b94c6adf57ff19c64fe508f7f3cc6d6a9c1c7
Zheng Zhang [Wed, 9 Aug 2017 18:09:48 +0000 (18:09 +0000)]
Catch (and ignore) any timeout exceptions when releasing WakeLock am:
9468b48565 -s ours
am:
4542686e42
Change-Id: Id140fee89f552999522f3116854761c14265ef04
Wei Wang [Wed, 9 Aug 2017 18:08:52 +0000 (18:08 +0000)]
Fix Wakelock underlock in GnssLocationProvider. am:
2ed0166808 -s ours
am:
5d60709dc3
Change-Id: I10a42eee839da98af9434d1f7530335dfa732632
Zheng Zhang [Wed, 9 Aug 2017 17:58:18 +0000 (17:58 +0000)]
Catch (and ignore) any timeout exceptions when releasing WakeLock
am:
9468b48565 -s ours
Change-Id: Ia1c10a46771ff4602a1005a3bf0bddaf6f1a70b6
Wei Wang [Wed, 9 Aug 2017 17:57:17 +0000 (17:57 +0000)]
Fix Wakelock underlock in GnssLocationProvider.
am:
2ed0166808 -s ours
Change-Id: I965a5b57ffbc2adcde3a83a95793a3dc29673641
Selim Cinek [Tue, 8 Aug 2017 17:58:32 +0000 (10:58 -0700)]
Worked around a bug where the a group child could be leaked
It may happen that a group entry could be leaked, if an
entry is inserted again after it was removed. We now added
logging to detect it better and worked around the issue.
Change-Id: Iaa6dfedddf5bafe0697bd0411b2e5f24982b1160
Fixes:
63717947
Test: add groups and remove / hun children
TreeHugger Robot [Wed, 9 Aug 2017 17:43:58 +0000 (17:43 +0000)]
Merge "Grant default ringtone picker storage permissions" into oc-dr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 17:31:48 +0000 (17:31 +0000)]
Merge "Inherit theme dark/light scheme for MediaRouter dialogs/button" into oc-dr1-dev
Christine Franks [Wed, 9 Aug 2017 17:06:43 +0000 (10:06 -0700)]
Allow SMS and calling for demo users
Bug:
62712426
Test: manual - restrictions are unset in demo mode
Change-Id: I151fbfb8222e768403a7e5ba1fcf868ba35a1f22
Lucas Dupin [Wed, 9 Aug 2017 16:58:44 +0000 (16:58 +0000)]
Merge "Fix issue where keyguard wouldn't be dismissed" into oc-dr1-dev
Adrian Roos [Wed, 9 Aug 2017 16:47:19 +0000 (16:47 +0000)]
Merge "AOD: Fix janky pulse out animation" into oc-dr1-dev
Rob Carr [Wed, 9 Aug 2017 16:45:24 +0000 (16:45 +0000)]
Merge "Ensure we leave the orientation changing state." into oc-dr1-dev
Winson Chung [Tue, 8 Aug 2017 19:58:11 +0000 (12:58 -0700)]
Ensure that we register the media session listener for the current user.
- Use the per-user calls when fetching/responding to media session events
otherwise it will fallback to using the process user.
Bug:
64315017
Test: Launch secondary user, enter PiP with media session and no custom
actions. Ensure the media session buttons show.
Change-Id: I52152223e91f0256ac4135616694e2a293947e3e
TreeHugger Robot [Wed, 9 Aug 2017 16:34:47 +0000 (16:34 +0000)]
Merge "LockIcon: update content description when config changes" into oc-dr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 16:22:29 +0000 (16:22 +0000)]
Merge "BrightnessMirror: When reinflating, notify QSPanel" into oc-dr1-dev
Jorim Jaggi [Wed, 9 Aug 2017 16:10:35 +0000 (16:10 +0000)]
Merge "Fix out-of-order transactions (1/2)" into oc-dr1-dev
Vinay Kalia [Fri, 28 Jul 2017 22:09:57 +0000 (15:09 -0700)]
Fix BLE scan leaks
If an app starts multiple scans with same callback then
there is a collision in mLeScanClients hash map which
results in leaking first scan. This change fixes it by
not allowing the second scan with same callback.
BUG:
62389939
BUG:
38198694
Test: Tested applications which started multiple scans with
same callback.
Change-Id: I569069a40b6f8b4b8bb070731225e732c6b23ec8
(cherry picked from commit
9722971cb4a79e37165f636f9dd057707d2e620a)
TreeHugger Robot [Wed, 9 Aug 2017 15:59:32 +0000 (15:59 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Jason Monk [Wed, 9 Aug 2017 14:45:05 +0000 (10:45 -0400)]
Make rounded corners handle color inversion
Test: visual
Change-Id: I99284b9f24340a453d39aafe6937454892e1383d
Fixes:
64210958
TreeHugger Robot [Wed, 9 Aug 2017 14:13:15 +0000 (14:13 +0000)]
Merge "Update X, -, + icons in dnd panel" into oc-dr1-dev
Lucas Dupin [Tue, 8 Aug 2017 18:17:30 +0000 (14:17 -0400)]
Fix race condition in binder thread
Changing wallpapers too quickly could cause a race condition where
RemoteCallbackList#beginBroadcast would be called twice without
the corresponding call to end the broadcast.
Change-Id: I2e63df69ff4ffde76a0b91a2ad46f03d044d95b7
Test: Set breakpoint to pause thread and cause race condition.
Bug:
64391687
Adrian Roos [Wed, 9 Aug 2017 13:50:00 +0000 (15:50 +0200)]
LockIcon: update content description when config changes
Fixes a stale content description after a configuration change.
Change-Id: Ie666d405417ce47cc0fc550b79a948425565162d
Fixes:
64234917
Test: Change language, verify content description of lock icon is updated.
Adrian Roos [Wed, 9 Aug 2017 12:34:55 +0000 (14:34 +0200)]
BrightnessMirror: When reinflating, notify QSPanel
Fixes an issue where after reinflating the brightness mirror,
the QSPanel was not notified.
Change-Id: I3974f31c2d3c67b5a283b10690cb103ca13fff6a
Fixes:
64460731
Test: Change to white / black wallpaper (opposite of current); verify brightness slider works.
Jorim Jaggi [Tue, 8 Aug 2017 13:12:20 +0000 (15:12 +0200)]
Fix out-of-order transactions (1/2)
The following sequence of order may happen which cause wrong
surface positions:
- WA.animate updates surfaces properties to S
- WA.animate closes the surface transaction
- Since the previous animation transaction wasn't commited yet,
closeSurfaceTransaction blocks and updating the surface properties
on SF side is deferred.
- In the meantime, since we are not holding WM lock, we have
another thread updating surfaces properties to S'
- Closing the transaction in this thread completes immediately
because it's not a synchronous transaction or animation
transaction.
- After a frame has been processed S gets applied on SF side as
the other transaction is done waiting for the frame to complete.
The issue here is that properties are now set to S instead of S'.
Sad!
We originally started calling closeTransaction without the WM
lock being held because it lead to thread starvation (b/
38192114).
However, that fix has this big flaw as described above.
To fix this, we create an empty animation transaction before
updating the animation properties to simulate the back-pressuring
behavior of animation transactions without the WM lock being held.
If that transaction arrives out of order, it doesn't matter at all
because it is empty.
After that, we perform the animation udpate in a transaction that
is not marked as an animation transaction, and thus will not
block, which avoids the starvation issue.
Part of this change is also a change in SF to allow executing
empty animation transactions.
Test: go/wm-smoke
Test: Open VideoPlayer from VRCore, close it, observe no wrong
positiioning of surfaces.
Test: Inspect traces while animating. Ensure back pressuring still
works.
Change-Id: Ie545463e71e0d1bc73439d14381077a290d2f959
Fixes:
63905190
Bug:
38192114
TreeHugger Robot [Wed, 9 Aug 2017 10:17:09 +0000 (10:17 +0000)]
Merge "Mark profile password key as critical." into oc-dr1-dev
Pavel Grafov [Tue, 8 Aug 2017 15:53:32 +0000 (16:53 +0100)]
Mark profile password key as critical.
Currently it is erased when keystore for user 0 is cleared, e.g.
when the user clears data for Settings app.
Bug:
35929605
Bug:
64467610
Test: Manually cleared Settings data.
Test: Manually cleared credentials from Settings.
Change-Id: I7e8753a1bf53f5d68d4738a4eb84faa890f026cc
Merged-In: I7e8753a1bf53f5d68d4738a4eb84faa890f026cc
The Android Open Source Project [Wed, 9 Aug 2017 07:54:18 +0000 (00:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: I02e4b572c91641f5d61321bd3248081723ad65ab
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Christofer Ã…kersten [Mon, 7 Aug 2017 09:56:52 +0000 (18:56 +0900)]
Inherit theme dark/light scheme for MediaRouter dialogs/button
Bug:
64291950
Test: manual
Change-Id: I20694ce512a794a3c6574108b80dcfb4979b3b39
Merged-In: I20694ce512a794a3c6574108b80dcfb4979b3b39
Erik Kline [Wed, 9 Aug 2017 03:53:46 +0000 (20:53 -0700)]
Add future consideration for USB rndis notification handling
Test: builds
Bug:
63970368
Change-Id: Ic9ca133a44123f281bd4cfeac57d426346c2b76d
Erik Kline [Wed, 9 Aug 2017 03:43:31 +0000 (03:43 +0000)]
Merge "Always note the state of RNDIS from USB broadcasts." into oc-dr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 00:41:25 +0000 (00:41 +0000)]
Merge "Fix the inconsistency of action EUICC_FACTORY_RESET" into oc-dr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 00:28:50 +0000 (00:28 +0000)]
Merge "Set property that terminates boot anim in WMS instead of SF" into oc-dr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 00:00:27 +0000 (00:00 +0000)]
Merge "Make accessibilityInversionEnabled public" into oc-dr1-dev
Lucas Dupin [Tue, 8 Aug 2017 23:03:31 +0000 (23:03 +0000)]
Merge "User avatar didn't have enough contrast" into oc-dr1-dev
TreeHugger Robot [Tue, 8 Aug 2017 22:55:33 +0000 (22:55 +0000)]
Merge "Round animation progress for computing size for background" into oc-dr1-dev
TreeHugger Robot [Tue, 8 Aug 2017 22:46:50 +0000 (22:46 +0000)]
Merge "WifiMetrics: add histogram of connectable networks" into oc-dr1-dev
TreeHugger Robot [Tue, 8 Aug 2017 22:34:44 +0000 (22:34 +0000)]
Merge "Shutdown: Continue shutdown with BLE only mode" into oc-dr1-dev
Lucas Dupin [Tue, 8 Aug 2017 22:07:49 +0000 (18:07 -0400)]
Fix issue where keyguard wouldn't be dismissed
Keyguard wouldn't be dismissed when launching the emergency dialer
from lock screen or locked camera.
Test: Tap on 'emergency' from lock screen and camera.
Test: Unlock from lock screen and camera.
Change-Id: I5d2f0f5c6a982cf633bca19cbeb5065a9f68e355
Fixes:
64470717
Winson Chung [Mon, 7 Aug 2017 22:28:44 +0000 (15:28 -0700)]
Fix issue with PiP callbacks not being handled for secondary users.
- With ag/
1767862, we do not persist PiP across users, so there is no
need for additional logic in SystemUI to dedupe these calls. Since
PiP is managed in the primary user's SystemUI process, this logic
was prevening the relaunching of the activity.
Bug:
64316002
Test: Launch PiP from a secondary user, restart the activity and
ensure that it is brought to fullscreen.
Change-Id: I49db5cab9f0be7366390d1e36edcaf4d6b05717a
TreeHugger Robot [Tue, 8 Aug 2017 21:36:39 +0000 (21:36 +0000)]
Merge "Fade in rounded corners to avoid abrupt change" into oc-dr1-dev
TreeHugger Robot [Tue, 8 Aug 2017 21:23:27 +0000 (21:23 +0000)]
Merge "Refactor WifiTracker sStaleScanResults." into oc-dr1-dev
Andrew Sapperstein [Tue, 8 Aug 2017 02:09:41 +0000 (19:09 -0700)]
Make accessibilityInversionEnabled public
Need to use it in Settings.
Bug:
64256644
Test: existing
Change-Id: I9f9d2655e35ee2ad0dc9f9980cc9993f7b084025
Wei Wang [Mon, 7 Aug 2017 22:35:13 +0000 (15:35 -0700)]
Shutdown: Continue shutdown with BLE only mode
Bug:
64213593
Test: shutdown no timeout
Change-Id: I5007e7cfc00ab22fce3b6ef13bacbcc951197b9e
(cherry picked from commit
4d282544c3ebf5ade44d56963c23a474916e61ba)
Andrii Kulian [Tue, 8 Aug 2017 20:16:06 +0000 (20:16 +0000)]
Merge "Rotate only VR secondary display" into oc-dr1-dev
Evan Laird [Tue, 8 Aug 2017 20:04:27 +0000 (16:04 -0400)]
Update X, -, + icons in dnd panel
Include rounded assets for just those icons in the zen panel and the zen
footer in the volume rocker.
Test: visual (light/dark mode)
Change-Id: I6cafd5aa760e4944eadbe7f4ab83430776c0047e
Fixes: b/
64480541
Robert Carr [Tue, 8 Aug 2017 19:59:01 +0000 (12:59 -0700)]
Ensure we leave the orientation changing state.
During the screen rotation animation, we cover the screen in a static
snapshot. Since failing to exit this state is somewhat catastrophic
we have a timeout which is intended to be a catch call. The timeout
works by clearing the mOrientationChanging state of all windows
and then triggering a layout pass. Recently however we made changes
allowing the orientation changing state to persist past the mOrientationChanging
variable. In the bug, we see many notices of timed out draw reporting, but
somehow we still haven't left the orientation changing state
and the screenshot is still visible. I have to admit...this is sort of a guess
I don't understand why we never reported the configuration to the client...though
it seems probably some intracicies of visibility could be at play.
Bug:
64127238
Test: go/wm-smoke
Change-Id: I5dea9bad29e7cdb43aa5e8c9ece5b0a86a1c8a09
Andrii Kulian [Mon, 7 Aug 2017 22:53:44 +0000 (15:53 -0700)]
Round animation progress for computing size for background
Round background crop animation progress when it's less then
epsilon to match fullscreen size and eliminate a line of couple
pixels high bleeding through from an app underneath. This
happens when animating letterboxed app from recents and can
be visible at the end of animation below nav bar.
Bug:
63156733
Bug:
62893418
Test: go/wm-smoke
Test: Trigger animations to/from recents with different rotations.
Change-Id: Ia4e93c81eac93a886007d53da3a685a69d4cb4de
TreeHugger Robot [Tue, 8 Aug 2017 17:59:12 +0000 (17:59 +0000)]
Merge "DO NOT MERGE: Reduce re-ranking" into oc-dr1-dev
Felipe Leme [Tue, 8 Aug 2017 17:34:14 +0000 (17:34 +0000)]
Clarifies autofill lifecycle.
am:
744976e298
Change-Id: Ia1c9652ded5c5ea6af9dc7872f89bd776a58e6d4
Jason Monk [Tue, 8 Aug 2017 16:49:25 +0000 (16:49 +0000)]
Merge "Move shutdown UI to sysui (when possible)" into oc-dr1-dev
Sundeep Ghuman [Mon, 7 Aug 2017 18:21:38 +0000 (11:21 -0700)]
Refactor WifiTracker sStaleScanResults.
In ag/
2580164, in order to minimize changes, we used mutable static
state in WifiTracker to control cache eviction. This breaks a certain
flow in SetupWizard. This change reverts sStaleScanResults to an
instance member and then pipes the value into the AccessPoint update
call to control cache eviction instead of relying on error prone use of
mutable static state.
Bug:
63479352
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java
&&
runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java
Manual: See bug
Change-Id: Ia6d79c1904294da69841cbdf6eafbf42fa70f2d0
Merged-In: Ia6d79c1904294da69841cbdf6eafbf42fa70f2d0
TreeHugger Robot [Tue, 8 Aug 2017 16:08:48 +0000 (16:08 +0000)]
Merge "Always populate the ApplicationInfo object" into oc-dr1-dev
TreeHugger Robot [Tue, 8 Aug 2017 15:52:39 +0000 (15:52 +0000)]
Merge "NetworkStats: more robust subtraction for deltas" into oc-dr1-dev
Jason Monk [Tue, 8 Aug 2017 15:19:26 +0000 (11:19 -0400)]
Fade in rounded corners to avoid abrupt change
Test: visual
Change-Id: Ie19b732cc09b87f0d0387e249c772c9986ed0aaf
Fixes:
64384961
Jason Monk [Fri, 4 Aug 2017 17:39:17 +0000 (13:39 -0400)]
Move shutdown UI to sysui (when possible)
Test: click restart or power off in global actions
Change-Id: I0dc30a9772bbfb3cd3c3568f157e854fef87bf87
Fixes:
63576195
Fixes:
64125291
Kenny Guy [Tue, 8 Aug 2017 12:49:32 +0000 (12:49 +0000)]
Merge "Update colour to match toasts." into oc-dr1-dev
TreeHugger Robot [Tue, 8 Aug 2017 11:05:53 +0000 (11:05 +0000)]
Merge "AOD: Follow-up to I0fa53616db09be98d33ea7d06b38d8ff3037707f" into oc-dr1-dev
TreeHugger Robot [Tue, 8 Aug 2017 10:48:47 +0000 (10:48 +0000)]
Merge "ScrimController: Wait with clearing wakup animation until done" into oc-dr1-dev
TreeHugger Robot [Tue, 8 Aug 2017 08:57:16 +0000 (08:57 +0000)]
Merge "app link handling under restricted mobile data" into oc-dr1-dev
Erik Kline [Tue, 8 Aug 2017 01:11:22 +0000 (18:11 -0700)]
Always note the state of RNDIS from USB broadcasts.
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
63970368
Change-Id: I273edbe21fea586f1353ff378515401efc6bb15e
Bryce Lee [Mon, 7 Aug 2017 23:10:43 +0000 (16:10 -0700)]
Bring home to front behind assistant stack when needed.
It is possible to return to an assistant stack over stack other
than the home stack despite starting over it. This can happen when
the assistant activity launches an activity in another stack, such as
the fullscreen stack. We were previously assuming that the stack
underneath would stay static and therefore did not account for the
another stack coming on top.
This CL addresses the issue by recognizing when home was below the
assistant stack and ensures that it is brought forward before
bringing the assistant stack forward
Change-Id: Ia279785f57bd62d0083274b20deea252b43a341f
Fixes:
64231497
Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test CtsServicesHostTestCases android.server.cts.ActivityManagerAssistantStackTests#testTranslucentAssistantActivityStackVisibility
Test: go/wm-smoke
TreeHugger Robot [Tue, 8 Aug 2017 00:32:09 +0000 (00:32 +0000)]
Merge "Reset wait for transition state to false when recents goes invisible" into oc-dr1-dev
TreeHugger Robot [Tue, 8 Aug 2017 00:32:09 +0000 (00:32 +0000)]
Merge "Revert "Revert "Fixing occasional jump when launching certain apps from Recents.""" into oc-dr1-dev
Felipe Leme [Mon, 31 Jul 2017 18:34:14 +0000 (11:34 -0700)]
Clarifies autofill lifecycle.
Test: m update-api
Bug:
64125551
Bug:
64114048
Change-Id: I17c5bc2e2e64fa27e877301dbcb983ac8497209e
Hugo Benichi [Mon, 7 Aug 2017 06:47:35 +0000 (15:47 +0900)]
NetworkStats: more robust subtraction for deltas
This patch ensures that subtract() between two NetworkStats object will
return a delta with no negative entries in all cases.
When the stats delta contains some negative values, there are clamped to
0. Some logging is added when this happens.
This is what's expected by NetworkStatsHistory#recordData().
Bug:
64365917
Test: runtest frameworks-net
Change-Id: I16e97e73f600225f80e0ce517e80c07c6f399196
Justin Klaassen [Mon, 7 Aug 2017 22:26:00 +0000 (15:26 -0700)]
Grant default ringtone picker storage permissions
Bug:
64112806
Test: DefaultPermissionGrantPolicyTest#testDefaultGrants
Change-Id: Iad058464388f20ad6aefb9fdf3fc2b641fc39967
Zheng Zhang [Mon, 7 Aug 2017 20:51:23 +0000 (13:51 -0700)]
Catch (and ignore) any timeout exceptions when releasing WakeLock
Bug:
64424030
Change-Id: I4f1f71bc4f16d1485b360aec70c82818aa7510fb
Wei Wang [Tue, 2 May 2017 03:24:19 +0000 (20:24 -0700)]
Fix Wakelock underlock in GnssLocationProvider.
Added a separate wakelock for xtra download so it won't
interfer with any wakelocks.
Test: manual
Bug:
37545729
Change-Id: I0867166f03802d1ed133437bcd85b0062db69947
Andrii Kulian [Mon, 7 Aug 2017 22:07:22 +0000 (22:07 +0000)]
Merge "Add black frame behind app window" into oc-dr1-dev
yinxu [Mon, 7 Aug 2017 21:53:15 +0000 (14:53 -0700)]
Fix the inconsistency of action EUICC_FACTORY_RESET
This action "com.android.internal.action.EUICC_FACTORY_RESET" is
supposed to be set as "protected" in AndroidManifest.xml, but the
action in AndroidManifest.xml is
"com.android.server.action.WIPE_EUICC_DATA" by mistake.
Bug:
64264776
Test: E2E
Change-Id: I740af1f8062c0fd79c69398f3a2a72e1b3178860
TreeHugger Robot [Mon, 7 Aug 2017 18:27:57 +0000 (18:27 +0000)]
Merge "AOD: Fix shelf animating when it should not" into oc-dr1-dev
Matthew Ng [Wed, 2 Aug 2017 21:00:59 +0000 (14:00 -0700)]
Reset wait for transition state to false when recents goes invisible
From ag/
2572257, this change will ensure the transition wait flag to be
false when recents runs "onStop" or when it becomes invisible. This
should fix edge cases when a user goes from Recents to somewhere that
is not a fullscreen app (like home). Resetting the state should allow
users to use the recents button without getting blocked.
There is only two locations where the flag is set to true, when user
starts recents and when an app is started from recents. When a user goes
from recents to home with the recents button (when the phone gets into a
wierd state), then the flag is true but home does not reset the flag
because the old change expects a non-home app to start. Now whenever
recents is dismissed, the flag will be reset.
Fixes:
37277853
Bug:
64098508
Test: start recents with apps in it, go to guest account, start apps in
recents, go back to main account, unlock keyguard, press recents button
to dismiss recents (do not press home or back), it will go to home,
press recents again
Change-Id: I07c292d701a621685c836a4f6040864377f0a3dd
Andrii Kulian [Mon, 7 Aug 2017 18:22:50 +0000 (11:22 -0700)]
Rotate only VR secondary display
The rotation tracking and logic in PhoneWindowManager assumes
that there is only one display in the system, so we can't enable
rotation for all displays just yet. For now will update only
VR display.
Change-Id: Ia35b4e919155a043eae4e3e97bd15a583e9476e2
Fixes:
64393199
Test: android.server.cts.ActivityManagerDisplayTests
Test: #testRotationNotAffectingSecondaryScreen
TreeHugger Robot [Mon, 7 Aug 2017 17:34:44 +0000 (17:34 +0000)]
Merge "AAPT2: Disable locale domination for deduping" into oc-dr1-dev
Adrian Roos [Mon, 7 Aug 2017 17:32:45 +0000 (19:32 +0200)]
AOD: Follow-up to I0fa53616db09be98d33ea7d06b38d8ff3037707f
Address reviewer's requests on I0fa53616db09be98d33ea7d06b38d8ff3037707f.
Bug:
64287908
Test: make SystemUI
Change-Id: I804c9408742cc5bd1d69fd5fd8ad42074953b0f6
Ecco Park [Fri, 4 Aug 2017 23:21:59 +0000 (16:21 -0700)]
Location: adding NULL check for the LPP_PROFILE property
Bug:
35485906
Change-Id: I5e40be8ce0d3832f0e913bfe8fd9a38d87d0d28c
Signed-off-by: Ecco Park <eccopark@google.com>
Jonathan Basseri [Mon, 7 Aug 2017 16:18:52 +0000 (16:18 +0000)]
Merge "Move getNetworkCountryIso impl from TM to PIM." into oc-dr1-dev
Adrian Roos [Mon, 7 Aug 2017 14:55:46 +0000 (16:55 +0200)]
ScrimController: Wait with clearing wakup animation until done
Fixes an issue where if another animation was started during
the wakeupFromDoze animation, the scrim would flash white
because the original animation got canceled. Instead now wait
until the animation is actually completed, not just altered.
Change-Id: I7738ec838d77f78dde2c5810369c50b4fafaeb67
Fixes:
64412754
Test: Trigger assistant from AOD; verify there is no white flash.
Adrian Roos [Mon, 7 Aug 2017 13:52:26 +0000 (15:52 +0200)]
AOD: Fix shelf animating when it should not
Fixes an issue where the shelf would animate downwards when going to AOD.
The issue is that setDark gets called in updateIsKeyguard even though nothing changed,
yet it still re-requests the dark transition. Consequently, when the keyguard goes dark
later, the requested transition executes and moves the shelf downwards.
Change-Id: I8c590aeb4f330d8c3c1b51285d899d5f6db36323
Fixes:
64412244
Test: Double tap on notification on AOD2; press power; verify shelf does not move downwards
TreeHugger Robot [Mon, 7 Aug 2017 13:41:22 +0000 (13:41 +0000)]
Merge "AOD: Fix launching notifications from occluded AOD" into oc-dr1-dev
TreeHugger Robot [Mon, 7 Aug 2017 12:53:50 +0000 (12:53 +0000)]
Merge "AOD: Never show bouncer when dozing" into oc-dr1-dev
Jorim Jaggi [Mon, 7 Aug 2017 12:23:55 +0000 (12:23 +0000)]
Merge "Defer updating dim layers if layout is deferred" into oc-dr1-dev
Jorim Jaggi [Mon, 7 Aug 2017 12:17:35 +0000 (12:17 +0000)]
Merge "Fix light bar flickers" into oc-dr1-dev
TreeHugger Robot [Mon, 7 Aug 2017 10:54:02 +0000 (10:54 +0000)]
Merge "screencap: always exit with _exit()." into oc-dr1-dev
TreeHugger Robot [Mon, 7 Aug 2017 10:44:18 +0000 (10:44 +0000)]
Merge "Avoid entering orientation changing state when seamlessly rotating." into oc-dr1-dev