Commit Graph

332757 Commits

Author SHA1 Message Date
George Burgess IV
fa4eaa63ca Appease the static analyzer
Since the static analyzer assumes that
`head == blockToRemove && blockToRemove->prevBlock == nullptr` may be
true, it complains that we're deleting `head` and returning `head`
shortly afterward.

Assert (without assertions, since -DNDEBUG is passed) that this isn't
the case.

Bug: 27101951
Test: mma. Warning is gone.
Change-Id: I33e98eec7b293fcf0d8826f89c287a3b870758f2
2017-07-18 17:21:28 -07:00
TreeHugger Robot
1ad8903bb6 Merge "Add provider level support for PDF Thumbnails" 2017-07-17 18:07:33 +00:00
Geoffrey Pitsch
417510bd3b Merge "Remove Keyguard owner info from RelativeLayout." into oc-dr1-dev am: f99ac67bdb
am: b618e8fe39

Change-Id: I08f58463bb236d11f45a77408be978463ae5f782
2017-07-17 17:42:18 +00:00
Geoffrey Pitsch
b618e8fe39 Merge "Remove Keyguard owner info from RelativeLayout." into oc-dr1-dev
am: f99ac67bdb

Change-Id: Icf54f81733d19d91913989451a5fc07ff5f1566d
2017-07-17 17:37:45 +00:00
Geoffrey Pitsch
f99ac67bdb Merge "Remove Keyguard owner info from RelativeLayout." into oc-dr1-dev 2017-07-17 17:31:26 +00:00
TreeHugger Robot
ba85991139 Merge "Add TimeZoneRulesDataContract to system API" 2017-07-17 16:44:47 +00:00
Esteban Talavera
c863ce56e9 Merge "Enforce policy for camera gesture in keyguard" into oc-dr1-dev am: daa1539a5e
am: 1f439e4bc7

Change-Id: I99b1d51c154bcda4121fd818ec17a3c90431443d
2017-07-17 16:34:29 +00:00
Beverly
ee14617065 Merge "Added check for AOD before showing volume dialog." into oc-dr1-dev am: 47e4fde159
am: 7be3f44673

Change-Id: If5fa613b100a5d216575ad4f53523f706edcfc07
2017-07-17 16:27:34 +00:00
Esteban Talavera
1f439e4bc7 Merge "Enforce policy for camera gesture in keyguard" into oc-dr1-dev
am: daa1539a5e

Change-Id: I30d024c2d4e11f4e4c246b123723a00d28af78ee
2017-07-17 16:27:30 +00:00
TreeHugger Robot
daa1539a5e Merge "Enforce policy for camera gesture in keyguard" into oc-dr1-dev 2017-07-17 16:14:44 +00:00
Beverly
7be3f44673 Merge "Added check for AOD before showing volume dialog." into oc-dr1-dev
am: 47e4fde159

Change-Id: Ic154e4fea33cbec26407598325c44a4dcbbcceb7
2017-07-17 16:13:34 +00:00
TreeHugger Robot
47e4fde159 Merge "Added check for AOD before showing volume dialog." into oc-dr1-dev 2017-07-17 15:59:04 +00:00
Andrew Scull
e3a9b8a350 Merge "Credential FRP: remove GateKeeper" 2017-07-17 15:53:36 +00:00
Geoffrey Pitsch
733214229c Remove Keyguard owner info from RelativeLayout.
Altering other elements in the layout was forcing unnecessary
changes on the marquee scrolling.

Fixes: 62400546
Test: manual
Change-Id: Ib9cccb91b6a95e614917eacfddb91624aea3ba27
2017-07-17 11:05:27 -04:00
Benjamin Miller
1d47c55407 Merge "Docs: VPNs under Android O should promote to the foreground" into oc-dev am: ca007e525b am: 2ecc198877
am: 3404cc761c

Change-Id: Ifb719b609626416378aec05715717156774e575a
2017-07-17 14:45:19 +00:00
Benjamin Miller
401d176f95 Merge "Docs: VPNs under Android O should promote to the foreground" into oc-dev am: ca007e525b am: 3082216de2
am: 105c3b1df4

Change-Id: Ic23b650fdd29739f312bf62fbab52196429c3f2e
2017-07-17 14:41:07 +00:00
Wyatt Riley
d292f0af47 Merge "Improved GNSS state debug logs" into oc-dr1-dev am: bd2d9f8fdf
am: 05df03461e

Change-Id: I07fe2ab0090ffeebe90e62079db7926974b3b86d
2017-07-17 14:38:58 +00:00
Benjamin Miller
3404cc761c Merge "Docs: VPNs under Android O should promote to the foreground" into oc-dev am: ca007e525b
am: 2ecc198877

Change-Id: I6d74a3bd8e7c84f4f2a571f83888a0f9d485dc27
2017-07-17 14:38:56 +00:00
Benjamin Miller
105c3b1df4 Merge "Docs: VPNs under Android O should promote to the foreground" into oc-dev am: ca007e525b
am: 3082216de2

