Commit Graph

351429 Commits

Author SHA1 Message Date
Greg Daniel
1f397705eb Merge "Update GrContext creation calls to use sk_sp" 2017-12-11 18:03:36 +00:00
Selim Cinek
3ddcbc6c53 Merge "Fixed a crash with the top headsup entry" 2017-12-11 17:21:37 +00:00
Jeff Sharkey
27674aedc0 Merge "Add auto-doc support for @StringDef." 2017-12-11 16:47:13 +00:00
luozhanwei
e5634eeba6 Merge "[DeadLock]AMS PMS MountService" am: 998ac99db4 am: 41fb54b955
am: 81544d2a71

Change-Id: Ib92a19bce9fd9086c302c2cf4606b5d10161fe85
2017-12-11 16:26:25 +00:00
luozhanwei
81544d2a71 Merge "[DeadLock]AMS PMS MountService" am: 998ac99db4
am: 41fb54b955

Change-Id: I15056a18d70a1d17c52799f71e8faf5c565bb8aa
2017-12-11 16:14:17 +00:00
luozhanwei
41fb54b955 Merge "[DeadLock]AMS PMS MountService"
am: 998ac99db4

Change-Id: I5910f42d91c3c3edcc092a87cc2e291d6e83e75e
2017-12-11 16:05:19 +00:00
Treehugger Robot
998ac99db4 Merge "[DeadLock]AMS PMS MountService" 2017-12-11 15:47:45 +00:00
TreeHugger Robot
7310f4f35b Merge "Keystore: Fix KeyGenParameterSpec parceling" 2017-12-11 15:33:22 +00:00
Tom Dobek
f8d1840fae Merge "Aapt2 convert: skip processing resources when resource table is absent. Test: manual" 2017-12-11 15:13:23 +00:00
Greg Daniel
660d6eca99 Update GrContext creation calls to use sk_sp
Test: manual testing

Change-Id: I68d8706ffa7bc7c6622ea0b8c45d7297a131f6bf
2017-12-11 09:39:16 -05:00
Neil Fuller
7888d2f9eb Merge "Tidy up changes for timezone update code" 2017-12-11 14:35:22 +00:00
Eran Messeri
47670548e0 Keystore: Fix KeyGenParameterSpec parceling
Fix the way KeyGenParameterSpec is parceled, by correctly handling
default and null values for some of the fields.

A recent CL added the ability to parcel/unparcel KeyGenParameterSpec (by
a separate class).
Due to refactoring late in the CL review cycle, the parceling code did
not take into account a few edge cases.

Unit tests:
m -j KeystoreTests && adb install -r out/target/product/marlin/data/app/KeystoreTests/KeystoreTests.apk
adb shell am instrument 'android.security.tests/android.support.test.runner.AndroidJUnitRunner'

CTS tests:
cts-tradefed run commandAndExit cts-dev -a armeabi-v7a -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.DeviceOwnerTest#testKeyManagement -l DEBUG

Bug: 69337278
Test: Keystore unit tets (see instructions above) and cts Key Management test.
Change-Id: Ie08f42b07fb55b6fa1d8fb73c89d69687c97e214
2017-12-11 12:28:13 +00:00
Tom Dobek
725fb12c0d Aapt2 convert: skip processing resources when resource table is absent.
Test: manual

Change-Id: Iafe20f98857a29d625e7a57a9201db6279d43e45
2017-12-11 10:30:12 +00:00
TreeHugger Robot
0b62766d27 Merge "API Review: Drop "Button" in is/setLogoutEnabled method" 2017-12-11 06:35:31 +00:00
TreeHugger Robot
92beccfe58 Merge "Add TaskPositioningController" 2017-12-11 06:11:56 +00:00
Daichi Hirono
34fb7314fa Add TaskPositioningController
The CL creates new TaskPositioningController class which lives over the
process WindowManagerService's life time and handle task positioning
tasks like resizing or moving by drag.

Bug: 64149458
Test: atest com.android.server.wm.TaskPositioningControllerTests
Change-Id: I65b3226ce5fa93c16037671ab9cd3b3d84d8f274
2017-12-11 10:23:44 +09:00
Hugo Benichi
54edf5df21 Merge "DefaultNetworkEvent: fix two bugs with validation times" am: c0d951c3e0 am: 144d9e9f83
am: 51e563aefb

