Commit Graph

78860 Commits

Author SHA1 Message Date
Svet Ganov
f137102968 Merge "Fixes crash (race cond) when using toast that is immediately cancelled" into oc-dev am: 2df0155a97
am: c4996bd89c

Change-Id: I6ab834ef0b291e24cdc67b885bcd5c6230a82cb1
2017-05-16 14:32:58 +00:00
Svet Ganov
c4996bd89c Merge "Fixes crash (race cond) when using toast that is immediately cancelled" into oc-dev
am: 2df0155a97

Change-Id: I6cb947b8c42298c7cff1932031faec362b99a354
2017-05-16 14:26:00 +00:00
TreeHugger Robot
b05e8176bb Merge "Invoke BLKSECDISCARD to securely delete sensitive data" 2017-05-16 14:23:06 +00:00
TreeHugger Robot
2df0155a97 Merge "Fixes crash (race cond) when using toast that is immediately cancelled" into oc-dev 2017-05-16 14:16:01 +00:00
Hugo Benichi
bd4317f754 Merge "Remove unused import in ConnectivityManager" am: db6fc1afe8 am: fe098f8207 am: e13c192d0f
am: 36d913c7b9

Change-Id: I455d9712ad7f60f7474077435ff977c95b3b48c3
2017-05-16 13:34:37 +00:00
Hugo Benichi
36d913c7b9 Merge "Remove unused import in ConnectivityManager" am: db6fc1afe8 am: fe098f8207
am: e13c192d0f

Change-Id: Ib8368c5a8538914cba2723368c03618401ac159f
2017-05-16 13:25:09 +00:00
Hugo Benichi
e13c192d0f Merge "Remove unused import in ConnectivityManager" am: db6fc1afe8
am: fe098f8207

Change-Id: I64a2a607769d7194161e7728465c38cabbfa9345
2017-05-16 13:18:33 +00:00
Rubin Xu
aa32d15305 Invoke BLKSECDISCARD to securely delete sensitive data
Bug: 34600579
Test: manual - change device lock under synthetic password, verify
      old data on disk is erased.

Change-Id: I247bd1f095dd27335e671981f9e2d77e149af84f
2017-05-16 12:44:02 +01:00
Svet Ganov
0df3702f53 Fixes crash (race cond) when using toast that is immediately cancelled
Running cancel after toast is shown and adding some UI stress (or sleep
on UI thread) causes a crash from toast when trying to add the toast
window to the display. The toast must be triggered from app that is
above N MR1 (25).

The steps that crash the app are:
1. Show toast (Toast.makeText(...).show()), window token is created
2. Immediately cancel toast (Toast.cancel()), window token is removed
3. Stall UI thread (Thread.sleep, heavy task), both show and cancel
events are queued to UI thread from window manager
4. Crash trying to add toast but no window token exists

In Toast:handleShow(), the mNextView is required to add the toast to
display, if the mNextView is null before posting to window manager, then
when handleShow() runs later, it will ignore adding the toast to
display. The issue before is that mNextView is set to null after cancel
runs back from window manager in UI thread but the show post will always
happen first. Therefore set mNextView to null at the beginning of
cancel will ignore adding the toast to display and avoid the crash.

Bug: 37606432

Test: manual - write an app to Toast.show(), Toast.cancel(), then
Thread.sleep(), set app's sdk usage above 25 (N MR1) and show the
toast

Change-Id: I352e296c47b1b8776c78b6b0943b1dc809963026
2017-05-15 23:46:21 -07:00
Ian Pedowitz
52e33eed24 Merge "Revert "Revert "O is API 26""" into oc-dev am: 655ab3f59b
am: b6290ff39e

Change-Id: If4c21c8d37d753b00e4478c21bf5e6dbe9f39288
2017-05-16 05:04:15 +00:00
Ian Pedowitz
b6290ff39e Merge "Revert "Revert "O is API 26""" into oc-dev
am: 655ab3f59b

Change-Id: I28655c728468f2348b2ba83b77f2aae3d7b22c06
2017-05-16 04:02:51 +00:00
Ian Pedowitz
655ab3f59b Merge "Revert "Revert "O is API 26""" into oc-dev 2017-05-16 03:33:05 +00:00
Hugo Benichi
d5ad3e8a0c Remove unused import in ConnectivityManager
This makes the pre-upload verification pass.

Test: no functional change.
Change-Id: I6beccea10ccfcb39d975cb8f6f34fc9d79f1e170
2017-05-16 11:39:08 +09:00
Aurimas Liutikas
4adf179816 Merge "Update TimePicker mode switch icon." into oc-dev am: 1812e446e1
am: 3ff9b30724

Change-Id: Idb7d538321c349d3d7b237df72d25e1d3fd9ff7a
2017-05-16 01:49:46 +00:00
Svet Ganov
647dc84560 Merge "Support recursive static shared lib dependency" into oc-dev am: e04765998e
am: 8adfc2cac7

Change-Id: Ib07a986a02372d40ce93b9beb8e1ac74f0d3561b
2017-05-16 01:38:57 +00:00
Rob Carr
93d5c06222 Merge "Preserve non-floating state when entering pinned stack." into oc-dev am: f5b6818009
am: dff4323f01

