OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "Add provider level support for PDF Thumbnails"
TreeHugger Robot [Mon, 17 Jul 2017 18:07:33 +0000 (18:07 +0000)]
Merge "Add provider level support for PDF Thumbnails"

7 years agoMerge "Remove Keyguard owner info from RelativeLayout." into oc-dr1-dev am: f99ac67bdb
Geoffrey Pitsch [Mon, 17 Jul 2017 17:42:18 +0000 (17:42 +0000)]
Merge "Remove Keyguard owner info from RelativeLayout." into oc-dr1-dev am: f99ac67bdb
am: b618e8fe39

Change-Id: I08f58463bb236d11f45a77408be978463ae5f782

7 years agoMerge "Remove Keyguard owner info from RelativeLayout." into oc-dr1-dev
Geoffrey Pitsch [Mon, 17 Jul 2017 17:37:45 +0000 (17:37 +0000)]
Merge "Remove Keyguard owner info from RelativeLayout." into oc-dr1-dev
am: f99ac67bdb

Change-Id: Icf54f81733d19d91913989451a5fc07ff5f1566d

7 years agoMerge "Remove Keyguard owner info from RelativeLayout." into oc-dr1-dev
Geoffrey Pitsch [Mon, 17 Jul 2017 17:31:26 +0000 (17:31 +0000)]
Merge "Remove Keyguard owner info from RelativeLayout." into oc-dr1-dev

7 years agoMerge "Add TimeZoneRulesDataContract to system API"
TreeHugger Robot [Mon, 17 Jul 2017 16:44:47 +0000 (16:44 +0000)]
Merge "Add TimeZoneRulesDataContract to system API"

7 years agoMerge "Enforce policy for camera gesture in keyguard" into oc-dr1-dev am: daa1539a5e
Esteban Talavera [Mon, 17 Jul 2017 16:34:29 +0000 (16:34 +0000)]
Merge "Enforce policy for camera gesture in keyguard" into oc-dr1-dev am: daa1539a5e
am: 1f439e4bc7

Change-Id: I99b1d51c154bcda4121fd818ec17a3c90431443d

7 years agoMerge "Added check for AOD before showing volume dialog." into oc-dr1-dev am: 47e4fde159
Beverly [Mon, 17 Jul 2017 16:27:34 +0000 (16:27 +0000)]
Merge "Added check for AOD before showing volume dialog." into oc-dr1-dev am: 47e4fde159
am: 7be3f44673

Change-Id: If5fa613b100a5d216575ad4f53523f706edcfc07

7 years agoMerge "Enforce policy for camera gesture in keyguard" into oc-dr1-dev
Esteban Talavera [Mon, 17 Jul 2017 16:27:30 +0000 (16:27 +0000)]
Merge "Enforce policy for camera gesture in keyguard" into oc-dr1-dev
am: daa1539a5e

Change-Id: I30d024c2d4e11f4e4c246b123723a00d28af78ee

7 years agoMerge "Enforce policy for camera gesture in keyguard" into oc-dr1-dev
TreeHugger Robot [Mon, 17 Jul 2017 16:14:44 +0000 (16:14 +0000)]
Merge "Enforce policy for camera gesture in keyguard" into oc-dr1-dev

7 years agoMerge "Added check for AOD before showing volume dialog." into oc-dr1-dev
Beverly [Mon, 17 Jul 2017 16:13:34 +0000 (16:13 +0000)]
Merge "Added check for AOD before showing volume dialog." into oc-dr1-dev
am: 47e4fde159

Change-Id: Ic154e4fea33cbec26407598325c44a4dcbbcceb7

7 years agoMerge "Added check for AOD before showing volume dialog." into oc-dr1-dev
TreeHugger Robot [Mon, 17 Jul 2017 15:59:04 +0000 (15:59 +0000)]
Merge "Added check for AOD before showing volume dialog." into oc-dr1-dev

7 years agoMerge "Credential FRP: remove GateKeeper"
Andrew Scull [Mon, 17 Jul 2017 15:53:36 +0000 (15:53 +0000)]
Merge "Credential FRP: remove GateKeeper"

7 years agoRemove Keyguard owner info from RelativeLayout.
Geoffrey Pitsch [Mon, 17 Jul 2017 13:31:55 +0000 (09:31 -0400)]
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

7 years agoMerge "Docs: VPNs under Android O should promote to the foreground" into oc-dev am...
Benjamin Miller [Mon, 17 Jul 2017 14:45:19 +0000 (14:45 +0000)]
Merge "Docs: VPNs under Android O should promote to the foreground" into oc-dev am: ca007e525b am: 2ecc198877
am: 3404cc761c