Change-Id: Id9720c51f6192831ede99fd0af0451b43026e663
2017-07-17 14:32:30 +00:00
Wyatt Riley
05df03461e Merge "Improved GNSS state debug logs" into oc-dr1-dev
am: bd2d9f8fdf

Change-Id: I414ff67d392f5d11a2b5919556ceff6fc6e1b393
2017-07-17 14:28:33 +00:00
Benjamin Miller
2ecc198877 Merge "Docs: VPNs under Android O should promote to the foreground" into oc-dev
am: ca007e525b

Change-Id: If2a06d8e8e5fe2034e22c86dabf68bf7d3f79bb0
2017-07-17 14:23:25 +00:00
Benjamin Miller
3082216de2 Merge "Docs: VPNs under Android O should promote to the foreground" into oc-dev
am: ca007e525b

Change-Id: Ife96d44a6c8687be49616562f1834c1e2cc17b7d
2017-07-17 14:22:24 +00:00
TreeHugger Robot
bd2d9f8fdf Merge "Improved GNSS state debug logs" into oc-dr1-dev 2017-07-17 14:21:01 +00:00
TreeHugger Robot
ca007e525b Merge "Docs: VPNs under Android O should promote to the foreground" into oc-dev 2017-07-17 14:11:55 +00:00
Esteban Talavera
40f8b999ae Enforce policy for camera gesture in keyguard
If the admin has disabled the camera for secure
keyguards, in addition to removing the bottom-right hand
corner camera button do not allow the camera to be opened
via the camera gesture either.

Bug: 63334090
Test: Manually tested launching the camera on secure and non-secure keyguard and non-keyguard, both via camera icon and gesture
Change-Id: I104688eaad719528376e2851f837d5956a6a1169
2017-07-17 14:45:44 +01:00
TreeHugger Robot
63b927a6b2 Merge "Added check for null metadata." 2017-07-17 13:43:17 +00:00
TreeHugger Robot
3b3165e5a9 Merge ""Block notifications screen off" setting is used" 2017-07-17 13:38:06 +00:00
Andrew Scull
971f2948fb Credential FRP: remove GateKeeper
From O-DR, all new credentials will be synthetic password based. A
GateKeeper credential could be enrolled but that would require
`adb shell cmd lock_settings sp 0`.

Credential FRP won't be released before O-DR so there is no need to
handle GateKeeper credentials. The protocol constants have been updated
because they are not yet in use.

Bug: 36814845
Test: runtest frameworks-services -p com.android.server.locksettings
Change-Id: Id0def06bb56fef47f3151f4f5cd0db738b35979f
2017-07-17 13:36:18 +00:00
Beverly
8ebef8494e Added check for AOD before showing volume dialog.
Fixes: 62598406

Test: runtest systemui

Change-Id: I407eed0e0559ef0bc61d36ad9c5e84c6924c161e
2017-07-17 13:17:52 +00:00
Przemyslaw Szczepaniak
9c308e6a36 Merge "Track libcore commit 58228b82c64808eddac02736f18f5003730443a0" am: 29926838d4 am: 40dfadda77 am: 004ae3ae71
am: 9022cf0c2e

Change-Id: Ic50e0daa27503660cce8f65a3fbb84f8ee5d323e
2017-07-17 11:11:52 +00:00
Przemyslaw Szczepaniak
9022cf0c2e Merge "Track libcore commit 58228b82c64808eddac02736f18f5003730443a0" am: 29926838d4 am: 40dfadda77
am: 004ae3ae71

Change-Id: I74a0d7f3623bb1e6fdf6142a702c0e5dcfe1d5ee
2017-07-17 11:02:55 +00:00
Przemyslaw Szczepaniak
004ae3ae71 Merge "Track libcore commit 58228b82c64808eddac02736f18f5003730443a0" am: 29926838d4
am: 40dfadda77

Change-Id: I8b74cd195f4133e478a63ad2066856ebe32b6231
2017-07-17 10:55:37 +00:00
Przemyslaw Szczepaniak
40dfadda77 Merge "Track libcore commit 58228b82c64808eddac02736f18f5003730443a0"
am: 29926838d4

Change-Id: I7c0f6b9c064ce7eba1eb0cd4c6bca7464ce24100
2017-07-17 10:48:50 +00:00
Przemyslaw Szczepaniak
29926838d4 Merge "Track libcore commit 58228b82c64808eddac02736f18f5003730443a0" 2017-07-17 10:37:35 +00:00
Robert Berry
a780907d9f Use try with resources in BackupManagerService
Resources are not handled in a consistent manner, or even consistently
closed.

Bug: 36850431
Test: adb shell am instrument -w -e package com.android.server.backup com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I9ca2bd8d532af385174a107ee7fbe113575c5bbb
2017-07-17 10:01:53 +01:00
Philip Cuadra
07001e8313 Merge "Use new powerHintAsync when available" into oc-dr1-dev am: f54dbc5253 -s ours
am: 65b6f8bf79  -s ours