Change-Id: Ie007a26d4d0264f5a0609cbc0996a5a509734382
2017-05-16 01:28:14 +00:00
Aurimas Liutikas
3ff9b30724 Merge "Update TimePicker mode switch icon." into oc-dev
am: 1812e446e1

Change-Id: I8289ec34bef3f03a0fac671208e7257b547e49e1
2017-05-16 01:19:47 +00:00
TreeHugger Robot
1812e446e1 Merge "Update TimePicker mode switch icon." into oc-dev 2017-05-16 01:14:01 +00:00
Svet Ganov
8adfc2cac7 Merge "Support recursive static shared lib dependency" into oc-dev
am: e04765998e

Change-Id: I674191296c7d0a409e19614b2f18a4b86bf03ab8
2017-05-16 00:03:00 +00:00
TreeHugger Robot
e04765998e Merge "Support recursive static shared lib dependency" into oc-dev 2017-05-15 23:49:07 +00:00
Rob Carr
dff4323f01 Merge "Preserve non-floating state when entering pinned stack." into oc-dev
am: f5b6818009

Change-Id: I22f408fef8007cb5c1266a7115da01c07b4f0eb4
2017-05-15 23:38:21 +00:00
Jesse Hall
32d3babb24 Merge "Require targetSdkVersion>=O for updated graphics driver packages" into oc-dev am: 40b274915e
am: 4e99819ba6

Change-Id: I721dd6b03d7f5938de7e81b8fb25feb04babaa6a
2017-05-15 23:23:35 +00:00
Rob Carr
f5b6818009 Merge "Preserve non-floating state when entering pinned stack." into oc-dev 2017-05-15 23:17:33 +00:00
TreeHugger Robot
269eab538e Merge "Update the mTotalDuration for each animation in an AnimatorSet." 2017-05-15 23:16:43 +00:00
Jesse Hall
4e99819ba6 Merge "Require targetSdkVersion>=O for updated graphics driver packages" into oc-dev
am: 40b274915e

Change-Id: I849c6a942448536b67d79f0687f07ed36567fa1b
2017-05-15 23:15:04 +00:00
TreeHugger Robot
40b274915e Merge "Require targetSdkVersion>=O for updated graphics driver packages" into oc-dev 2017-05-15 23:02:05 +00:00
Wale Ogunwale
0f8ce259fb Merge "Changed alert window notifications to use single channel" into oc-dev am: 648e127fcb
am: 33c831a15c

Change-Id: Ib94d4d4e12cf6cfb7fc9e6c2a63b4d47b40223ca
2017-05-15 22:43:42 +00:00
Aurimas Liutikas
c0aa90d9ee Update TimePicker mode switch icon.
Previously the icon was an event icon, but a clock icon is
more appropriate so we are switching to that instead.

Bug: 37351390
Test: Open time picker
Change-Id: I47e6caf3c341c10264168004628288fd00e4601a
2017-05-15 15:39:28 -07:00
Wale Ogunwale
33c831a15c Merge "Changed alert window notifications to use single channel" into oc-dev
am: 648e127fcb

Change-Id: I0afd77da2da1c7e14cec98be39bcd595ec69267e
2017-05-15 22:34:59 +00:00
TreeHugger Robot
648e127fcb Merge "Changed alert window notifications to use single channel" into oc-dev 2017-05-15 22:25:43 +00:00
Svet Ganov
58c99f0207 Support recursive static shared lib dependency
Test: Updated the static shared lib CTS tests to verify that
      All static shared lib CTS tests pass

bug:35359862

Change-Id: Id4a0dabbc9d8e98962e92b6f537f6ffffa63b585
2017-05-15 14:43:17 -07:00
Philip Quinn
7fb80f7d27 Update the mTotalDuration for each animation in an AnimatorSet.
A cache was introduced in I677bc289f2ba430466f2d90ebc14368cb7b75118 to
optimise calls to createDependencyGraph(), but the update was removed in
If1dc6e8dbc93a4bf5ade8c5b0dcf43d3ee6ba7b5. This patch reintroduces the
update when calculating child animation start/end times to re-enable the
optimisation.

Test: cts-tradefed run cts-dev --module CtsAnimationTestCases
Change-Id: Ie9dad4049c07a151889b57809bf844ab854ff482
2017-05-15 21:36:30 +00:00
Jesse Hall
0e72f130ab Require targetSdkVersion>=O for updated graphics driver packages
In O, graphics drivers are loaded into a new restricted linker
namespace. Drivers built for previous versions of the OS may not work
under those restrictions, so require an updated driver package to
declare compatibility by setting targetSdkVersion >= O.

Bug: 34228255
Test: manually construct packages with and without
      targetSdkVersion >= O, confirm driver is used/not-used as
      expected.
Change-Id: I4518360433a6de5c6e1e792a6eedddf8c6bf4394
2017-05-15 14:08:57 -07:00
Wale Ogunwale
8f7bebca36 Changed alert window notifications to use single channel
Per UX request.