Change-Id: Ifb719b609626416378aec05715717156774e575a

7 years agoMerge "Docs: VPNs under Android O should promote to the foreground" into oc-dev am...
Benjamin Miller [Mon, 17 Jul 2017 14:41:07 +0000 (14:41 +0000)]
Merge "Docs: VPNs under Android O should promote to the foreground" into oc-dev am: ca007e525b am: 3082216de2
am: 105c3b1df4

Change-Id: Ic23b650fdd29739f312bf62fbab52196429c3f2e

7 years agoMerge "Improved GNSS state debug logs" into oc-dr1-dev am: bd2d9f8fdf
Wyatt Riley [Mon, 17 Jul 2017 14:38:58 +0000 (14:38 +0000)]
Merge "Improved GNSS state debug logs" into oc-dr1-dev am: bd2d9f8fdf
am: 05df03461e

Change-Id: I07fe2ab0090ffeebe90e62079db7926974b3b86d

7 years agoMerge "Docs: VPNs under Android O should promote to the foreground" into oc-dev am...
Benjamin Miller [Mon, 17 Jul 2017 14:38:56 +0000 (14:38 +0000)]
Merge "Docs: VPNs under Android O should promote to the foreground" into oc-dev am: ca007e525b
am: 2ecc198877

Change-Id: I6d74a3bd8e7c84f4f2a571f83888a0f9d485dc27

7 years agoMerge "Docs: VPNs under Android O should promote to the foreground" into oc-dev am...
Benjamin Miller [Mon, 17 Jul 2017 14:32:30 +0000 (14:32 +0000)]
Merge "Docs: VPNs under Android O should promote to the foreground" into oc-dev am: ca007e525b
am: 3082216de2

Change-Id: Id9720c51f6192831ede99fd0af0451b43026e663

7 years agoMerge "Improved GNSS state debug logs" into oc-dr1-dev
Wyatt Riley [Mon, 17 Jul 2017 14:28:33 +0000 (14:28 +0000)]
Merge "Improved GNSS state debug logs" into oc-dr1-dev
am: bd2d9f8fdf

Change-Id: I414ff67d392f5d11a2b5919556ceff6fc6e1b393

7 years agoMerge "Docs: VPNs under Android O should promote to the foreground" into oc-dev
Benjamin Miller [Mon, 17 Jul 2017 14:23:25 +0000 (14:23 +0000)]
Merge "Docs: VPNs under Android O should promote to the foreground" into oc-dev
am: ca007e525b

Change-Id: If2a06d8e8e5fe2034e22c86dabf68bf7d3f79bb0

7 years agoMerge "Docs: VPNs under Android O should promote to the foreground" into oc-dev
Benjamin Miller [Mon, 17 Jul 2017 14:22:24 +0000 (14:22 +0000)]
Merge "Docs: VPNs under Android O should promote to the foreground" into oc-dev
am: ca007e525b

Change-Id: Ife96d44a6c8687be49616562f1834c1e2cc17b7d

7 years agoMerge "Improved GNSS state debug logs" into oc-dr1-dev
TreeHugger Robot [Mon, 17 Jul 2017 14:21:01 +0000 (14:21 +0000)]
Merge "Improved GNSS state debug logs" into oc-dr1-dev

7 years agoMerge "Docs: VPNs under Android O should promote to the foreground" into oc-dev
TreeHugger Robot [Mon, 17 Jul 2017 14:11:55 +0000 (14:11 +0000)]
Merge "Docs: VPNs under Android O should promote to the foreground" into oc-dev

7 years agoEnforce policy for camera gesture in keyguard
Esteban Talavera [Fri, 14 Jul 2017 15:14:07 +0000 (16:14 +0100)]
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

7 years agoMerge "Added check for null metadata."
TreeHugger Robot [Mon, 17 Jul 2017 13:43:17 +0000 (13:43 +0000)]
Merge "Added check for null metadata."

7 years agoMerge ""Block notifications screen off" setting is used"
TreeHugger Robot [Mon, 17 Jul 2017 13:38:06 +0000 (13:38 +0000)]
Merge ""Block notifications screen off" setting is used"

7 years agoCredential FRP: remove GateKeeper
Andrew Scull [Wed, 12 Jul 2017 14:09:45 +0000 (15:09 +0100)]
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

7 years agoAdded check for AOD before showing volume dialog.
Beverly [Wed, 12 Jul 2017 14:58:22 +0000 (10:58 -0400)]
Added check for AOD before showing volume dialog.

