OSDN Git Service
TreeHugger Robot [Fri, 15 Dec 2017 01:24:34 +0000 (01:24 +0000)]
Merge "Move task positioning tasks from WindowManagerService.mH"
TreeHugger Robot [Fri, 15 Dec 2017 00:46:24 +0000 (00:46 +0000)]
Merge "Don't allow certain bucket overrides"
TreeHugger Robot [Fri, 15 Dec 2017 00:33:31 +0000 (00:33 +0000)]
Merge "Restore bounds w/o adjusting it."
nharold [Thu, 14 Dec 2017 23:38:17 +0000 (23:38 +0000)]
Merge "Fix broken test due to API rename" am:
0abc93177f am:
ee898c81a7
am:
d569d33ac4
Change-Id: Ie52ce3da0507421313a73688e831d3802b888cfd
Tony Mak [Thu, 14 Dec 2017 23:29:33 +0000 (23:29 +0000)]
Merge "clearCallingIdentity before calling into getPackageUidAsUser"
nharold [Thu, 14 Dec 2017 23:28:16 +0000 (23:28 +0000)]
Merge "Fix broken test due to API rename" am:
0abc93177f
am:
ee898c81a7
Change-Id: I7e99991cd2c71c66e1acb3aa3957efb28c9a426a
nharold [Thu, 14 Dec 2017 23:20:11 +0000 (23:20 +0000)]
Merge "Fix broken test due to API rename"
am:
0abc93177f
Change-Id: I75a3f96e0d6d7cf05bbd8eb0dae03d114ac76f3e
Nathan Harold [Thu, 14 Dec 2017 23:14:57 +0000 (23:14 +0000)]
Merge "Fix broken test due to API rename"
Nathan Harold [Thu, 14 Dec 2017 22:46:46 +0000 (14:46 -0800)]
Fix broken test due to API rename
A race condition during an Api rename has caused
the name change from reserveSecurityParameterIndex
to allocateSecurityParameterIndex to be wrong in
a test. Fixing.
Bug:
69128142
Test: runtest frameworks-net
Change-Id: I12fb9832cb938dc19f463b1f1124127435d7b173
nharold [Thu, 14 Dec 2017 23:07:53 +0000 (23:07 +0000)]
Merge "Fix broken test due to API rename"
Nathan Harold [Thu, 14 Dec 2017 22:46:46 +0000 (14:46 -0800)]
Fix broken test due to API rename
A race condition during an Api rename has caused
the name change from reserveSecurityParameterIndex
to allocateSecurityParameterIndex to be wrong in
a test. Fixing.
Bug:
69128142
Test: runtest frameworks-net
Change-Id: I12fb9832cb938dc19f463b1f1124127435d7b173
Android Build Merger (Role) [Thu, 14 Dec 2017 22:58:07 +0000 (22:58 +0000)]
Merge "Merge "Confirmation code second try." am:
df0f5e9791 am:
cdc3c3ec77 am:
5ad2fbabf8 -s ours"
TreeHugger Robot [Thu, 14 Dec 2017 22:57:43 +0000 (22:57 +0000)]
Merge "Add more owners"
Holly Jiuyu Sun [Thu, 14 Dec 2017 22:56:38 +0000 (22:56 +0000)]
Merge "Confirmation code second try." am:
df0f5e9791 am:
cdc3c3ec77
am:
5ad2fbabf8 -s ours
Change-Id: I806e1dc1a2fa399db4578f6b5919dec70a313f7d
Dmitry Dementyev [Thu, 14 Dec 2017 22:50:44 +0000 (22:50 +0000)]
Merge "Add RecoverableKeyStoreLoader APIs."
Holly Jiuyu Sun [Thu, 14 Dec 2017 22:46:29 +0000 (22:46 +0000)]
Merge "Confirmation code second try." am:
df0f5e9791
am:
cdc3c3ec77
Change-Id: I4c0de71e0c488551f6d0fa5e1f73ca2971e4a5f6
Holly Jiuyu Sun [Thu, 14 Dec 2017 22:37:58 +0000 (22:37 +0000)]
Merge "Confirmation code second try."
am:
df0f5e9791
Change-Id: I426c5fcb2610cd1740fb9d6cd0a98a7bacfcb58a
Adam Lesinski [Thu, 14 Dec 2017 22:27:02 +0000 (22:27 +0000)]
Merge "AAPT2: Enable mangled symbol lookup in AssetManagerSymbolTable"
Holly Jiuyu Sun [Thu, 14 Dec 2017 22:25:37 +0000 (22:25 +0000)]
Merge "Confirmation code second try."
Robert Berry [Thu, 14 Dec 2017 22:00:21 +0000 (22:00 +0000)]
Merge "Add KeySyncUtils"
Tomasz Wasilczyk [Thu, 14 Dec 2017 21:57:14 +0000 (21:57 +0000)]
Merge changes from topic "radio-2.0"
* changes:
Move HAL 1.x related service to its own directory.
Initial implementation of HAL 2.0 counterpart for radio service.
Android Build Merger (Role) [Thu, 14 Dec 2017 21:50:52 +0000 (21:50 +0000)]
Merge "Merge "Use consistent naming for allocating SPI." am:
bf48afea49 am:
4753ed4b1b am:
f71c95dfe4"
Mady Mellor [Thu, 14 Dec 2017 21:48:59 +0000 (21:48 +0000)]
Merge "Adds hint summary to slice"
nharold [Thu, 14 Dec 2017 21:48:58 +0000 (21:48 +0000)]
Merge "Use consistent naming for allocating SPI." am:
bf48afea49 am:
4753ed4b1b
am:
f71c95dfe4
Change-Id: Ib6845ab0d7f385fbd1d59c0179771542e12c8be0
nharold [Thu, 14 Dec 2017 21:36:32 +0000 (21:36 +0000)]
Merge "Use consistent naming for allocating SPI." am:
bf48afea49
am:
4753ed4b1b
Change-Id: Ib5d89044313341790b1ee9271642072ddce181af
TreeHugger Robot [Thu, 14 Dec 2017 21:36:28 +0000 (21:36 +0000)]
Merge "Filter out position jitter in hover tooltip handling"
nharold [Thu, 14 Dec 2017 21:21:06 +0000 (21:21 +0000)]
Merge "Use consistent naming for allocating SPI."
am:
bf48afea49
Change-Id: I9adb5c14e91b33f09707c85c865cf2fc454f80ba
Todd Poynor [Thu, 14 Dec 2017 21:14:58 +0000 (21:14 +0000)]
Merge changes from topic "no-battery"
* changes:
BatteryService: don't set battery low or critical states if no battery
BatteryStats: Don't collect battery stats if no battery
nharold [Thu, 14 Dec 2017 21:10:16 +0000 (21:10 +0000)]
Merge "Use consistent naming for allocating SPI."
Tomasz Wasilczyk [Wed, 13 Dec 2017 19:47:20 +0000 (11:47 -0800)]
Move HAL 1.x related service to its own directory.
Bug:
69958777
Test: instrumentation
Change-Id: I4739568d9b1f32db7eebb7448f24f177ba2fc831
Tomasz Wasilczyk [Wed, 13 Dec 2017 16:26:25 +0000 (08:26 -0800)]
Initial implementation of HAL 2.0 counterpart for radio service.
Test: KitchenSink
Bug:
69958777
Change-Id: I7c697af76114e8c5d158ca592d2711b980101d60
TreeHugger Robot [Thu, 14 Dec 2017 20:46:42 +0000 (20:46 +0000)]
Merge "Further reduce statsd memory usage."
Dmitry Dementyev [Thu, 7 Dec 2017 03:05:33 +0000 (19:05 -0800)]
Add RecoverableKeyStoreLoader APIs.
Includes parcelables for
1) KeyDerivation
2) User Secret together with its type.
3) Application key entry
4) KeystoreRecoveryData block with all data necessary to recover
keys later.
Test: none
Bug:
65979689
Change-Id: If59842a92ebbc0e77f95d6a2e5503943e2835062
Amith Yamasani [Wed, 13 Dec 2017 19:52:10 +0000 (11:52 -0800)]
Don't allow certain bucket overrides
Don't allow EXEMPT to be overridden
Differentiate between shell and other callers who set
buckets.
Don't allow forced to be modified by bucketeer.
Don't allow bucketeer to modify NEVER bucket.
Fix a locking issue in listeners list. Don't use
the primary lock when calling out to listeners.
Fixes:
70622791
Fixes:
70622338
Test: atest FrameworksServicesTests:AppIdleHistoryTests
atest FrameworksServicesTests:AppStandbyControllerTests
atest CtsAppUsageHostTestCases
Change-Id: I22309478b947d6461235f5a77e08c7be86309e4b
Android Build Merger (Role) [Thu, 14 Dec 2017 20:09:08 +0000 (20:09 +0000)]
Merge "Merge "Remove compiled classes list" am:
3adfec2de3 am:
3a3fc7a43b am:
8e50922263 -s ours"
Mathieu Chartier [Thu, 14 Dec 2017 20:07:10 +0000 (20:07 +0000)]
Merge "Remove compiled classes list" am:
3adfec2de3 am:
3a3fc7a43b
am:
8e50922263 -s ours
Change-Id: I2dd835282a9de847cd3e5fd0e5a0e54bff2538af
TreeHugger Robot [Thu, 14 Dec 2017 20:05:47 +0000 (20:05 +0000)]
Merge "Do not show keyguard dialogs on AoD."
Eran Messeri [Thu, 14 Dec 2017 20:04:42 +0000 (20:04 +0000)]
Merge "DevicePolicyManager: Support attestation for generated keys."
Mathieu Chartier [Thu, 14 Dec 2017 19:57:14 +0000 (19:57 +0000)]
Merge "Remove compiled classes list" am:
3adfec2de3
am:
3a3fc7a43b
Change-Id: Ia40246372d156d308c4e3930c3789dfe0a1010f8
Mathieu Chartier [Thu, 14 Dec 2017 19:44:50 +0000 (19:44 +0000)]
Merge "Remove compiled classes list"
am:
3adfec2de3
Change-Id: I98d29b9f3aeeaf78ba93b631b0746cc37ac9e7e5
Winson Chung [Thu, 14 Dec 2017 19:42:20 +0000 (19:42 +0000)]
Merge "Fix regression in task trimming"
Andrii Kulian [Thu, 14 Dec 2017 19:32:07 +0000 (19:32 +0000)]
Merge "Fix some issues found in AM display tests"
Wyatt Riley [Thu, 14 Dec 2017 19:17:56 +0000 (11:17 -0800)]
Add more owners
Test: Treehugger only
Change-Id: I873e6f3f94f00e8ed1294bbb4a917b1225e34b09
Treehugger Robot [Thu, 14 Dec 2017 19:16:47 +0000 (19:16 +0000)]
Merge "Remove compiled classes list"
Jeff Davidson [Thu, 14 Dec 2017 19:01:49 +0000 (19:01 +0000)]
Merge "Update PhoneStateListener#onCallStateChanged Javadoc." am:
6e41b2c5c8 am:
67c9a43605
am:
059f59cc70 -s ours
Change-Id: I01e484836f1ac335414acba266b0abb6e191bedc
Michael Plass [Thu, 14 Dec 2017 18:48:16 +0000 (18:48 +0000)]
Merge "Fix flaky WifiTrackerTest"
Todd Poynor [Fri, 8 Dec 2017 18:44:40 +0000 (10:44 -0800)]
BatteryService: don't set battery low or critical states if no battery
If device has no battery then never set states "battery low" or
"battery critical".
Bug:
34507420
Test: manual: inspection (with hack to disappear the battery device)
Change-Id: I1eee79032507121de2fa7bf29d1359a29f21d3d0
Todd Poynor [Fri, 8 Dec 2017 03:19:35 +0000 (19:19 -0800)]
BatteryStats: Don't collect battery stats if no battery
If the device has no battery, or has a removeable battery that is
currently removed, do not collect battery statistics.
Bug:
34507420
Test: manual: dumpsys batterystats
Change-Id: Id8edb494f353a40c648f798690f611f89f464d34
James Wallace-Lee [Thu, 14 Dec 2017 18:40:12 +0000 (18:40 +0000)]
Merge "WebView: Clarify documentation about mimeTypes"
Jeff Davidson [Thu, 14 Dec 2017 18:26:04 +0000 (18:26 +0000)]
Merge "Update PhoneStateListener#onCallStateChanged Javadoc." am:
6e41b2c5c8
am:
67c9a43605
Change-Id: If333cd7cee4785779cdd4acc8421059c4a947dd2
Jeff Davidson [Thu, 14 Dec 2017 18:11:26 +0000 (18:11 +0000)]
Merge "Update PhoneStateListener#onCallStateChanged Javadoc."
am:
6e41b2c5c8
Change-Id: I9fd9ab01b770fc8a1c5998d3a4c3e824123e2076
Eran Messeri [Mon, 11 Dec 2017 17:48:47 +0000 (17:48 +0000)]
DevicePolicyManager: Support attestation for generated keys.
If the KeyGenParameterSpec passed into
DevicePolicyManager.generateKeyPair contains an attestation challenge,
request an attestation record for the newly-generated key with the
challenge provided.
This particular implementation was chosen, rather than letting the
attestation record be generated at the same time as key generation, to
avoid having the attestation chain stored in Keystore and associated
with the generated alias.
The rationale is that this is a key that is potentially accessible by
multiple applications and the attestation chain may end up being sent
as a TLS client certificate chain, for example.
As the attestation challenge should be unique per device, to avoid
the potential of sending / sharing unique device information, by
explicitly requesting an attestation record after key generation, the
attestation record is only returned to the generateKeyPair client and
not persistend in Keystore.
Bug:
63388672
Test: New CTS test to be run with: 'cts-tradefed run commandAndExit cts-dev -a armeabi-v7a -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.DeviceOwnerTest#testKeyManagement -l DEBUG'
Change-Id: I95a9aef179173b571b533301ac438c675e8fe702
Mathieu Chartier [Thu, 14 Dec 2017 18:02:55 +0000 (18:02 +0000)]
Merge "Remove compiled classes list"
Treehugger Robot [Thu, 14 Dec 2017 17:52:27 +0000 (17:52 +0000)]
Merge "Update PhoneStateListener#onCallStateChanged Javadoc."
Mathieu Chartier [Tue, 12 Dec 2017 19:17:01 +0000 (11:17 -0800)]
Remove compiled classes list
No longer used.
(cherry-picked from commit
c87f8124bc1b79969f512f67d5d7f837b4cf28f7)
Bug:
37966211
Test: make
Merged-In: I5a1ef82ed6d8cf771513b86960c3d1d8cf7418f9
Change-Id: I5a1ef82ed6d8cf771513b86960c3d1d8cf7418f9
Yao Chen [Thu, 14 Dec 2017 01:00:51 +0000 (17:00 -0800)]
Further reduce statsd memory usage.
+ Remove the protobuf *Metric object from MetricProducers
-- This saves ~150 bytes per metric.
+ Remove the StatsdConfig from ConfigManager
-- This saves us xKB per config.
+ Also remove alerts from fake config to avoid crash (Bug:
70627390)
+ Other misc fixes too.
Test: statsd_test & manual
Change-Id: Ied4eb3fa31c50599817b3a5e1caf5077c487fad2
TreeHugger Robot [Thu, 14 Dec 2017 17:05:20 +0000 (17:05 +0000)]
Merge "use running sum for ValueMetricProducer bucket simplify ValueMetricProducer logic for pulled data"
gaoshang [Thu, 14 Dec 2017 16:55:21 +0000 (16:55 +0000)]
Merge "input cmds: fix keyevent not support sources parameter" am:
11ec2eb118 am:
4f697fe574
am:
b5a913cce3
Change-Id: Idcaa642e763284dfde7b52f2f87e28796675b127
TreeHugger Robot [Thu, 14 Dec 2017 16:48:12 +0000 (16:48 +0000)]
Merge "[AWARE] Check for RTT feature presence for Aware discovery with ranging"
gaoshang [Thu, 14 Dec 2017 16:37:08 +0000 (16:37 +0000)]
Merge "input cmds: fix keyevent not support sources parameter" am:
11ec2eb118
am:
4f697fe574
Change-Id: Ice43c79858930ccc48b9470152e0af2d99e966ae
Jeff Davidson [Fri, 10 Nov 2017 23:58:20 +0000 (15:58 -0800)]
Update PhoneStateListener#onCallStateChanged Javadoc.
While the doc suggested that the phone number was "incoming" (e.g.
only populated for incoming calls), it should also be populated for
outgoing calls.
Bug:
67748129
Test: Verified expected behavior on Taimen running OC-MR1, added CTS
test (see other CL in this topic)
Change-Id: I1ddd9c042f287953358a794b91b2af5ed6f5b597
Merged-In: I1ddd9c042f287953358a794b91b2af5ed6f5b597
TreeHugger Robot [Thu, 14 Dec 2017 16:28:11 +0000 (16:28 +0000)]
Merge "Only allow the top fullscreen stack to influence lockscreen state"
gaoshang [Thu, 14 Dec 2017 16:26:46 +0000 (16:26 +0000)]
Merge "input cmds: fix keyevent not support sources parameter"
am:
11ec2eb118
Change-Id: I7e527a58332a4453fe104538e55a60a444602159
Treehugger Robot [Thu, 14 Dec 2017 16:14:34 +0000 (16:14 +0000)]
Merge "input cmds: fix keyevent not support sources parameter"
TreeHugger Robot [Thu, 14 Dec 2017 15:29:49 +0000 (15:29 +0000)]
Merge "Fix window movement animations."
Antoan Angelov [Thu, 14 Dec 2017 15:09:05 +0000 (15:09 +0000)]
Merge "Add profile owner transfer functionality."
Peter Visontay [Thu, 14 Dec 2017 15:07:58 +0000 (15:07 +0000)]
Merge "Log an App Op when an accessibility service is registered."
TreeHugger Robot [Thu, 14 Dec 2017 15:07:24 +0000 (15:07 +0000)]
Merge "Add WebView Tracing API."
Wale Ogunwale [Mon, 11 Dec 2017 16:40:13 +0000 (08:40 -0800)]
Only allow the top fullscreen stack to influence lockscreen state
Only activities in the top fullscreen stack should be able to
showWhenLocked or dismiss the keyguard.
Also, use ActivityRecord.visibleIgnoringKeyguard to determine if a
stack is translucent instead of AR.visible.
Bug:
68689819
Bug:
70562363
Test: manual steps from bug
Change-Id: Ib13395198d00366df13f34d4642a1a163b9d2435
TreeHugger Robot [Thu, 14 Dec 2017 13:52:11 +0000 (13:52 +0000)]
Merge "Add an output chooser dialog to volume panel"
Jorim Jaggi [Thu, 14 Dec 2017 13:40:48 +0000 (14:40 +0100)]
Fix window movement animations.
Surface insets/parent calculation wasn't used when calculating
the positions for movement animations.
Test: go/wm-smoke
Test: Go to Wifi setting, click on a WIFI with pw, open/close IME
to observe window movement animation.
Bug:
64674361
Change-Id: Iffd98d8f946c2fc2dcb5adb176bb890d8a3fc374
Tony Mak [Thu, 14 Dec 2017 12:40:07 +0000 (12:40 +0000)]
clearCallingIdentity before calling into getPackageUidAsUser
Fix:
70585244
Test: Enable any accessibility service -> inflate work profile
-> Tap on any work app -> no longer crash
Test: cts-tradefed run cts-dev --module DevicePolicyManager --test com.android.cts.devicepolicy.CrossProfileAppsHostSideTest.testPrimaryUserToManagedProfile
Change-Id: I80d18f4e2ab76a228cb0aa2c8312c323a9b5c84d
Jorim Jaggi [Thu, 14 Dec 2017 13:36:27 +0000 (13:36 +0000)]
Merge changes from topic "lock_free_win"
* changes:
Fix minor issues with new window animations.
Fix possible race conditions when cancelling animations
Lock free animations (2/2)
Bernardo Rufino [Thu, 14 Dec 2017 13:19:46 +0000 (13:19 +0000)]
Merge "Binding on-demand #5: PerformUnifiedRestoreTask usage"
Bernardo Rufino [Thu, 14 Dec 2017 12:15:09 +0000 (12:15 +0000)]
Merge "Update Roboletric to 3.5.1"
arangelov [Thu, 23 Nov 2017 15:29:42 +0000 (15:29 +0000)]
Add profile owner transfer functionality.
Test: cts-tradefed run cts-dev --module DevicePolicyManager --test com.android.cts.devicepolicy.TransferProfileOwnerTest
Test: bit FrameworksServicesTests:com.android.server.devicepolicy.DevicePolicyManagerTest
Bug:
69542817
Change-Id: I824fcb334e0ca3157fb67920f7583b309a14bf85
gaoshang [Thu, 14 Dec 2017 09:52:23 +0000 (17:52 +0800)]
input cmds: fix keyevent not support sources parameter
reused args.length repalce length.
https://issuetracker.google.com/issues/
70654695
Test: input cmds
Change-Id: Ifd8600d66d1647ae677add6b9d95b1d6831d6edb
Signed-off-by: gaoshang <gaoshang@xiaomi.com>
TreeHugger Robot [Thu, 14 Dec 2017 08:08:51 +0000 (08:08 +0000)]
Merge "Move home stack behind top fullscreen stack when split-screen is dismissed"
TreeHugger Robot [Thu, 14 Dec 2017 07:17:52 +0000 (07:17 +0000)]
Merge "Add more IntDef prefixes for auto-documenting."
Chenjie Yu [Sun, 10 Dec 2017 16:31:05 +0000 (08:31 -0800)]
use running sum for ValueMetricProducer bucket
simplify ValueMetricProducer logic for pulled data
Test: unit test
Change-Id: Ic0a21a543166cc5c34c1fa505dba08d1fc2f510a
Michael Plass [Mon, 4 Dec 2017 19:39:13 +0000 (11:39 -0800)]
Fix flaky WifiTrackerTest
The rssiChangeBroadcastShouldUpdateConnectedAp uses two CountDownLatch instances to
synchronize the events on the main thread and the handler thread. The "latch" informs
the main thread that mockWifiManager.getConnectionInfo() has been called and allows it
to proceed, and "mAccessPointsChangedLatch" notes that onAccessPointsChanged is called.
But mAccessPointsChangedLatch was assigned after "latch" released the main thread,
so that on occasion the main thread could try to use it before this assignment, causing
the timeout.
Move the assignment of mAccessPointsChangedLatch to before the body of the test
to prevent this race.
Bug:
70163367
Test: runtest --path frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java
Change-Id: I62c1ef9a2155ffbd08b5e07e94723b28102d1f6d
Joe Onorato [Thu, 14 Dec 2017 05:33:33 +0000 (05:33 +0000)]
Merge "Fix how we build the statsd protos."
Andrii Kulian [Wed, 13 Dec 2017 07:49:10 +0000 (23:49 -0800)]
Fix some issues found in AM display tests
- Updated launch task compute code to avoid unsupported
displays.
- Throw exception when activity landed on unexpected
display.
- Compute display config in WM immediately after creation.
- Fix incorrect target stack value when activity was moved.
Bug:
70562864
Bug:
70563248
Bug:
70564344
Bug:
68952184
Bug:
69916363
Bug:
69916120
Test: ActivityManagerDisplayTests
Change-Id: Id860f77ea49e016f028b44f5512dff37f0758590
Yao Chen [Thu, 14 Dec 2017 05:18:20 +0000 (05:18 +0000)]
Merge "Remove dead code in statsd"
Holly Jiuyu Sun [Fri, 10 Nov 2017 03:28:49 +0000 (19:28 -0800)]
Confirmation code second try.
Bug:
69050703
Test: test on phone
Merged-In: I3e3671bf83715ce55a9d0662f518ef837ac8f22f
Change-Id: I3e3671bf83715ce55a9d0662f518ef837ac8f22f
TreeHugger Robot [Thu, 14 Dec 2017 04:38:56 +0000 (04:38 +0000)]
Merge "StatsdStats alerts -rename alerted_times"
TreeHugger Robot [Thu, 14 Dec 2017 04:09:55 +0000 (04:09 +0000)]
Merge "Give SliceManagerService a concept of pinned slices."
TreeHugger Robot [Thu, 14 Dec 2017 04:01:53 +0000 (04:01 +0000)]
Merge "Adding ability to control how the USB data is dumped."
Hugo Benichi [Thu, 14 Dec 2017 03:36:22 +0000 (03:36 +0000)]
Merge "Extend connectivity OWNERS" am:
64c2488056 am:
3304263594
am:
e3f872cf06 -s ours
Change-Id: If6d6d69ce6411d2974fb46a789decd4af4ff02a0
TreeHugger Robot [Thu, 14 Dec 2017 03:29:50 +0000 (03:29 +0000)]
Merge "Keyguard can be on even if not showing"
Hugo Benichi [Thu, 14 Dec 2017 03:25:36 +0000 (03:25 +0000)]
Merge "Extend connectivity OWNERS" am:
64c2488056
am:
3304263594
Change-Id: I816a15beedcfc9f200d00da7282e54992a096555
Hugo Benichi [Thu, 14 Dec 2017 03:15:04 +0000 (03:15 +0000)]
Merge "Extend connectivity OWNERS"
am:
64c2488056
Change-Id: I07622a82cac394a52f5e17a9f33e6bbbe68b61ea
Jeff Sharkey [Thu, 14 Dec 2017 03:05:05 +0000 (20:05 -0700)]
Add more IntDef prefixes for auto-documenting.
Test: builds, boots
Bug:
70177949
Exempt-From-Owner-Approval: annotation-only changes
Change-Id: I76dde6054e06f52240bd4b1a0f196dcb74623608
Yi Jin [Thu, 14 Dec 2017 03:02:03 +0000 (03:02 +0000)]
Merge "Create a new stream option which generates field name to id mapping recursively for all its submessages."
Treehugger Robot [Thu, 14 Dec 2017 02:56:40 +0000 (02:56 +0000)]
Merge "Extend connectivity OWNERS"
Jorim Jaggi [Tue, 12 Dec 2017 16:18:57 +0000 (17:18 +0100)]
Fix minor issues with new window animations.
- Fix screen rotation anim by pulling it back to DC.
- Fix surface insets by correcting at WindowState.prepareSurfaces,
and then going into the other direction in the WSA.
Test: Open PopupWindow, observe shadow is not clipping
Test: Rotate screen, ensure the animation is correct
Test: go/wm-smoke
Bug:
64674361
Change-Id: I0e0910a72aa5f06b86d4e90061e4f807fb164316
TreeHugger Robot [Thu, 14 Dec 2017 02:44:37 +0000 (02:44 +0000)]
Merge "Disable object pool for lifecycler"
Jorim Jaggi [Tue, 12 Dec 2017 01:17:10 +0000 (02:17 +0100)]
Fix possible race conditions when cancelling animations
Since the surface is being released by the SurfaceAnimator, it was
possible that SurfaceAnimationRunner was still applying surface
changes on a released surface.
Solve this by introducing a cancel-lock on which all surface
operations are synchronized on.
Bug:
64674361
Test: SurfaceAnimationRunnerTest
Change-Id: I06ee9e8270f492faa1cbfd84a09a68c9a1a09ade
Jorim Jaggi [Wed, 15 Nov 2017 13:36:26 +0000 (14:36 +0100)]
Lock free animations (2/2)
Second CL that migrates WSA to use SurfaceAnimator
We start our synchronized app transition journey by showing that
the concept works by using WindowState animations as proof of
concept.
The main class in this CL are SurfaceAnimator and
SurfaceAnimatorRunner. When we start an animation on a Window, we
create a new bufferless surface, called "The Leash", in the
hierarchy and attach the surface of WindowState onto it, while
attaching the leash onto the old surface parent which is still
responsible for z-layering.
Then, we pass off the Leash into SurfaceAnimationRunner, which then
changes the surface properties of Leash in every animation frame,
without holding the WM lock. While it's doing that we can still
update the z-layering of the window, or even relayout the window
of needed - the important surfaces for this are still under WM's
control.
In case the animation is finished the window surface gets
reparented to its original parent, and the leash is abandoned.
Note that the reparenting is done in the same transaction as
processing the animation finish, such that we don't end up with
a flicker in case of a disappearing animation, where the window
surface gets destroyed.
In case the animation needs to be cancelled, WM can revoke control
of the leash by reparenting the window surface. Even if the
cancellation signal is heavily delayed, WM immediately regains
control over the surface by reparenting it within a transaction.
We also introduce the concept of animating a WindowContainer. We
clean up isAnimating:
- isLocalAnimating: is the container itself animating
- isAnimating: is the container or one of its parents animating
- isSelfOrChildAnimating: is local animating or any child
animating.
SurfaceAnimationRunner also needs it's own thread so it's not getting
bogged down by any WM lock contention by processing regular
animation frames. We call that thread android.anim.lf (lockfree).
Now, imagine that SurfaceAnimationAnimator would sit behind an IPC in
another process and instead of animating WindowState, we'd animate
AppWindowToken. Then, synchronized app transitions would be done.
Test: go/wm-smoke
Test: SurfaceAnimatorTest
Test: SurfaceAnimationRunnerTest
Test: WindowContainerTests
Bug:
64674361
Change-Id: Idf59daa90361af57fce1128d19a0c0dbf5971d18
Benedict Wong [Thu, 14 Dec 2017 02:41:28 +0000 (02:41 +0000)]
Merge "Convert IpSecService resources to use refcounting" am:
b6ba8fd49d am:
8698b33cc2
am:
c475898995
Change-Id: Ib18839d7dff8e25898f81e877337fbb8cb24cc7b