Change-Id: Iefe1be52743519af5ee1481b59613c87f16bdf7d
Fixes: 37422870
Test: Verify alert window notification channel.
2017-05-15 13:08:23 -07:00
Paul Duffin
19e2a75bf0 Merge "Moved c.a.i.u.Predicate[s] into legacy-test" am: e476a30575
am: 3215c85de9

Change-Id: Ib64efa0332d5f5bdbab99f3271bc058c54bfaa35
2017-05-15 19:19:30 +00:00
Amith Yamasani
e726dbfa26 Merge "Map isolated processes to correct uid" into oc-dev am: ba4ac09d23
am: 5cd7bd118e

Change-Id: Ia3a64a6dd5ca85f1ab3346e75eab93e809bf1d5e
2017-05-15 17:54:57 +00:00
Amith Yamasani
5cd7bd118e Merge "Map isolated processes to correct uid" into oc-dev
am: ba4ac09d23

Change-Id: I44e106b59854a12d8f871cbf595574a4b345dd4a
2017-05-15 17:44:46 +00:00
Amith Yamasani
ba4ac09d23 Merge "Map isolated processes to correct uid" into oc-dev 2017-05-15 17:36:36 +00:00
Phil Weaver
5649d3e93b Merge "Add null check to a11y call." into oc-dev am: 9289faa163
am: 6f40533f4e

Change-Id: I096085f2da8bdde5b53167d25d0beabcb3d491cb
2017-05-15 17:13:49 +00:00
TreeHugger Robot
285f9ff995 Merge "Take better control over Exceptions thrown in WebViewFactory." 2017-05-15 17:10:58 +00:00
Phil Weaver
6f40533f4e Merge "Add null check to a11y call." into oc-dev
am: 9289faa163

Change-Id: I9e9232a1cef8cd29909233995e983eda98872568
2017-05-15 17:05:31 +00:00
Phil Weaver
9289faa163 Merge "Add null check to a11y call." into oc-dev 2017-05-15 16:56:29 +00:00
Sumir Kataria
7f3ca9617a Merge "Use placeholderCount-1 if using default layout." into oc-dev am: 260d6c6e8c
am: 3912511db2

Change-Id: Iea16a4af5118e389814e63c828ed896a87e740c0
2017-05-15 16:51:41 +00:00
Sumir Kataria
3912511db2 Merge "Use placeholderCount-1 if using default layout." into oc-dev
am: 260d6c6e8c

Change-Id: Ie4ec53faee984a427e4e175255794a668e02b2a6
2017-05-15 16:45:57 +00:00
Sumir Kataria
260d6c6e8c Merge "Use placeholderCount-1 if using default layout." into oc-dev 2017-05-15 16:35:32 +00:00
Jonathan Solnit
91d199a391 Merge "Add camera lift trigger to GestureLauncherService" 2017-05-15 16:20:42 +00:00
Paul Duffin
4455130610 Moved c.a.i.u.Predicate[s] into legacy-test
These classes are only used by android.test classes that are
being removed. As their name suggests they should not be in the
Android API at all so it makes sense to remove them. Especially
as there is java.lang.function.Predicate available now.

It appears as though Predicate was only added in to the API
because it was used by a method in the API as the directory in
which it and Predicates live was not on the list of classes to
explicitly index. Moving it into legacy-test meant that they are
now being indexed explicitly which means that Predicates needs
to be hidden.

Keeps running the tests as part of the existing target.

At runtime apps targeted at the API version before these are
removed will have the legacy-test library automatically added
to their classpath so they should see no effect. Apps that
target a later API will have to include those classes from the
android.legacy.test.jar which will contain all the android.test
classes that depend on it as well.

Bug: 30188076
Test: make checkbuild
Change-Id: Ia8502ec77ac11f85e078d70b68df214a9435eee7
Merged-In: I6f6f5f16fe93bd80227a450c6254166632fc6813
2017-05-15 15:17:48 +01:00
Peeyush Agarwal
59817588f6 Fix broken MenuItem coretests
am: 101ab58e26

Change-Id: I5fa8da7c7455aa1e72924ea04d8e43580ed69765
2017-05-15 14:07:20 +00:00
Peeyush Agarwal
101ab58e26 Fix broken MenuItem coretests
- Fix MenuItemImpl setShortcut bug caused when method signature was
changed after API review
- Remove outdated MenuItem coretests and move others to CTS

Bug: 38114634
Test: Run `cts-tradefed run cts-dev -m CtsViewTestCases -t
android.view.cts.MenuTest`

Change-Id: Iebb7e314cbb3f812fcfeb3f95797f1cf1bcfbae2
(cherry picked from commit d70d2e6efc)
2017-05-15 13:56:59 +00:00
Gustav Sennton
b715d405b5 Take better control over Exceptions thrown in WebViewFactory.
Turn WebViewFactory.MissingWebViewPackageException into a non-runtime
exception to avoid potential bugs where we miss catching that exception.

Also introduce a new exception specifically for IOExceptions thrown in
getLoadFromApkPath().

Bug: 28736099
Test: make an Angler build.

Change-Id: Ib07257eaefaaa79d7ea45ba0f609be7263438f6c
2017-05-15 13:19:35 +01:00