Fixes: 62598406

Test: runtest systemui

Change-Id: I407eed0e0559ef0bc61d36ad9c5e84c6924c161e

7 years agoMerge "Track libcore commit 58228b82c64808eddac02736f18f5003730443a0" am: 29926838d4...
Przemyslaw Szczepaniak [Mon, 17 Jul 2017 11:11:52 +0000 (11:11 +0000)]
Merge "Track libcore commit 58228b82c64808eddac02736f18f5003730443a0" am: 29926838d4 am: 40dfadda77 am: 004ae3ae71
am: 9022cf0c2e

Change-Id: Ic50e0daa27503660cce8f65a3fbb84f8ee5d323e

7 years agoMerge "Track libcore commit 58228b82c64808eddac02736f18f5003730443a0" am: 29926838d4...
Przemyslaw Szczepaniak [Mon, 17 Jul 2017 11:02:55 +0000 (11:02 +0000)]
Merge "Track libcore commit 58228b82c64808eddac02736f18f5003730443a0" am: 29926838d4 am: 40dfadda77
am: 004ae3ae71

Change-Id: I74a0d7f3623bb1e6fdf6142a702c0e5dcfe1d5ee

7 years agoMerge "Track libcore commit 58228b82c64808eddac02736f18f5003730443a0" am: 29926838d4
Przemyslaw Szczepaniak [Mon, 17 Jul 2017 10:55:37 +0000 (10:55 +0000)]
Merge "Track libcore commit 58228b82c64808eddac02736f18f5003730443a0" am: 29926838d4
am: 40dfadda77

Change-Id: I8b74cd195f4133e478a63ad2066856ebe32b6231

7 years agoMerge "Track libcore commit 58228b82c64808eddac02736f18f5003730443a0"
Przemyslaw Szczepaniak [Mon, 17 Jul 2017 10:48:50 +0000 (10:48 +0000)]
Merge "Track libcore commit 58228b82c64808eddac02736f18f5003730443a0"
am: 29926838d4

Change-Id: I7c0f6b9c064ce7eba1eb0cd4c6bca7464ce24100

7 years agoMerge "Track libcore commit 58228b82c64808eddac02736f18f5003730443a0"
Przemyslaw Szczepaniak [Mon, 17 Jul 2017 10:37:35 +0000 (10:37 +0000)]
Merge "Track libcore commit 58228b82c64808eddac02736f18f5003730443a0"

7 years agoUse try with resources in BackupManagerService
Robert Berry [Fri, 14 Jul 2017 14:52:59 +0000 (15:52 +0100)]
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

7 years agoMerge "Use new powerHintAsync when available" into oc-dr1-dev am: f54dbc5253 -s...
Philip Cuadra [Sun, 16 Jul 2017 23:04:29 +0000 (23:04 +0000)]
Merge "Use new powerHintAsync when available" into oc-dr1-dev am: f54dbc5253  -s ours
am: 65b6f8bf79  -s ours

Change-Id: I0e5428c6ef4ab98421f1892e7a3eb70e172d66b8

7 years agoMerge "Use new powerHintAsync when available" into oc-dr1-dev
Philip Cuadra [Sun, 16 Jul 2017 22:52:03 +0000 (22:52 +0000)]
Merge "Use new powerHintAsync when available" into oc-dr1-dev
am: f54dbc5253  -s ours

Change-Id: Ic1ec1459c003c9a0c0f0c2a807b147a14a511af3

7 years agoMerge "Use new powerHintAsync when available" into oc-dr1-dev
TreeHugger Robot [Sun, 16 Jul 2017 22:45:29 +0000 (22:45 +0000)]
Merge "Use new powerHintAsync when available" into oc-dr1-dev

7 years agoMerge "CaptivePortalLogin ignores some ssl errors." into oc-dr1-dev am: a77bc91b55...
Lorenzo Colitti [Sun, 16 Jul 2017 07:57:54 +0000 (07:57 +0000)]
Merge "CaptivePortalLogin ignores some ssl errors." into oc-dr1-dev am: a77bc91b55  -s ours
am: 9795430095  -s ours

Change-Id: Ib1530bbebdbfbeeb82900e2f1dc7bc08498da6ba

7 years agoMerge "CaptivePortalLogin ignores some ssl errors." into oc-dr1-dev
Lorenzo Colitti [Sun, 16 Jul 2017 07:48:56 +0000 (07:48 +0000)]
Merge "CaptivePortalLogin ignores some ssl errors." into oc-dr1-dev
am: a77bc91b55  -s ours