Change-Id: Ide65494bfe095533a06c4b33002fbd260306f8a0
2017-12-11 00:37:22 +00:00
Hugo Benichi
51e563aefb Merge "DefaultNetworkEvent: fix two bugs with validation times" am: c0d951c3e0
am: 144d9e9f83

Change-Id: Iad5a7cda8b73f638aa7db8ae38bdccef1cbeae85
2017-12-11 00:24:33 +00:00
Hugo Benichi
144d9e9f83 Merge "DefaultNetworkEvent: fix two bugs with validation times"
am: c0d951c3e0

Change-Id: I94489cb28fad5d8adddb200b44d72bab2be70b97
2017-12-11 00:12:16 +00:00
Hugo Benichi
c0d951c3e0 Merge "DefaultNetworkEvent: fix two bugs with validation times" 2017-12-10 23:54:13 +00:00
Robert Berry
84321d87b9 Merge "Add helpers for generating keys, wrapping them, and persisting them" 2017-12-10 17:35:55 +00:00
TreeHugger Robot
b8f2728a78 Merge "Prevent reporting fake package name - framework" 2017-12-09 19:51:00 +00:00
Svet Ganov
240aed987c Prevent reporting fake package name - framework
Test: added AccessibilityEndToEndTest#testPackageNameCannotBeFaked
      cts-tradefed run cts -m CtsAccessibilityServiceTestCases
      cts-tradefed run cts -m CtsAccessibilityTestCases

bug:69981755

Change-Id: I13304efbee10d1affa087e9c8bc4ec237643283e
2017-12-09 09:04:24 -08:00
Tor Norbye
60f1ee2df7 Merge "Switch @IntDef from long to int, and add @LongDef" 2017-12-09 15:10:47 +00:00
Jorim Jaggi
096959932b Merge "Lock free animations (1/2)" 2017-12-09 14:23:37 +00:00
Jorim Jaggi
21c39a7771 Lock free animations (1/2)
First CL that introduces SurfaceAnimator/LockFreeAnimator

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: I10d41f7a289ab2158da3f2f1c3ddd78edd1efc86
Exempt-From-Owner-Approval: Tiny change unrelated to display management.
2017-12-09 14:23:03 +00:00
Nicolas Geoffray
ef20471754 Merge "Revert "Remove empty ScopedArray constructor."" am: f6a0a7491b am: 73fce7397e
am: d3e197a1bd

Change-Id: Idf3497ce71c0a03ed440bb35c09f5247a977f6ba
2017-12-09 14:08:18 +00:00
Nicolas Geoffray
d3e197a1bd Merge "Revert "Remove empty ScopedArray constructor."" am: f6a0a7491b
am: 73fce7397e

Change-Id: I8bb88e7b91928ae8fc79233a74fe545aa3d40bb7
2017-12-09 13:56:54 +00:00
Nicolas Geoffray
73fce7397e Merge "Revert "Remove empty ScopedArray constructor.""
am: f6a0a7491b

Change-Id: I9c49b4209e98e90bea62ad1656f7405d771395c9
2017-12-09 13:38:43 +00:00
Nicolas Geoffray
f6a0a7491b Merge "Revert "Remove empty ScopedArray constructor."" 2017-12-09 13:26:00 +00:00
Nicolas Geoffray
e1cbeef15c Revert "Remove empty ScopedArray constructor."
Libcore tests still fail.

This reverts commit cee368b2b8.

Change-Id: I4bcdb7bf08d09d563e54cd8fe005402ae3579164
2017-12-09 13:25:26 +00:00
Tor Norbye
f740c7ea08 Switch @IntDef from long to int, and add @LongDef
This CL mirrors changes made to the android.support.annotation version
of IntDef, to keep the usage and semantics identical (though the
internal version of @IntDef and @LongDef are of course hidden and not
part of the SDK.)

Test: These annotations have source retention and therefore have
no runtime impact; the change was compiling the SDK.

Change-Id: Idaf47e8d983c88be1bd8f938615c86611014b45a
2017-12-08 20:54:50 -08:00
Colin Cross
15ee5ebf75 Merge "Convert legacy-test, test-runner, and test-mock to Android.bp" 2017-12-09 04:35:23 +00:00
Hugo Benichi
71a1b532b5 DefaultNetworkEvent: fix two bugs with validation times
This patch fixes two bugs around the validation time calculation for
default network metrics:
  - for events representing the absence of a default network, the
    validation time was not correctly set to 0.
  - for events representing a default network, the validation time was
    always set to the duration time. This was overlooked by commit
    380a063858.