Change-Id: I0e5428c6ef4ab98421f1892e7a3eb70e172d66b8
2017-07-16 23:04:29 +00:00
Philip Cuadra
65b6f8bf79 Merge "Use new powerHintAsync when available" into oc-dr1-dev
am: f54dbc5253  -s ours

Change-Id: Ic1ec1459c003c9a0c0f0c2a807b147a14a511af3
2017-07-16 22:52:03 +00:00
TreeHugger Robot
f54dbc5253 Merge "Use new powerHintAsync when available" into oc-dr1-dev 2017-07-16 22:45:29 +00:00
Lorenzo Colitti
82b734c1bc Merge "CaptivePortalLogin ignores some ssl errors." into oc-dr1-dev am: a77bc91b55 -s ours
am: 9795430095  -s ours

Change-Id: Ib1530bbebdbfbeeb82900e2f1dc7bc08498da6ba
2017-07-16 07:57:54 +00:00
Lorenzo Colitti
9795430095 Merge "CaptivePortalLogin ignores some ssl errors." into oc-dr1-dev
am: a77bc91b55  -s ours

Change-Id: Ib184bce22c6d4e94983f5a2ad9ddc21cd1c5392a
2017-07-16 07:48:56 +00:00
Lorenzo Colitti
a77bc91b55 Merge "CaptivePortalLogin ignores some ssl errors." into oc-dr1-dev 2017-07-16 07:38:12 +00:00
TreeHugger Robot
080838c0a4 Merge "Test if allocation supported; @removed clean up." 2017-07-16 05:18:36 +00:00
Jeff Sharkey
4233f032fd Test if allocation supported; @removed clean up.
SM.allocateBytes() doesn't offer a clear way to detect if a failed
request could ever succeed.  (For example, we can never work with
pipes, or files on an unsupported storage device.)  So give
developers a first-class API to test if allocation is supported.

If the underlying filesystem doesn't support fallocate(), fall back
to ftruncate() instead of failing completely.

Clean up @removed APIs that were refactoring during API 26 review
process.

Remove support for storing downloads on the /cache partition, which
doesn't exist on many devices.

Bug: 63057877
Test: bit DownloadProviderTests:*
Test: bit DocumentsUITests:com.android.documentsui.services.CopyJobTest
Test: bit DocumentsUITests:com.android.documentsui.services.MoveJobTest
Change-Id: I85d42a1a7240034b4f2a6f359011ac182bdce36e
2017-07-15 21:08:56 -06:00
TreeHugger Robot
42b4446b0e Merge "Iterate NetworkPolicy towards SubscriptionPlan." 2017-07-15 19:57:08 +00:00
Lorenzo Colitti
06820aa04a Merge "Make failure to set addrgenmode a non-fatal error." into oc-dr1-dev am: 90bf56da0d
am: 475dad5fc9

Change-Id: I7e620b86c4cfdf3ba04526d40b991f060ef4167d
2017-07-15 19:52:01 +00:00
Lorenzo Colitti
475dad5fc9 Merge "Make failure to set addrgenmode a non-fatal error." into oc-dr1-dev
am: 90bf56da0d

Change-Id: If16c79d6b999a413f991234907cd92403269c8a8
2017-07-15 19:44:46 +00:00
Lorenzo Colitti
90bf56da0d Merge "Make failure to set addrgenmode a non-fatal error." into oc-dr1-dev 2017-07-15 19:38:00 +00:00
Hugo Benichi
2da6619230 CaptivePortalLogin ignores some ssl errors.
This patch changes the ssl error handler of the captive portal login
activity to ignore errors for resources coming from a different hostname
that the top-level page currently loading.

This allows logging into misconfigured portals that incorrectly bans ssl
to some hostnames necessary for loading their portal login pages.

Bug: 62332137
Test: manually tested with captive portal entwork.

(cherry pick from commit 22542ed480 which
was skipped from merging into oc-dr1-dev-plus-aosp because of previous
cherry picks and incorrect Merged-In annotations)

Change-Id: Idb6ffac2d97b15cfdbe524b91c84dd29ae0be00b
Merged-In: Idb6ffac2d97b15cfdbe524b91c84dd29ae0be00b
2017-07-16 00:30:36 +09:00
Maurice Lam
68cf9f538b Merge "Load internal resources using name rather than ID" into oc-dr1-dev am: 43e249ff27
am: f4d873fd56

Change-Id: If4b688989d8f7c0da73e32a98a9ebba619c53397
2017-07-15 15:09:44 +00:00
Maurice Lam
f4d873fd56 Merge "Load internal resources using name rather than ID" into oc-dr1-dev
am: 43e249ff27

Change-Id: Ifa239877c607468fe4ca9bdb87f712b10633762b
2017-07-15 15:01:13 +00:00