Change-Id: Ib184bce22c6d4e94983f5a2ad9ddc21cd1c5392a

7 years agoMerge "CaptivePortalLogin ignores some ssl errors." into oc-dr1-dev
Lorenzo Colitti [Sun, 16 Jul 2017 07:38:12 +0000 (07:38 +0000)]
Merge "CaptivePortalLogin ignores some ssl errors." into oc-dr1-dev

7 years agoMerge "Test if allocation supported; @removed clean up."
TreeHugger Robot [Sun, 16 Jul 2017 05:18:36 +0000 (05:18 +0000)]
Merge "Test if allocation supported; @removed clean up."

7 years agoTest if allocation supported; @removed clean up.
Jeff Sharkey [Sat, 15 Jul 2017 18:58:38 +0000 (12:58 -0600)]
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

7 years agoMerge "Iterate NetworkPolicy towards SubscriptionPlan."
TreeHugger Robot [Sat, 15 Jul 2017 19:57:08 +0000 (19:57 +0000)]
Merge "Iterate NetworkPolicy towards SubscriptionPlan."

7 years agoMerge "Make failure to set addrgenmode a non-fatal error." into oc-dr1-dev am: 90bf56da0d
Lorenzo Colitti [Sat, 15 Jul 2017 19:52:01 +0000 (19:52 +0000)]
Merge "Make failure to set addrgenmode a non-fatal error." into oc-dr1-dev am: 90bf56da0d
am: 475dad5fc9

Change-Id: I7e620b86c4cfdf3ba04526d40b991f060ef4167d

7 years agoMerge "Make failure to set addrgenmode a non-fatal error." into oc-dr1-dev
Lorenzo Colitti [Sat, 15 Jul 2017 19:44:46 +0000 (19:44 +0000)]
Merge "Make failure to set addrgenmode a non-fatal error." into oc-dr1-dev
am: 90bf56da0d

Change-Id: If16c79d6b999a413f991234907cd92403269c8a8

7 years agoMerge "Make failure to set addrgenmode a non-fatal error." into oc-dr1-dev
Lorenzo Colitti [Sat, 15 Jul 2017 19:38:00 +0000 (19:38 +0000)]
Merge "Make failure to set addrgenmode a non-fatal error." into oc-dr1-dev

7 years agoCaptivePortalLogin ignores some ssl errors.
Hugo Benichi [Sat, 17 Jun 2017 04:36:35 +0000 (13:36 +0900)]
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 22542ed48090e2e6e9474b658fdd368041a4060b 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

7 years agoMerge "Load internal resources using name rather than ID" into oc-dr1-dev am: 43e249ff27
Maurice Lam [Sat, 15 Jul 2017 15:09:44 +0000 (15:09 +0000)]
Merge "Load internal resources using name rather than ID" into oc-dr1-dev am: 43e249ff27
am: f4d873fd56

Change-Id: If4b688989d8f7c0da73e32a98a9ebba619c53397

7 years agoMerge "Load internal resources using name rather than ID" into oc-dr1-dev
Maurice Lam [Sat, 15 Jul 2017 15:01:13 +0000 (15:01 +0000)]
Merge "Load internal resources using name rather than ID" into oc-dr1-dev
am: 43e249ff27

Change-Id: Ifa239877c607468fe4ca9bdb87f712b10633762b

7 years agoMerge "Load internal resources using name rather than ID" into oc-dr1-dev
TreeHugger Robot [Sat, 15 Jul 2017 14:53:44 +0000 (14:53 +0000)]
Merge "Load internal resources using name rather than ID" into oc-dr1-dev

7 years agoMerge "Fix nobootanimation toggle"
TreeHugger Robot [Sat, 15 Jul 2017 08:53:51 +0000 (08:53 +0000)]
Merge "Fix nobootanimation toggle"

7 years agoMerge "Clean up @hide usages in cts tests"
Evan Rosky [Sat, 15 Jul 2017 01:17:35 +0000 (01:17 +0000)]
Merge "Clean up @hide usages in cts tests"

7 years agoMerge "Don't crash when external storage is unmounted"
TreeHugger Robot [Sat, 15 Jul 2017 01:09:46 +0000 (01:09 +0000)]
Merge "Don't crash when external storage is unmounted"

7 years agoMerge "Two more numbers in the preload log"
TreeHugger Robot [Sat, 15 Jul 2017 00:46:16 +0000 (00:46 +0000)]
Merge "Two more numbers in the preload log"

7 years agoMerge "Additional metrics for PM init"
Fyodor Kupolov [Fri, 14 Jul 2017 23:54:23 +0000 (23:54 +0000)]
Merge "Additional metrics for PM init"

