OSDN Git Service
Christopher Tate [Tue, 1 Aug 2017 01:59:13 +0000 (01:59 +0000)]
Merge "Persisted jobs versus incorrect boot-time RTC" into oc-mr1-dev
am:
d04d64c133
Change-Id: Iea1cf18398f137736b9f50494429e54eb18569d8
TreeHugger Robot [Tue, 1 Aug 2017 01:50:06 +0000 (01:50 +0000)]
Merge "Persisted jobs versus incorrect boot-time RTC" into oc-mr1-dev
Jeff Sharkey [Tue, 1 Aug 2017 01:47:58 +0000 (01:47 +0000)]
Merge "Update inferred policies from SubscriptionPlan." into oc-mr1-dev
am:
2aa79aa73d
Change-Id: I067325928a685305d6f53912bd401f9bbf624bea
Jeff Sharkey [Tue, 1 Aug 2017 01:38:09 +0000 (01:38 +0000)]
Merge "Update inferred policies from SubscriptionPlan." into oc-mr1-dev
Eric Schwarzenbach [Tue, 1 Aug 2017 01:10:38 +0000 (01:10 +0000)]
Merge "Add individual ScanResult speeds to verbose logging." into oc-mr1-dev
am:
402e44173d
Change-Id: I76a6b0552b8924746b2a28628b79c226002961ec
TreeHugger Robot [Tue, 1 Aug 2017 01:04:51 +0000 (01:04 +0000)]
Merge "Add individual ScanResult speeds to verbose logging." into oc-mr1-dev
Android Build Merger (Role) [Tue, 1 Aug 2017 00:52:37 +0000 (00:52 +0000)]
Merge "Merge changes from topic 'am-
6a441a334fc44df4b5ce76e9c455027d' into oc-mr1-dev am:
1680e5a56e" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 1 Aug 2017 00:50:50 +0000 (00:50 +0000)]
Merge changes from topic 'am-
6888cf31d8e14dab98bec7df0b9168c6' into oc-mr1-dev-plus-aosp
* changes:
Merge "Show error code in WFC error notification." into oc-dr1-dev am:
d2063214a5 am:
3961ac3945
Merge "Remoe translations of values-mcc310-mnc260" into oc-dr1-dev am:
0891411cfd am:
2940beda60
Meng Wang [Tue, 1 Aug 2017 00:49:06 +0000 (00:49 +0000)]
Merge changes from topic 'am-
6a441a334fc44df4b5ce76e9c455027d' into oc-mr1-dev
am:
1680e5a56e
Change-Id: I4b9b530c0d6d4af7bb6f2f2a5277a311505d8045
Meng Wang [Tue, 1 Aug 2017 00:46:39 +0000 (00:46 +0000)]
Merge "Show error code in WFC error notification." into oc-dr1-dev am:
d2063214a5
am:
3961ac3945
Change-Id: Ia824cceb7ac0bdb00e435d01b1246fafb062615f
Meng Wang [Tue, 1 Aug 2017 00:45:41 +0000 (00:45 +0000)]
Merge "Remoe translations of values-mcc310-mnc260" into oc-dr1-dev am:
0891411cfd
am:
2940beda60
Change-Id: Ieeb3c842c8e105e5fc8b43578e18f57c32e7042a
Fyodor Kupolov [Tue, 1 Aug 2017 00:45:33 +0000 (00:45 +0000)]
Merge "List column names in the error message" into oc-mr1-dev
am:
2729912a35
Change-Id: Ia477660fdee2f94f042d0c3d463481ee550abd56
Android Build Merger (Role) [Tue, 1 Aug 2017 00:41:28 +0000 (00:41 +0000)]
Merge changes from topic 'am-
6a441a334fc44df4b5ce76e9c455027d' into oc-mr1-dev
* changes:
Merge "Show error code in WFC error notification." into oc-dr1-dev am:
d2063214a5
Merge "Remoe translations of values-mcc310-mnc260" into oc-dr1-dev am:
0891411cfd
Meng Wang [Tue, 1 Aug 2017 00:36:58 +0000 (00:36 +0000)]
Merge "Show error code in WFC error notification." into oc-dr1-dev
am:
d2063214a5
Change-Id: I7c1980af1c877c7b3b4500daccb1226876c7e5bf
Meng Wang [Tue, 1 Aug 2017 00:36:56 +0000 (00:36 +0000)]
Merge "Show error code in WFC error notification." into oc-dr1-dev
am:
d2063214a5
Change-Id: Id6679935220de109c9d891431696fc3354a021fd
TreeHugger Robot [Tue, 1 Aug 2017 00:36:49 +0000 (00:36 +0000)]
Merge "List column names in the error message" into oc-mr1-dev
Meng Wang [Tue, 1 Aug 2017 00:35:45 +0000 (00:35 +0000)]
Merge "Remoe translations of values-mcc310-mnc260" into oc-dr1-dev
am:
0891411cfd
Change-Id: I305e747d63fcefd02323058831064fc39c7a2ebb
Meng Wang [Tue, 1 Aug 2017 00:35:42 +0000 (00:35 +0000)]
Merge "Remoe translations of values-mcc310-mnc260" into oc-dr1-dev
am:
0891411cfd
Change-Id: Id6972effd7feae66bdc7d53be08c832c14cc2d90
Meng Wang [Tue, 1 Aug 2017 00:28:12 +0000 (00:28 +0000)]
Merge "Show error code in WFC error notification." into oc-dr1-dev
Meng Wang [Tue, 1 Aug 2017 00:28:12 +0000 (00:28 +0000)]
Merge "Remoe translations of values-mcc310-mnc260" into oc-dr1-dev
Fyodor Kupolov [Tue, 1 Aug 2017 00:06:04 +0000 (00:06 +0000)]
Merge "Added setIdleConnectionTimeout method" into oc-mr1-dev
am:
82f289a4b4
Change-Id: I31aaefcd59a0947532c84ccf07c828c4060c303e
Fyodor Kupolov [Mon, 31 Jul 2017 23:56:02 +0000 (23:56 +0000)]
Merge "Added setIdleConnectionTimeout method" into oc-mr1-dev
Christopher Tate [Wed, 26 Jul 2017 21:27:38 +0000 (14:27 -0700)]
Persisted jobs versus incorrect boot-time RTC
Devices routinely boot in a state where the RTC is wildly incorrect
in the past (2009, 1999, or even at Unix epoch zero). When we have
persistent jobs to be scheduled at boot, this presents a problem: when
should those jobs run, given that our idea of "now" is incorrect?
The previous implementation fell back to rescheduling these jobs
"from scratch" in this situation, as though they were newly-introduced,
but this turns out to have some emergent pathologies when the jobs
were intended to become runnable after long initial delays: the
rescheduling behavior could wind up starving jobs out entirely,
never running them regardless of how much real uptime the device
had, given the "wrong" pattern of reboots.
We now preserve the original nominal schedule, but recognize when we
have booted in a pathological situation, and correct the schedule for
these jobs when the system clock becomes sensible.
Bug
63817592
Test: JobScheduler test suite plus manual bogus-boot-time repro
Change-Id: Ia36fc5298b68db74e4e07e973b68e68e66206b43
Jeff Sharkey [Sun, 30 Jul 2017 22:52:51 +0000 (16:52 -0600)]
Update inferred policies from SubscriptionPlan.
When creating or updating inferred network policies, consult any
SubscriptionPlan information first, then fallback to CarrierService
values, before finally falling back to system defaults.
Dump known SubscriptionPlan values in dumpsys output for debugging.
Fix bug where updateNetworkRulesNL() tried calculating cycles when
non existed.
Test: builds, boots, subscription plans update
Test: bit FrameworksServicesTests:com.android.server.NetworkPolicyManagerServiceTest
Bug:
63925474,
64124815
Change-Id: I12257cada14f72890d5346e366643aac88de278e
Eric Schwarzenbach [Tue, 25 Jul 2017 21:32:21 +0000 (14:32 -0700)]
Add individual ScanResult speeds to verbose logging.
Moves the individual ScanResult summary string generation out of
getVisibilityStatus into its own method `verboseScanResultSummary`,
to reduce duplication and to enable testing the per-ScanResult speed labeling.
Bug:
63866500
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java
Change-Id: I9583d142a7d50314017154703df4e1ce69fc68aa
Android Build Merger (Role) [Mon, 31 Jul 2017 22:46:17 +0000 (22:46 +0000)]
Merge "Merge "Camera2: Release input surface on capture session close" into oc-dr1-dev am:
06802167e5 am:
6f1422711b" into oc-mr1-dev-plus-aosp
Eino-Ville Talvala [Mon, 31 Jul 2017 22:43:30 +0000 (22:43 +0000)]
Merge "Camera2: Release input surface on capture session close" into oc-dr1-dev am:
06802167e5
am:
6f1422711b
Change-Id: I4ef1d06c0151ad62ddd3be3152c4d92f15879a87
Eino-Ville Talvala [Mon, 31 Jul 2017 22:40:50 +0000 (22:40 +0000)]
Merge "Camera2: Release input surface on capture session close" into oc-dr1-dev am:
06802167e5
am:
102e9a7e3b
Change-Id: I2f2ebf1df3ba3a9f6e8a7daf654d118580a96a1d
Adam Lesinski [Mon, 31 Jul 2017 22:32:13 +0000 (22:32 +0000)]
Merge "Remove extraneous invalidate call that unregisters AssetManagers" into oc-dr1-dev am:
defdb1fd70
am:
630faa085a
Change-Id: I6df3097ef7e88308eefd8d55ee793f88b07365d2
Eino-Ville Talvala [Mon, 31 Jul 2017 22:30:01 +0000 (22:30 +0000)]
Merge "Camera2: Release input surface on capture session close" into oc-dr1-dev
am:
06802167e5
Change-Id: I3370a3c8853d171b29856d2a94e7121e6a5ad1b5
Eino-Ville Talvala [Mon, 31 Jul 2017 22:30:01 +0000 (22:30 +0000)]
Merge "Camera2: Release input surface on capture session close" into oc-dr1-dev
am:
06802167e5
Change-Id: Iedafc28d1a63b708b1992e4ef3570069c59d087a
Adam Lesinski [Mon, 31 Jul 2017 22:23:54 +0000 (22:23 +0000)]
Merge "Remove extraneous invalidate call that unregisters AssetManagers" into oc-dr1-dev am:
defdb1fd70
am:
80454c2c88
Change-Id: I33ffcecebec53c73a52ab7b4b17808e076784087
Eino-Ville Talvala [Mon, 31 Jul 2017 22:21:40 +0000 (22:21 +0000)]
Merge "Camera2: Release input surface on capture session close" into oc-dr1-dev
Adam Lesinski [Mon, 31 Jul 2017 22:17:27 +0000 (22:17 +0000)]
Merge "Remove extraneous invalidate call that unregisters AssetManagers" into oc-dr1-dev
am:
defdb1fd70
Change-Id: I6878ca92b2bd8b2e9569147dde007ae657adc87c
Adam Lesinski [Mon, 31 Jul 2017 22:17:26 +0000 (22:17 +0000)]
Merge "Remove extraneous invalidate call that unregisters AssetManagers" into oc-dr1-dev
am:
defdb1fd70
Change-Id: I16587768d92201f8d4d083b70ae972cca47e8b5c
Adam Lesinski [Mon, 31 Jul 2017 22:08:30 +0000 (22:08 +0000)]
Merge "Remove extraneous invalidate call that unregisters AssetManagers" into oc-dr1-dev
Android Build Merger (Role) [Mon, 31 Jul 2017 21:57:52 +0000 (21:57 +0000)]
Merge "Merge "When exiting persistent vr, we should exit overall vr mode." into oc-dr1-dev am:
34b2389fcf am:
9a554952db" into oc-mr1-dev-plus-aosp
Alex Sakhartchouk [Mon, 31 Jul 2017 21:55:06 +0000 (21:55 +0000)]
Merge "When exiting persistent vr, we should exit overall vr mode." into oc-dr1-dev am:
34b2389fcf
am:
9a554952db
Change-Id: I16154593751dd03131b23b36be8a657ccc10836a
Alex Sakhartchouk [Mon, 31 Jul 2017 21:54:56 +0000 (21:54 +0000)]
Merge "When exiting persistent vr, we should exit overall vr mode." into oc-dr1-dev am:
34b2389fcf
am:
73b51ac40d
Change-Id: I28b032a3417b3378607ded4e1715a08480fd045b
Alex Sakhartchouk [Mon, 31 Jul 2017 21:48:28 +0000 (21:48 +0000)]
Merge "When exiting persistent vr, we should exit overall vr mode." into oc-dr1-dev
am:
34b2389fcf
Change-Id: I90669fbeed47a0f75e4f113a155cd54ab681a3c8
Alex Sakhartchouk [Mon, 31 Jul 2017 21:48:24 +0000 (21:48 +0000)]
Merge "When exiting persistent vr, we should exit overall vr mode." into oc-dr1-dev
am:
34b2389fcf
Change-Id: Idfba4f8c58f302f40de4826f034914f430ab3382
TreeHugger Robot [Mon, 31 Jul 2017 21:43:44 +0000 (21:43 +0000)]
Merge "When exiting persistent vr, we should exit overall vr mode." into oc-dr1-dev
Android Build Merger (Role) [Mon, 31 Jul 2017 19:17:09 +0000 (19:17 +0000)]
Merge "Merge "Reintroduce the contract for random token to be non-negative" into oc-dr1-dev am:
810c312a29 am:
86271b573a" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Mon, 31 Jul 2017 19:16:50 +0000 (19:16 +0000)]
Merge "Merge "Reintroduce the contract for random token to be non-negative" into oc-dr1-dev am:
810c312a29 am:
c2e30cd5c9" into oc-mr1-dev-plus-aosp
Michal Karpinski [Mon, 31 Jul 2017 19:15:07 +0000 (19:15 +0000)]
Merge "Reintroduce the contract for random token to be non-negative" into oc-dr1-dev am:
810c312a29
am:
86271b573a
Change-Id: I9cccc07b88de19535c63ee623430481553a56657
Michal Karpinski [Mon, 31 Jul 2017 19:14:16 +0000 (19:14 +0000)]
Merge "Reintroduce the contract for random token to be non-negative" into oc-dr1-dev am:
810c312a29
am:
c2e30cd5c9
Change-Id: If613847830b9fc820838e685ba2e57dadaae0765
Android Build Merger (Role) [Mon, 31 Jul 2017 19:13:22 +0000 (19:13 +0000)]
Merge "Merge "Allow foreground AppWindowToken to influence orientation." into oc-dr1-dev am:
1fd7497f02 am:
c71e73863e" into oc-mr1-dev-plus-aosp
Bryce Lee [Mon, 31 Jul 2017 19:11:28 +0000 (19:11 +0000)]
Merge "Allow foreground AppWindowToken to influence orientation." into oc-dr1-dev am:
1fd7497f02
am:
c71e73863e
Change-Id: Ib21c402bef3a5a73ab0a4e4133bb45faeb2b23e8
Eugene Susla [Mon, 31 Jul 2017 19:10:40 +0000 (19:10 +0000)]
Merge "[Companion] Fix NPE due to looking up view btoo soon" into oc-mr1-dev
am:
978b8e1842
Change-Id: If3a550f694858d636e19b77a20837516f75a9545
Bryce Lee [Mon, 31 Jul 2017 19:07:16 +0000 (19:07 +0000)]
Merge "Allow foreground AppWindowToken to influence orientation." into oc-dr1-dev am:
1fd7497f02
am:
343d82adf6
Change-Id: Id708764483b96ff77e9de23e4dd64c365bcf60c5
Michal Karpinski [Mon, 31 Jul 2017 19:05:13 +0000 (19:05 +0000)]
Merge "Reintroduce the contract for random token to be non-negative" into oc-dr1-dev
am:
810c312a29
Change-Id: I4518f7a6317d3c01e37a47b19dee653ccff71502
Michal Karpinski [Mon, 31 Jul 2017 19:03:13 +0000 (19:03 +0000)]
Merge "Reintroduce the contract for random token to be non-negative" into oc-dr1-dev
am:
810c312a29
Change-Id: Ida86b2e9f68683c88db24bcbb16eaf14ce8f2d94
TreeHugger Robot [Mon, 31 Jul 2017 18:59:52 +0000 (18:59 +0000)]
Merge "[Companion] Fix NPE due to looking up view btoo soon" into oc-mr1-dev
Android Build Merger (Role) [Mon, 31 Jul 2017 18:56:43 +0000 (18:56 +0000)]
Merge "Merge "Do not call onConfigurationChanged for appBound position changes." into oc-dr1-dev am:
33d4702a12 am:
69aac0a7b6" into oc-mr1-dev-plus-aosp
Bryce Lee [Mon, 31 Jul 2017 18:55:39 +0000 (18:55 +0000)]
Merge "Allow foreground AppWindowToken to influence orientation." into oc-dr1-dev
am:
1fd7497f02
Change-Id: Ibc323f15a9a0bc6302ff105036964374c044b5e7
Bryce Lee [Mon, 31 Jul 2017 18:54:47 +0000 (18:54 +0000)]
Merge "Do not call onConfigurationChanged for appBound position changes." into oc-dr1-dev am:
33d4702a12
am:
69aac0a7b6
Change-Id: Iac240206ebe869cc4e9819a0222f858c11516830
Bryce Lee [Mon, 31 Jul 2017 18:53:39 +0000 (18:53 +0000)]
Merge "Do not call onConfigurationChanged for appBound position changes." into oc-dr1-dev am:
33d4702a12
am:
05865fb40a
Change-Id: Ia5817040ce14ee6dbd995bd83444f34e78bef375
TreeHugger Robot [Mon, 31 Jul 2017 18:51:17 +0000 (18:51 +0000)]
Merge "Reintroduce the contract for random token to be non-negative" into oc-dr1-dev
Bryce Lee [Mon, 31 Jul 2017 18:50:32 +0000 (18:50 +0000)]
Merge "Allow foreground AppWindowToken to influence orientation." into oc-dr1-dev
am:
1fd7497f02
Change-Id: Ibc6ea27ae4e813e3430ea75c8c26057f6bec2304
Bryce Lee [Mon, 31 Jul 2017 18:46:20 +0000 (18:46 +0000)]
Merge "Do not call onConfigurationChanged for appBound position changes." into oc-dr1-dev
am:
33d4702a12
Change-Id: I990a3554730cc07440c7d4bc0236e0aeb00e2980
Bryce Lee [Mon, 31 Jul 2017 18:45:19 +0000 (18:45 +0000)]
Merge "Do not call onConfigurationChanged for appBound position changes." into oc-dr1-dev
am:
33d4702a12
Change-Id: Id6748aab9ee83844303324ea397d4ac699fb5839
Seigo Nonaka [Mon, 31 Jul 2017 18:36:49 +0000 (18:36 +0000)]
Merge "Stop font loading with restricted context." into oc-mr1-dev
am:
06ba486a74
Change-Id: I0c668e01f9fe254b6bedace52d19bd7bcb5d5f1f
Bryce Lee [Mon, 31 Jul 2017 18:34:23 +0000 (18:34 +0000)]
Merge "Allow foreground AppWindowToken to influence orientation." into oc-dr1-dev
Bryce Lee [Mon, 31 Jul 2017 18:32:30 +0000 (18:32 +0000)]
Merge "Do not call onConfigurationChanged for appBound position changes." into oc-dr1-dev
TreeHugger Robot [Mon, 31 Jul 2017 18:23:04 +0000 (18:23 +0000)]
Merge "Stop font loading with restricted context." into oc-mr1-dev
Fyodor Kupolov [Tue, 25 Jul 2017 21:17:33 +0000 (14:17 -0700)]
Added setIdleConnectionTimeout method
It allows apps to set time SQLite connection is allowed to be idle
before it is closed and removed from the pool.
Test: manual + DatabaseGeneralTest
Bug:
63398887
Change-Id: Ie09eeb4dc2b9e52ba67d9355b1f9bd869b148613
Makoto Onuki [Mon, 31 Jul 2017 18:03:17 +0000 (18:03 +0000)]
Merge "Reduce duplicate strings due to the package cache." into oc-mr1-dev
am:
bb77e6c689
Change-Id: Ia47cf7d0832ef6ca99b4f4991c2e2624bdf03742
TreeHugger Robot [Mon, 31 Jul 2017 17:52:41 +0000 (17:52 +0000)]
Merge "Reduce duplicate strings due to the package cache." into oc-mr1-dev
Eino-Ville Talvala [Mon, 31 Jul 2017 16:57:15 +0000 (09:57 -0700)]
Camera2: Release input surface on capture session close
Per the documentation, the input surface of a reprocessable capture
session should be abandoned on the close of a session.
Actually implement this, to avoid unintentional leaks of buffers.
Test: Camera CTS passes
Bug:
38313948
Change-Id: Ia45c39ea925288a5082d6e722ff4b40c55971a37
Steven Moreland [Mon, 31 Jul 2017 17:00:59 +0000 (17:00 +0000)]
SurfaceTexture.cpp: use proper nativehelper headers am:
f53501098c am:
a3ca9caf46
am:
a862715976
Change-Id: I398296dcc973240a2f2da488b4058cee51240140
Android Build Merger (Role) [Mon, 31 Jul 2017 16:57:19 +0000 (16:57 +0000)]
Merge "Merge "WakeAndUnlock: Make sure blanking is never animated" into oc-dr1-dev am:
cbab3edc3e am:
0cd8a31c12" into oc-mr1-dev-plus-aosp
Steven Moreland [Mon, 31 Jul 2017 16:55:02 +0000 (16:55 +0000)]
SurfaceTexture.cpp: use proper nativehelper headers am:
f53501098c
am:
a3ca9caf46
Change-Id: I0049a5ffd8f24cd7d77506c5515216a4bf15b218
Adrian Roos [Mon, 31 Jul 2017 16:55:01 +0000 (16:55 +0000)]
Merge "WakeAndUnlock: Make sure blanking is never animated" into oc-dr1-dev am:
cbab3edc3e
am:
3bc413bca8
Change-Id: I07022fc1006f3e9470791cf4f51000315139f899
Adrian Roos [Mon, 31 Jul 2017 16:54:59 +0000 (16:54 +0000)]
Merge "WakeAndUnlock: Make sure blanking is never animated" into oc-dr1-dev am:
cbab3edc3e
am:
0cd8a31c12
Change-Id: Ifd3f36bb8ea399b77b06903cd9be589eee3d922a
Adrian Roos [Mon, 31 Jul 2017 16:48:44 +0000 (16:48 +0000)]
Merge "WakeAndUnlock: Make sure blanking is never animated" into oc-dr1-dev
am:
cbab3edc3e
Change-Id: I49d8dc5f8cdd470064c9450e6722a905a4d1b0ed
Adrian Roos [Mon, 31 Jul 2017 16:48:34 +0000 (16:48 +0000)]
Merge "WakeAndUnlock: Make sure blanking is never animated" into oc-dr1-dev
am:
cbab3edc3e
Change-Id: Ibd62f5942fd09e0c1ec846db0595c76d0ad822be
Steven Moreland [Mon, 31 Jul 2017 16:48:25 +0000 (16:48 +0000)]
SurfaceTexture.cpp: use proper nativehelper headers
am:
f53501098c
Change-Id: I2f4eb3fdbfe875d820e52136d8fb72b60e56b046
TreeHugger Robot [Mon, 31 Jul 2017 16:43:07 +0000 (16:43 +0000)]
Merge "WakeAndUnlock: Make sure blanking is never animated" into oc-dr1-dev
Steven Moreland [Fri, 28 Jul 2017 17:21:47 +0000 (10:21 -0700)]
SurfaceTexture.cpp: use proper nativehelper headers
libnativehelper exports headers under nativehelper. These were
available before incorrectly as global headers in order to give
access to jni.h.
Test: SurfaceTexture.cpp finds headers
Bug:
63762847
Change-Id: I3ec1b888c226c2894649d9f9a8f8203891c1ab02
(cherry picked from commit
849252c469396a759c394dc6382470a6a07d6587)
Bryce Lee [Fri, 28 Jul 2017 15:33:36 +0000 (08:33 -0700)]
Do not call onConfigurationChanged for appBound position changes.
Since appBounds encodes both dimensions and positions, movement will
cause a diff change. This happens in situations where the dimensions
stay constant, such as dragging a PiP window around.
To avoid flooding the client side with configuration changes, this CL
checks whether the new configuration is equivalent to the existing
configuration with the exception of the position of the appBounds
before sending to the registered callbacks.
Change-Id: I8fbc94458fd9ed3b39494c3587f25e704ec02a7d
Fixes:
63927944
Test: bit FrameworksServicesTests:com.android.server.wm.AppBoundsTests
Test: go/wm-smoke
Bryce Lee [Sat, 29 Jul 2017 03:48:43 +0000 (20:48 -0700)]
Allow foreground AppWindowToken to influence orientation.
It is possible for an activity to request an orientation after
finish has been called, causing the system orientation to be
re-evaluated. Since the activity is closing, it will no longer be
eligible to influence orientation. If another stack/task is brought
to the foreground, it will as well won't be able to participate
since it is not considered an opening app and won't be visible. As a
result, we set the orientation to unspecified, leading to the
foreground activity to be resumed in the wrong orientation.
This changelist addresses the issue by allowing an AppWindowToken to
participate in orientation calculations if it is not closing and is
on top of the wm hierarchy, regardless of its visibility.
Change-Id: I0f316d6d824398d084c7648cf2dc2c2d07b4410d
Fixes:
63982461
Fixes:
63513655
Test: bit FrameworksServicesTests:com.android.server.wm.AppWindowTokenTests#testGetOrientation
Test: go/wm-smoke
Selim Gurun [Mon, 31 Jul 2017 14:35:22 +0000 (14:35 +0000)]
Merge "Update documentation for Whitelist API" into oc-mr1-dev
am:
a30ec5ff4c
Change-Id: I28b1d260e9daf408a71494e054dba59954ef926b
Selim Gurun [Mon, 31 Jul 2017 14:27:52 +0000 (14:27 +0000)]
Merge "Update documentation for Whitelist API" into oc-mr1-dev
Adrian Roos [Mon, 31 Jul 2017 13:56:24 +0000 (15:56 +0200)]
WakeAndUnlock: Make sure blanking is never animated
Fixes an issue where instead of immediately blanking the screen upon
authenticating via fingerprint we animated to blank because another
animating transition was requested at the same time.
Change-Id: I141079c0d4de1776c8328057d364eeb0964eebaf
Fixes:
64080116
Test: Unlock via fingerprint a lot. Verify no flicker.
Neil Fuller [Mon, 31 Jul 2017 13:29:53 +0000 (13:29 +0000)]
Merge "Remove redundant TODOs from PackageTracker" am:
01d686b85e am:
b65356709e am:
452dcfce41
am:
9fadf818c6
Change-Id: I258b27a87297cae46218991df26f10f91ac5ae12
Neil Fuller [Mon, 31 Jul 2017 13:21:41 +0000 (13:21 +0000)]
Merge "Remove redundant TODOs from PackageTracker" am:
01d686b85e am:
b65356709e
am:
452dcfce41
Change-Id: I699962dee85ff318433004cd91f183c0630e3888
Neil Fuller [Mon, 31 Jul 2017 13:06:44 +0000 (13:06 +0000)]
Merge "Remove redundant TODOs from PackageTracker" am:
01d686b85e
am:
b65356709e
Change-Id: Icbc33207a154b566791210d6c6169235c139562a
Neil Fuller [Mon, 31 Jul 2017 13:00:50 +0000 (13:00 +0000)]
Merge "Remove redundant TODOs from PackageTracker"
am:
01d686b85e
Change-Id: If74fa1bcd6be188079de231e7903795ea7d0b5be
Neil Fuller [Mon, 31 Jul 2017 12:51:05 +0000 (12:51 +0000)]
Merge "Remove redundant TODOs from PackageTracker"
Android Build Merger (Role) [Mon, 31 Jul 2017 12:44:38 +0000 (12:44 +0000)]
Merge "Merge "AOD: When prox covered disable touch during pulse instead of aborting" into oc-dr1-dev am:
3cace2a148 am:
86e49f224c" into oc-mr1-dev-plus-aosp
Adrian Roos [Mon, 31 Jul 2017 12:42:17 +0000 (12:42 +0000)]
Merge "AOD: When prox covered disable touch during pulse instead of aborting" into oc-dr1-dev am:
3cace2a148
am:
86e49f224c
Change-Id: Id2ce270c16978b6856598cbc5a2342ca1def27f0
Adrian Roos [Mon, 31 Jul 2017 12:42:13 +0000 (12:42 +0000)]
Merge "AOD: When prox covered disable touch during pulse instead of aborting" into oc-dr1-dev am:
3cace2a148
am:
13b17b2990
Change-Id: Ib7e303b11b47096daf7216cd6dbd109a047733f9
Adrian Roos [Mon, 31 Jul 2017 12:36:21 +0000 (12:36 +0000)]
Merge "AOD: When prox covered disable touch during pulse instead of aborting" into oc-dr1-dev
am:
3cace2a148
Change-Id: Ia30c3884751a44392efb843a2da41a0528162fa2
Adrian Roos [Mon, 31 Jul 2017 12:36:20 +0000 (12:36 +0000)]
Merge "AOD: When prox covered disable touch during pulse instead of aborting" into oc-dr1-dev
am:
3cace2a148
Change-Id: I94e9f30fa3f56b56c140f834674d38b776c8ed21
Adrian Roos [Mon, 31 Jul 2017 12:29:44 +0000 (12:29 +0000)]
Merge "AOD: When prox covered disable touch during pulse instead of aborting" into oc-dr1-dev
Yohei Yukawa [Mon, 31 Jul 2017 07:15:26 +0000 (07:15 +0000)]
Merge "Remove a compat hack SurfaceView#setWindowType()" into oc-mr1-dev
am:
f678eaad89
Change-Id: I690e4fe17fcbceab3488c40dce2baec9cc97a3e7
TreeHugger Robot [Mon, 31 Jul 2017 07:08:08 +0000 (07:08 +0000)]
Merge "Remove a compat hack SurfaceView#setWindowType()" into oc-mr1-dev
Bill Yi [Mon, 31 Jul 2017 06:15:13 +0000 (06:15 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
273bb516ad -s ours
am:
b10ffae3cb -s ours
Change-Id: I32c733afa59e9ffc0116539a25600971f7fcecb9
Bill Yi [Mon, 31 Jul 2017 06:12:15 +0000 (06:12 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
273bb516ad -s ours
am:
9640d57039 -s ours
Change-Id: I41cdb883ff865fd88b607eb9f4ea5653866e1830
Bill Yi [Mon, 31 Jul 2017 06:06:17 +0000 (06:06 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
273bb516ad -s ours
Change-Id: I5b0b3e17d14a5d86a2b7296f385e947f30cd3332
OSDN Git Service