Also fix a minor printing padding issue in DefaultNetworkEvent#toString

Test: manually inspected the output of $ adb shell dumpsys connmetrics
      while enabling and disabling wifi.

Change-Id: I0eb4ccdf7a61d3097d0661104cb40d738e59772a
2017-12-09 13:02:51 +09:00
Siyuan Zhou
bc904856f1 Merge "BootReceiver: Added an event log after the dropbox file copy is successful." am: 5323d42b82 am: c044749416
am: 89df84bfb4  -s ours

Change-Id: Ic5007c1e5bf5153691d3d1cc743c449f7f583bc7
2017-12-09 03:30:37 +00:00
Siyuan Zhou
89df84bfb4 Merge "BootReceiver: Added an event log after the dropbox file copy is successful." am: 5323d42b82
am: c044749416

Change-Id: If096fea07e31abbd8c5c418c776296c1200009d9
2017-12-09 03:18:08 +00:00
Siyuan Zhou
c044749416 Merge "BootReceiver: Added an event log after the dropbox file copy is successful."
am: 5323d42b82

Change-Id: Iaf53e8a99b61d68c3b920b76c78e9208845c56f3
2017-12-09 03:06:26 +00:00
Treehugger Robot
5323d42b82 Merge "BootReceiver: Added an event log after the dropbox file copy is successful." 2017-12-09 02:55:20 +00:00
Roshan Pius
cde4484262 Merge "Revert "Send empty LinkProperties when entering StoppedState."" am: e339662247 am: 66c8516600
am: a312cf38f9

Change-Id: Ib7aff28ca5088bf5ebbc86ab7ee5c607e35d6a2b
2017-12-09 02:09:51 +00:00
Roshan Pius
a312cf38f9 Merge "Revert "Send empty LinkProperties when entering StoppedState."" am: e339662247
am: 66c8516600

Change-Id: I9c7175d9e2db45780f14630db43a6ab5672dfe3d
2017-12-09 01:58:08 +00:00
TreeHugger Robot
21084779c5 Merge "Improved AccessibilityNodeInfo.toString()." 2017-12-09 01:53:11 +00:00
Roshan Pius
66c8516600 Merge "Revert "Send empty LinkProperties when entering StoppedState.""
am: e339662247

Change-Id: I402078a9ad6d92441cf34ca0b9459ee51adac984
2017-12-09 01:48:34 +00:00
Tarandeep Singh
521fa713bd Merge "Move IME related API methods from IMM to IMS." 2017-12-09 01:35:04 +00:00
Treehugger Robot
e339662247 Merge "Revert "Send empty LinkProperties when entering StoppedState."" 2017-12-09 01:34:07 +00:00
TreeHugger Robot
21ce736414 Merge "PROTECTION_FLAG_VENDOR_PRIVILEGED as @TestApi" 2017-12-09 01:10:58 +00:00
Android Build Merger (Role)
dcd233bd51 Merge "Merge "[AWARE] Make PeerHandle comparable/hashable" am: 8d621cc042 am: bd82991016 -s ours am: 8b4960ec91 -s ours" 2017-12-09 00:42:56 +00:00
Wale Ogunwale
3776268f28 Merge "Use stable rect to determine if we should adjust for IME in split-screen" 2017-12-09 00:40:36 +00:00
Etan Cohen
05a7951d4b Merge "[AWARE] Make PeerHandle comparable/hashable" am: 8d621cc042 am: bd82991016 -s ours
am: 8b4960ec91  -s ours

Change-Id: Ic53447dfd6cf026374f9fb9471db8d9d0563ae65
2017-12-09 00:40:27 +00:00
TreeHugger Robot
74c10e2bdb Merge "Add default value for battery app list flag" 2017-12-09 00:35:06 +00:00
Jeff Sharkey
5db9a91135 Add auto-doc support for @StringDef.
Behaves pretty much the same as @IntDef, but now supports "suffix"
in addition to "prefix" when matching constants.

Test: manual docs output looks sane
Bug: 70406696
Change-Id: I35064b0f9f36f1f13ccdb40302d818a004014f15
2017-12-08 17:33:40 -07:00