7 years agoMerge "Merge "Update Java doc of SensorManager.createDirectChannel" into oc-dev am...
Peng Xu [Fri, 14 Jul 2017 23:28:51 +0000 (23:28 +0000)]
Merge "Merge "Update Java doc of SensorManager.createDirectChannel" into oc-dev am: 17e641dae5 am: 6c5ee3d894" into oc-dr1-dev-plus-aosp
am: 6acd78fbd4

Change-Id: I1c26db45f1e33e7b03ed0e22b8868cca51e55e27

7 years agoMerge "Update Java doc of SensorManager.createDirectChannel" into oc-dev am: 17e641da...
Peng Xu [Fri, 14 Jul 2017 23:27:14 +0000 (23:27 +0000)]
Merge "Update Java doc of SensorManager.createDirectChannel" into oc-dev am: 17e641dae5 am: 7bef937503
am: 5f309c6fd3

Change-Id: I03ff03b1ffe5e275f1551c3946eddc4fd766fd7b

7 years agoMerge "Merge "Update Java doc of SensorManager.createDirectChannel" into oc-dev am...
Android Build Merger (Role) [Fri, 14 Jul 2017 23:21:19 +0000 (23:21 +0000)]
Merge "Merge "Update Java doc of SensorManager.createDirectChannel" into oc-dev am: 17e641dae5 am: 6c5ee3d894" into oc-dr1-dev-plus-aosp

7 years agoMerge "Update Java doc of SensorManager.createDirectChannel" into oc-dev am: 17e641dae5
Peng Xu [Fri, 14 Jul 2017 23:19:52 +0000 (23:19 +0000)]
Merge "Update Java doc of SensorManager.createDirectChannel" into oc-dev am: 17e641dae5
am: 6c5ee3d894

Change-Id: If3d4bc3338c4baec3c79512140321b65e7ef949f

7 years agoMerge "Update Java doc of SensorManager.createDirectChannel" into oc-dev am: 17e641dae5
Peng Xu [Fri, 14 Jul 2017 23:18:30 +0000 (23:18 +0000)]
Merge "Update Java doc of SensorManager.createDirectChannel" into oc-dev am: 17e641dae5
am: 7bef937503

Change-Id: I108570f80973c02be45ea450747ffbb8cd0e094d

7 years agoFix nobootanimation toggle
Kalle Raita [Fri, 14 Jul 2017 23:18:16 +0000 (16:18 -0700)]
Fix nobootanimation toggle

The sf.debug.nobootanimation was apparently broken in a recent
refactoring. Flipping the boolean in the utils fixes the issue.

Left some additional logging behind.

Test: marlin-eng boots
Test: my test can prevent the boot animation
Test: shell stop start shows boot animation
Change-Id: I815708a2f16a3a8688cf1a53695e5a8d43194575

7 years agoMerge "Update Java doc of SensorManager.createDirectChannel" into oc-dev
Peng Xu [Fri, 14 Jul 2017 23:07:11 +0000 (23:07 +0000)]
Merge "Update Java doc of SensorManager.createDirectChannel" into oc-dev
am: 17e641dae5

Change-Id: I3689c95bb249a77e6736f66e23065474a0916b9f

7 years agoMerge "Update Java doc of SensorManager.createDirectChannel" into oc-dev
Peng Xu [Fri, 14 Jul 2017 23:07:11 +0000 (23:07 +0000)]
Merge "Update Java doc of SensorManager.createDirectChannel" into oc-dev
am: 17e641dae5

Change-Id: I4391dafa9d153213e35ac58bceb8d2f4c958fde0

7 years agoDon't crash when external storage is unmounted
Christopher Tate [Thu, 13 Jul 2017 22:18:38 +0000 (15:18 -0700)]
Don't crash when external storage is unmounted

In particular, don't NPE if an app calls getExternalFilesDir() while
external storage is unmounted.  We were making assumptions about the
length of the array returned by the "tell me about all the external
locations" method, but in unmounted cases that array can be zero-sized.

(And similar for getObbDir() and getExternalCacheDir().)

Bug: 63604311
Test: manual
Change-Id: I4dec828161245047182e6fd39a0df10dd1681ba2

7 years agoMerge "Update Java doc of SensorManager.createDirectChannel" into oc-dev
TreeHugger Robot [Fri, 14 Jul 2017 22:55:15 +0000 (22:55 +0000)]
Merge "Update Java doc of SensorManager.createDirectChannel" into oc-dev

7 years agoIterate NetworkPolicy towards SubscriptionPlan.
Jeff Sharkey [Thu, 13 Jul 2017 22:47:32 +0000 (16:47 -0600)]
Iterate NetworkPolicy towards SubscriptionPlan.

Add new SubscriptionPlan API to describe the various types of carrier
data plans.  Internally the OS will only use the first plan for
driving policy, but it will blindly plumb through the details for
Settings to display any secondary plans.

As part of getting Settings ready to roll towards SubscriptionPlan,
reduce references to NetworkPolicy internal fields.  All usage cycle
details are now obtained from an Iterator which converts to
SubscriptionPlan under the hood.

Replace all data usage cycle calculation with new SubscriptionPlan
implementation, and retrofit large suite of existing tests to
exercise and verify the new logic.

Offer a debugging property that can be used to return "fake" plan
examples for testing.

Bug: 63391323
Test: bit FrameworksServicesTests:com.android.server.NetworkPolicyManagerServiceTest
Exempt-From-Owner-Approval: Bug 63673347
Change-Id: I889c653980eeb7887abdfa4f5b6986f35855ee6d

7 years agoMerge "Add more details to dumpsys meminfo -d" am: 4ccf8b83a1 am: 41718e2413 am:...
Mathieu Chartier [Fri, 14 Jul 2017 22:02:13 +0000 (22:02 +0000)]
Merge "Add more details to dumpsys meminfo -d" am: 4ccf8b83a1 am: 41718e2413 am: 811fa6d001
am: 151807c109

Change-Id: Iac4e5863dfb7fa69586abd396e5baece8367664e

7 years agoMerge "Don't tag bugreport notifications as System."
TreeHugger Robot [Fri, 14 Jul 2017 22:00:01 +0000 (22:00 +0000)]
Merge "Don't tag bugreport notifications as System."

7 years agoMerge "Add more details to dumpsys meminfo -d" am: 4ccf8b83a1 am: 41718e2413
Mathieu Chartier [Fri, 14 Jul 2017 21:54:07 +0000 (21:54 +0000)]
Merge "Add more details to dumpsys meminfo -d" am: 4ccf8b83a1 am: 41718e2413
am: 811fa6d001

Change-Id: I309ff9dc070716cc250a7c06821775c185ea6ebc

7 years agoMerge "Take a wrench to the pipes" into oc-dr1-dev am: e1036c93a0
Jason Monk [Fri, 14 Jul 2017 21:47:08 +0000 (21:47 +0000)]
Merge "Take a wrench to the pipes" into oc-dr1-dev am: e1036c93a0
am: bcfe19ebe8

Change-Id: I641b3b59958d360dc622bb55ce4eef1a49752a0e

7 years agoMerge "Add more details to dumpsys meminfo -d" am: 4ccf8b83a1
Mathieu Chartier [Fri, 14 Jul 2017 21:47:03 +0000 (21:47 +0000)]
Merge "Add more details to dumpsys meminfo -d" am: 4ccf8b83a1
am: 41718e2413

Change-Id: Ie3052ec70e478b69629e16526542cb616168b58b

7 years agoMerge "Take a wrench to the pipes" into oc-dr1-dev
Jason Monk [Fri, 14 Jul 2017 21:40:36 +0000 (21:40 +0000)]
Merge "Take a wrench to the pipes" into oc-dr1-dev
am: e1036c93a0

Change-Id: I1a4606bc6996df2aa4b67645fbb06f0c2b46cd5c

7 years agoMerge "[Companion] Close chooser dialog on device tap"
TreeHugger Robot [Fri, 14 Jul 2017 21:38:56 +0000 (21:38 +0000)]
Merge "[Companion] Close chooser dialog on device tap"

7 years agoMerge "Add more details to dumpsys meminfo -d"
Mathieu Chartier [Fri, 14 Jul 2017 21:37:43 +0000 (21:37 +0000)]
Merge "Add more details to dumpsys meminfo -d"
am: 4ccf8b83a1

Change-Id: I54fadc1bd30cc508faccabe1553c2db4cc040904

7 years agoAdd provider level support for PDF Thumbnails
Julian Mancini [Tue, 11 Jul 2017 19:51:35 +0000 (12:51 -0700)]
Add provider level support for PDF Thumbnails

Bug: 63586859
Test: N/A
Change-Id: I14b0dec18493478b3bd3585eab62aa64da909838

7 years agoMerge "Take a wrench to the pipes" into oc-dr1-dev
TreeHugger Robot [Fri, 14 Jul 2017 21:33:51 +0000 (21:33 +0000)]
Merge "Take a wrench to the pipes" into oc-dr1-dev

7 years agoMerge "Fix mobile signal colors to match wifi et al" into oc-dr1-dev am: ed4d5fc925
Evan Laird [Fri, 14 Jul 2017 21:30:36 +0000 (21:30 +0000)]
Merge "Fix mobile signal colors to match wifi et al" into oc-dr1-dev am: ed4d5fc925
am: d0ee6987e1

Change-Id: I4e67ee75df6c53cf6a8133dc44cdb97dc9ab1a24

7 years agoMerge "Fix mobile signal colors to match wifi et al" into oc-dr1-dev
Evan Laird [Fri, 14 Jul 2017 21:25:05 +0000 (21:25 +0000)]
Merge "Fix mobile signal colors to match wifi et al" into oc-dr1-dev
am: ed4d5fc925

Change-Id: I7f97967d9cb7c6131489ab7202734c24e4076d2a

7 years agoMerge "Add more details to dumpsys meminfo -d"
Treehugger Robot [Fri, 14 Jul 2017 21:21:39 +0000 (21:21 +0000)]
Merge "Add more details to dumpsys meminfo -d"

7 years agoMerge "Fix mobile signal colors to match wifi et al" into oc-dr1-dev
TreeHugger Robot [Fri, 14 Jul 2017 21:16:44 +0000 (21:16 +0000)]
Merge "Fix mobile signal colors to match wifi et al" into oc-dr1-dev

7 years agoMerge "Fix calculation of RelativeLayout width in RTL mode"
TreeHugger Robot [Fri, 14 Jul 2017 21:10:57 +0000 (21:10 +0000)]
Merge "Fix calculation of RelativeLayout width in RTL mode"

7 years agoMerge "removeAll unregisters callbacks in the wrong order, causing exception"
TreeHugger Robot [Fri, 14 Jul 2017 21:07:12 +0000 (21:07 +0000)]
Merge "removeAll unregisters callbacks in the wrong order, causing exception"

7 years agoMerge "Merge "SystemServiceManager: Change from wall time to boottiime" into oc-dr1...
Android Build Merger (Role) [Fri, 14 Jul 2017 21:06:45 +0000 (21:06 +0000)]
Merge "Merge "SystemServiceManager: Change from wall time to boottiime" into oc-dr1-dev am: cf70671a75 am: dc458c33d6"

7 years agoMerge "SystemServiceManager: Change from wall time to boottiime" into oc-dr1-dev...
Wei Wang [Fri, 14 Jul 2017 21:05:43 +0000 (21:05 +0000)]
Merge "SystemServiceManager: Change from wall time to boottiime" into oc-dr1-dev am: cf70671a75
am: dc458c33d6

Change-Id: I0068e1d5d869002d140d66f86117aa89a0b05456

7 years agoTwo more numbers in the preload log
Makoto Onuki [Fri, 14 Jul 2017 21:05:18 +0000 (14:05 -0700)]
Two more numbers in the preload log

Bug 63136392
Test: Manual

Change-Id: I0fa1dffa80d4d06cbfc41e0b40ddce5d324052ec

7 years agoAdditional metrics for PM init
Fyodor Kupolov [Wed, 12 Jul 2017 23:38:40 +0000 (16:38 -0700)]
Additional metrics for PM init

Test: simulated build fingerprint change and checked logs
Bug: 62462279
Change-Id: I8446fcc9beed461a4554e79ab2b820839ced7c2f

7 years agoMerge "Add more details to dumpsys meminfo -d"
Mathieu Chartier [Fri, 14 Jul 2017 20:58:13 +0000 (20:58 +0000)]
Merge "Add more details to dumpsys meminfo -d"

7 years agoMerge "SystemServiceManager: Change from wall time to boottiime" into oc-dr1-dev
Wei Wang [Fri, 14 Jul 2017 20:56:13 +0000 (20:56 +0000)]
Merge "SystemServiceManager: Change from wall time to boottiime" into oc-dr1-dev
am: cf70671a75

Change-Id: Ib7e61f66b52525d59fc8fe111124b859ddc52e04

7 years agoMerge "Improve documentation for custome token."
Jian Sun [Fri, 14 Jul 2017 20:55:39 +0000 (20:55 +0000)]
Merge "Improve documentation for custome token."

7 years agoMerge "SystemServiceManager: Change from wall time to boottiime" into oc-dr1-dev
Wei Wang [Fri, 14 Jul 2017 20:42:23 +0000 (20:42 +0000)]
Merge "SystemServiceManager: Change from wall time to boottiime" into oc-dr1-dev

7 years agoMerge "Move palette constants to XML" into oc-dr1-dev am: 8d5b831095
Lucas Dupin [Fri, 14 Jul 2017 20:39:22 +0000 (20:39 +0000)]
Merge "Move palette constants to XML" into oc-dr1-dev am: 8d5b831095
am: 486ce65234

Change-Id: Ib2ff59f4ac52799d420ee3353cedb4762f7a02b1

7 years agoMerge "Fix 'cmd notification' crashes when no command is set."
TreeHugger Robot [Fri, 14 Jul 2017 20:36:13 +0000 (20:36 +0000)]
Merge "Fix 'cmd notification' crashes when no command is set."

7 years agoMerge "Move palette constants to XML" into oc-dr1-dev
Lucas Dupin [Fri, 14 Jul 2017 20:31:33 +0000 (20:31 +0000)]
Merge "Move palette constants to XML" into oc-dr1-dev
am: 8d5b831095

Change-Id: I8ced4304e4e6f6f766c7160e25122974ec0c9548

7 years agoMerge "Better preload drawable logging"
TreeHugger Robot [Fri, 14 Jul 2017 20:31:07 +0000 (20:31 +0000)]
Merge "Better preload drawable logging"

7 years agoMerge "Use new powerHintAsync when available" into oc-dr1-dev-plus-aosp
Philip Cuadra [Fri, 14 Jul 2017 20:27:09 +0000 (20:27 +0000)]
Merge "Use new powerHintAsync when available" into oc-dr1-dev-plus-aosp
am: d33013ade3

Change-Id: Ic9acd23267102bd4f7a6a924ec45c2efeac18aa1

7 years agoMerge "Move palette constants to XML" into oc-dr1-dev
TreeHugger Robot [Fri, 14 Jul 2017 20:24:37 +0000 (20:24 +0000)]
Merge "Move palette constants to XML" into oc-dr1-dev

7 years agoMerge "Disable smart sharing for password fields."
TreeHugger Robot [Fri, 14 Jul 2017 20:21:59 +0000 (20:21 +0000)]
Merge "Disable smart sharing for password fields."

7 years agoUse new powerHintAsync when available
Philip Cuadra [Wed, 12 Jul 2017 00:01:06 +0000 (17:01 -0700)]
Use new powerHintAsync when available

Use the async version of powerHint when available.

Bug: 62377008
Test: Run systrace, confirm powerHints are async HIDL transactions
Change-Id: I3bb4022b78d380b054bf13008bb8b0d399bf1955
Merged-In: I3bb4022b78d380b054bf13008bb8b0d399bf1955

7 years agoMerge "Use new powerHintAsync when available" into oc-dr1-dev-plus-aosp
TreeHugger Robot [Fri, 14 Jul 2017 20:19:02 +0000 (20:19 +0000)]
Merge "Use new powerHintAsync when available" into oc-dr1-dev-plus-aosp

7 years agoremoveAll unregisters callbacks in the wrong order, causing exception
Guliz Tuncay [Fri, 14 Jul 2017 17:19:45 +0000 (10:19 -0700)]
removeAll unregisters callbacks in the wrong order, causing exception

If we switch from a user with active SpellCheckerBindGroups to another
user, an exception is thrown and the system reports that the user switch
was not successful. The source of this exception is removeAll() method
used in unbindServiceLocked(). It seems that removeAll() retrieves the
number of callbacks of mListeners object and removes the registered
callbacks of this object one by one in a loop. However, this causes the
size of the mListeners change along the way and each element's index
decreases by one at each iteration, causing the loop to eventually try
to operate on a null object. This error was introduced by
I38942765ed6bec6713757b1d5f325e7a633c2ba7

Fixes: 63703656
Test: Manually tested as follows
   1. Flash a new OS image with this change
   2. Complete the setup wizard (if any)
   3. make ApiDemos -j
   4. adb install -r out/target/product/marlin/data/app/ApiDemos/ApiDemos.apk
   5. Open "Api Demos" app
   6. Go to Views/Text/EditText
   7. Focus in to the first EditText then type "aaa"
   8. Focus in to the second EditText then type "aaa"
   9. Run `adb shell dumpsys textservices` to confirm that there are multiple
      listener in one of the items in "Spell Checker Bind Groups" section.
  10. Switch to the Guest user.
  11. Run `adb logcat -s SystemServiceManager:E` to confirm that there is no
      NullPointerException
Change-Id: Ibfdb07266a5a9127425b7ecffa9afbb8718eca62