git.osdn.net Git - android-x86/frameworks-base.git/log

Revert "Log the apk optimization state in the MetricsLogger"

This reverts commit 0a8bea818c330d02161322901534992253a2f9ee.

E AndroidRuntime: *** FATAL EXCEPTION IN SYSTEM PROCESS: ActivityManager
E AndroidRuntime: java.lang.NullPointerException: Attempt to read from field 'java.lang.String com.android.server.am.ProcessRecord.requiredAbi' on a null object reference
E AndroidRuntime: at com.android.server.am.ActivityMetricsLogger.logAppTransition(ActivityMetricsLogger.java:504)
E AndroidRuntime: at com.android.server.am.ActivityMetricsLogger.access$100(ActivityMetricsLogger.java:62)

Bug: 73626352
Change-Id: Idd50e0d2cf34e5393b4ae76ef8bc48b0067532eb

commit | commitdiff | tree

TreeHugger Robot [Tue, 20 Feb 2018 17:04:14 +0000 (17:04 +0000)]

Merge "Implement AnimatedImageDrawable.getColorFilter"

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 20 Feb 2018 16:24:21 +0000 (16:24 +0000)]

Merge "Merge "Add flag to AMS.startInstrumentation() to disable hidden API checks" am: 4a8fa52e4b am: b459c66fca am: 7bfadcb095 -s ours"

commit | commitdiff | tree

David Brazdil [Tue, 20 Feb 2018 16:23:57 +0000 (16:23 +0000)]

Merge "Add flag to AMS.startInstrumentation() to disable hidden API checks" am: 4a8fa52e4b am: b459c66fca
am: 7bfadcb095 -s ours

Change-Id: I5f6f863b8e867246a1c7ce9cd2b45126a751916e

commit | commitdiff | tree

Jeff Sharkey [Tue, 20 Feb 2018 16:23:12 +0000 (16:23 +0000)]

Merge "Define sane default target SDK for system_server."

commit | commitdiff | tree

David Brazdil [Tue, 20 Feb 2018 16:08:41 +0000 (16:08 +0000)]

Merge "Add flag to AMS.startInstrumentation() to disable hidden API checks" am: 4a8fa52e4b
am: b459c66fca

Change-Id: Ic9aac96f55b4eb947b5af78a6b8482638a806ae5

commit | commitdiff | tree

Derek Sollenberger [Fri, 16 Feb 2018 17:24:13 +0000 (12:24 -0500)]

Remove Skia RenderPipeline saveLayer logic for software layers.

Test: CtsUiRenderingTestCases:LayerTests
Bug: 72052698
Change-Id: Ief845c409755e6bc61849a6ab3506ef60161f231

commit | commitdiff | tree

David Brazdil [Tue, 20 Feb 2018 15:54:28 +0000 (15:54 +0000)]

Merge "Add flag to AMS.startInstrumentation() to disable hidden API checks"
am: 4a8fa52e4b

Change-Id: Ie94241b7b44a98fea1753f7aa58475384cb33800

commit | commitdiff | tree

David Brazdil [Tue, 20 Feb 2018 14:36:18 +0000 (14:36 +0000)]

Merge "Add flag to AMS.startInstrumentation() to disable hidden API checks"

commit | commitdiff | tree

David Brazdil [Tue, 20 Feb 2018 11:59:10 +0000 (11:59 +0000)]

One more API on hidden API light greylist

Report from the wild.

Bug: 64382372
Test: make
Change-Id: Ia7285fc5240df1e3142a162f5bf71870383f3020

commit | commitdiff | tree

David Brazdil [Tue, 20 Feb 2018 10:42:44 +0000 (10:42 +0000)]

Merge "Add more hidden APIs to light greylist"

commit | commitdiff | tree

Bill Yi [Tue, 20 Feb 2018 08:17:28 +0000 (08:17 +0000)]

Merge changes from topic "am-b69199ef-52eb-434d-a231-8cb19da641fc" into oc-dev am: a1f536e00e am: ff1a55a207 am: 7252081be1
am: fe7521ecca

Change-Id: I212fd4675925150eaa8a0c5924cdb69a3d3d217a

commit | commitdiff | tree

Bill Yi [Tue, 20 Feb 2018 08:10:49 +0000 (08:10 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 4c87ffeae2 skipped: 2aaa34b639 am: 7b73069b0a -s ours am: 6f40fc77e6 -s ours am: a3f97b668e -s ours
am: ed3436a913 -s ours

Change-Id: I8063b812dc34e55df61493bf6f3729940611293d

commit | commitdiff | tree

Bill Yi [Tue, 20 Feb 2018 08:03:38 +0000 (08:03 +0000)]

Merge changes from topic "am-8dbc037c-490f-442d-957b-fea681fe1136" into oc-dev am: dd05e2d932 am: ea5b2a818d am: 5b8e6195a0
am: 154ba3eab6

Change-Id: I3ac71e5c857402e87742919feb827b44927b5e3e

commit | commitdiff | tree

Bill Yi [Tue, 20 Feb 2018 07:56:37 +0000 (07:56 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: fb5d1738dd skipped: 0b7e5c37cc am: 023ae30cdd -s ours am: 16e78b6dc1 -s ours am: e16f27b3fc -s ours
am: f51aec6663 -s ours

Change-Id: I9345950b20a948a368814b88520527d6096a4cf3

commit | commitdiff | tree

Bill Yi [Tue, 20 Feb 2018 07:47:19 +0000 (07:47 +0000)]

Merge changes from topic "am-b69199ef-52eb-434d-a231-8cb19da641fc" into oc-dev am: a1f536e00e am: ff1a55a207
am: 7252081be1

Change-Id: I3ab38999b143631c39cd25a2e21b4d6ad766a486

commit | commitdiff | tree

Bill Yi [Tue, 20 Feb 2018 07:41:05 +0000 (07:41 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 4c87ffeae2 skipped: 2aaa34b639 am: 7b73069b0a -s ours am: 6f40fc77e6 -s ours
am: a3f97b668e -s ours

Change-Id: I5da2857e1fd4ea8db5053d5658b3b07c00f05fd0

commit | commitdiff | tree

Bill Yi [Tue, 20 Feb 2018 06:09:16 +0000 (22:09 -0800)]

Import translations. DO NOT MERGE

Change-Id: Icb6608011b183f92dbdce57dfb6b5cdafff897ff
Auto-generated-cl: translation import

commit | commitdiff | tree

Bill Yi [Tue, 20 Feb 2018 05:26:01 +0000 (05:26 +0000)]

Merge changes from topic "am-8dbc037c-490f-442d-957b-fea681fe1136" into oc-dev am: dd05e2d932 am: ea5b2a818d
am: 5b8e6195a0

Change-Id: I34e8850eaa89f769957fa5b17f4d5cc823871292

commit | commitdiff | tree

Bill Yi [Tue, 20 Feb 2018 05:25:11 +0000 (05:25 +0000)]

Merge changes from topic "am-b69199ef-52eb-434d-a231-8cb19da641fc" into oc-dev am: a1f536e00e
am: ff1a55a207

Change-Id: Ibcd4efc7c50a91c6dd401436a2d82171793e0e6b

commit | commitdiff | tree

Bill Yi [Tue, 20 Feb 2018 05:21:34 +0000 (05:21 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: a4513689c8 skipped: baff683653 am: 42e8a0c2de -s ours am: da0d89bf92 -s ours am: f81de61e4e -s ours
am: 71d384212a -s ours

Change-Id: Ic5edfa45b9cf7af152ae9e6ab3d5317998e32c51

commit | commitdiff | tree

Bill Yi [Tue, 20 Feb 2018 05:19:47 +0000 (05:19 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 4c87ffeae2 skipped: 2aaa34b639 am: 7b73069b0a -s ours
am: 6f40fc77e6 -s ours

Change-Id: I9f0d46d5dcd235ab83f52cfe6b21ad780d8404c5

commit | commitdiff | tree

Bill Yi [Tue, 20 Feb 2018 05:19:44 +0000 (05:19 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: fb5d1738dd skipped: 0b7e5c37cc am: 023ae30cdd -s ours am: 16e78b6dc1 -s ours
am: e16f27b3fc -s ours

Change-Id: Ib6702b93752a79c08d16bf5035435f14b7e0c350

commit | commitdiff | tree

Bill Yi [Tue, 20 Feb 2018 05:13:43 +0000 (05:13 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: a4513689c8 skipped: baff683653 am: 42e8a0c2de -s ours am: da0d89bf92 -s ours
am: f81de61e4e -s ours

Change-Id: I37cf66df3213345c876db85f399dfb7c82f917bb

commit | commitdiff | tree

Bill Yi [Tue, 20 Feb 2018 05:12:59 +0000 (05:12 +0000)]

Merge changes from topic "am-8dbc037c-490f-442d-957b-fea681fe1136" into oc-dev am: dd05e2d932
am: ea5b2a818d

Change-Id: I824e17d5fcf0fcd7865d151a7d32b4991f045399

commit | commitdiff | tree

TreeHugger Robot [Tue, 20 Feb 2018 05:11:01 +0000 (05:11 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Bill Yi [Tue, 20 Feb 2018 05:09:31 +0000 (05:09 +0000)]

Merge changes from topic "am-b69199ef-52eb-434d-a231-8cb19da641fc" into oc-dev
am: a1f536e00e

Change-Id: Ic19ff34e840d35ea8e93305b8b323c9bdb81b058

commit | commitdiff | tree

Bill Yi [Tue, 20 Feb 2018 05:08:15 +0000 (05:08 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 4c87ffeae2 skipped: 2aaa34b639
am: 7b73069b0a -s ours

Change-Id: I93eef5aeb3e029a70f602c145604a3320c219ddf

commit | commitdiff | tree

Bill Yi [Tue, 20 Feb 2018 05:08:10 +0000 (05:08 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: fb5d1738dd skipped: 0b7e5c37cc am: 023ae30cdd -s ours
am: 16e78b6dc1 -s ours

Change-Id: I67ed476e1375dba6a1c5864f561498c9e259c052

commit | commitdiff | tree

Bill Yi [Tue, 20 Feb 2018 05:03:09 +0000 (05:03 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: a4513689c8 skipped: baff683653 am: 42e8a0c2de -s ours
am: da0d89bf92 -s ours

Change-Id: I76ad6438afad284c3eed8d4a86111870865a7253

commit | commitdiff | tree

Bill Yi [Tue, 20 Feb 2018 05:02:56 +0000 (05:02 +0000)]

Merge changes from topic "am-8dbc037c-490f-442d-957b-fea681fe1136" into oc-dev
am: dd05e2d932

Change-Id: I149351dee948b64a4ee4de1512ea98d7692afdf6

commit | commitdiff | tree

Bill Yi [Tue, 20 Feb 2018 05:01:34 +0000 (05:01 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: fb5d1738dd skipped: 0b7e5c37cc
am: 023ae30cdd -s ours

Change-Id: Id625fa8ab91f53283f0e5985f13141e54d2dfe8e

commit | commitdiff | tree

Bill Yi [Tue, 20 Feb 2018 04:56:46 +0000 (04:56 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: a4513689c8 skipped: baff683653
am: 42e8a0c2de -s ours

Change-Id: I21df47ac8511c2003fa9dd0c07065cb8f7cb8b28

commit | commitdiff | tree

TreeHugger Robot [Tue, 20 Feb 2018 04:54:20 +0000 (04:54 +0000)]

Merge changes from topic "am-b69199ef-52eb-434d-a231-8cb19da641fc" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 4c87ffeae2 skipped: 2aaa34b639
  [automerger skipped] Import translations. DO NOT MERGE skipped: 4c87ffeae2
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Tue, 20 Feb 2018 04:53:51 +0000 (04:53 +0000)]

Merge changes from topic "am-8dbc037c-490f-442d-957b-fea681fe1136" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: fb5d1738dd skipped: 0b7e5c37cc
  [automerger skipped] Import translations. DO NOT MERGE skipped: fb5d1738dd
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Tue, 20 Feb 2018 03:46:22 +0000 (03:46 +0000)]

Merge "Remove QS scrolling."

commit | commitdiff | tree

Risan [Mon, 19 Feb 2018 07:22:10 +0000 (16:22 +0900)]

Change libmojo_bp to libmojo

Cleaning up since we have libmojo Android.bp target now.

Bug: 72927715
Test: Compiled
Change-Id: I6350ce53c6b97a2c43d53a45b8634bdc27409ab6

commit | commitdiff | tree

Bill Yi [Mon, 19 Feb 2018 23:45:45 +0000 (15:45 -0800)]

Import translations. DO NOT MERGE

Change-Id: Icb14c173e66c9bb9cfa41c2a733c1b3ea121f0e3
Auto-generated-cl: translation import

commit | commitdiff | tree

David Brazdil [Mon, 19 Feb 2018 17:21:46 +0000 (17:21 +0000)]

Add more hidden APIs to light greylist

Seen in use by common apps.

Bug: 73539503
Test: make
Change-Id: Iccbddb4c0d39f94f4152cdbbfb7c9017c29cf46f

commit | commitdiff | tree

Jeff Sharkey [Sat, 17 Feb 2018 00:25:14 +0000 (17:25 -0700)]

Define sane default target SDK for system_server.

Normal app launches always define a target SDK, but system_server
doesn't pass in an "--target-sdk-version" option, meaning we left
the default value target SDK of "0" in place, which isn't a valid
SDK level, meaning we treat it as targeting Android 1.0.

The majority of target SDK checks are using the higher-level value
provided from Context, meaning they've always been enforced; this
change means that we're now applying lower-level target SDK checks
that go through VMRuntime.

Test: builds, boots, typical operations still work
Bug: 72331067
Change-Id: I6940bb8c3a1cd2234bcacadbf60c902625876a76

commit | commitdiff | tree

TreeHugger Robot [Mon, 19 Feb 2018 21:38:23 +0000 (21:38 +0000)]

Merge "Add tracing tags to vibrator"

commit | commitdiff | tree

Calin Juravle [Mon, 19 Feb 2018 19:36:08 +0000 (19:36 +0000)]

Merge "Log the apk optimization state in the MetricsLogger"

commit | commitdiff | tree

TreeHugger Robot [Mon, 19 Feb 2018 17:37:24 +0000 (17:37 +0000)]

Merge "GlobalActions: Fix scrim with display cutouts"

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 19 Feb 2018 17:17:18 +0000 (17:17 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: fb5d1738dd skipped: 0b7e5c37cc

Change-Id: Ie880a7487ed875a62e4fab4974da4a35d3c6b8b4

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 19 Feb 2018 17:17:12 +0000 (17:17 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: fb5d1738dd

Change-Id: I70b8b1c9fab0c7ae88a9a5f839ee411b28fd4f19

commit | commitdiff | tree

Bill Yi [Mon, 19 Feb 2018 17:16:47 +0000 (09:16 -0800)]

Import translations. DO NOT MERGE

Change-Id: I2e31731c8393cbcd58b57cc4092d14626e60af8b
Auto-generated-cl: translation import

commit | commitdiff | tree

Paul Duffin [Mon, 19 Feb 2018 16:45:03 +0000 (16:45 +0000)]

Merge "Turn on DepAnn for test-base and test-runner" am: 8dbbc3543e am: 38a916fb74
am: 01bdda9de8

Change-Id: I6805f692437719838bef7a4b7e51b3130d6f384e

commit | commitdiff | tree

Paul Duffin [Mon, 19 Feb 2018 16:34:08 +0000 (16:34 +0000)]

Merge "Turn on DepAnn for test-base and test-runner" am: 8dbbc3543e
am: 38a916fb74

Change-Id: I6508127afc4434f33533c2dd13db17db092e9788

commit | commitdiff | tree

Paul Duffin [Mon, 19 Feb 2018 16:24:57 +0000 (16:24 +0000)]

Merge "Turn on DepAnn for test-base and test-runner"
am: 8dbbc3543e

Change-Id: Ia6fe0967f92b382042326c288d175c4f60b63190

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 19 Feb 2018 16:08:26 +0000 (16:08 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: a4513689c8 skipped: baff683653

Change-Id: Ie898f10574d4deb9d465e70803b1b6f24e69e867

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 19 Feb 2018 16:08:19 +0000 (16:08 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: a4513689c8

Change-Id: Ib38e6fcc936beb2c72afb46b6e302b4ca261ce14

commit | commitdiff | tree

Bill Yi [Mon, 19 Feb 2018 16:07:44 +0000 (08:07 -0800)]

Import translations. DO NOT MERGE

Change-Id: I1b9d68a390483f6259a7eb05a2e337af617896b6
Auto-generated-cl: translation import

commit | commitdiff | tree

Adrian Roos [Mon, 19 Feb 2018 15:42:27 +0000 (16:42 +0100)]

GlobalActions: Fix scrim with display cutouts

Fixes an issue where the GlobalActions scrim would not extend
under the display cutout.

Change-Id: I307ccf400b6db5a5569546cfc2fb64cd64ed2e61
Fixes: 73483285
Test: Enable display cutout; long press power; verify scrim extends under the cutout (and over the statusbar)

commit | commitdiff | tree

David Brazdil [Mon, 19 Feb 2018 15:39:15 +0000 (15:39 +0000)]

Add flag to AMS.startInstrumentation() to disable hidden API checks

Some tests need to use hidden APIs to check the internal state of
the framework. For those special use cases, we add a new flag to
ActivityManagerService.startInstrumentation that enables to start
instrumented processes without hidden API enforcement. Individual
test harnesses can change their Am command to request the exemption.

Bug: 64382372
Test: adb shell am instrument --no-hidden-api-checks <component>
adb logcat | grep 'Accessing hidden'
Merged-In: I1d734a95423fae90dae63ff09d5f606495830905
Change-Id: Ifbb0d19d95737a9f601b11e20352cdc11f0ca5b6

commit | commitdiff | tree

TreeHugger Robot [Mon, 19 Feb 2018 15:18:42 +0000 (15:18 +0000)]

Merge "Fixing URL encoding of geo intent links"

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 19 Feb 2018 15:09:11 +0000 (15:09 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 4c87ffeae2 skipped: 2aaa34b639

Change-Id: I0ed2f3e40aeaaff5acfbbef02155450747169397

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 19 Feb 2018 15:09:03 +0000 (15:09 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 4c87ffeae2

Change-Id: I89781e9b815f8fdee167b1427aec4dee233f5530

commit | commitdiff | tree

Bill Yi [Mon, 19 Feb 2018 15:08:29 +0000 (07:08 -0800)]

Import translations. DO NOT MERGE

Change-Id: I6076b206d8c838472c2c958d521ece8038e10206
Auto-generated-cl: translation import

commit | commitdiff | tree

TreeHugger Robot [Mon, 19 Feb 2018 14:52:51 +0000 (14:52 +0000)]

Merge "Fix TransferOwnershipMetadataManager tests."

commit | commitdiff | tree

arangelov [Fri, 16 Feb 2018 19:13:01 +0000 (19:13 +0000)]

Fix TransferOwnershipMetadataManager tests.

Test: bit FrameworksServicesTests:com.android.server.devicepolicy.TransferOwnershipMetadataManagerTest
Bug: 73448505
Change-Id: I06fc52b13ed27a77213cfb3b15dff3f7161f5be0

commit | commitdiff | tree

Paul Duffin [Mon, 19 Feb 2018 13:03:56 +0000 (13:03 +0000)]

Merge "Turn on DepAnn for test-base and test-runner"

commit | commitdiff | tree

Jan Althaus [Mon, 12 Feb 2018 11:47:27 +0000 (12:47 +0100)]

Fixing URL encoding of geo intent links

Bug: 73106770
Test: Added test and manually verified
Change-Id: Ia86450e1f6721cd50567628e4dcdcc34bca0bdf7

commit | commitdiff | tree

TreeHugger Robot [Mon, 19 Feb 2018 11:04:16 +0000 (11:04 +0000)]

Merge "TextClassifier: Support service intents."

commit | commitdiff | tree

TreeHugger Robot [Mon, 19 Feb 2018 10:42:35 +0000 (10:42 +0000)]

Merge "AAPT2: normalize Manifest java identifiers."

commit | commitdiff | tree

Chalard Jean [Mon, 19 Feb 2018 08:36:01 +0000 (08:36 +0000)]

Merge changes Ic28c5653,Ic635f97b am: 1ea3d9411a am: 27dbc898dc
am: bb186ddfb4

Change-Id: Ieea9917b3a68e08686c74ebf39e5fed61f641a7a

commit | commitdiff | tree

Chalard Jean [Mon, 19 Feb 2018 08:24:47 +0000 (08:24 +0000)]

Merge changes Ic28c5653,Ic635f97b am: 1ea3d9411a
am: 27dbc898dc

Change-Id: I6596fae1946bffade125a14b3bd095eda557a7a5

commit | commitdiff | tree

Chalard Jean [Mon, 19 Feb 2018 08:14:19 +0000 (08:14 +0000)]

Merge changes Ic28c5653,Ic635f97b
am: 1ea3d9411a

Change-Id: I38218d8652ec36f2ea076a6806df883a9c9636de

commit | commitdiff | tree

Chalard Jean [Mon, 19 Feb 2018 04:12:50 +0000 (04:12 +0000)]

Merge "Don't refcount TRACK_DEFAULT requests." am: 114278c9eb am: a6f193162a
am: da97198167

Change-Id: Ic2b19e9f3f7d8f67cc5854688e5e14ca2a419e66

commit | commitdiff | tree

Chalard Jean [Mon, 19 Feb 2018 04:01:17 +0000 (04:01 +0000)]

Merge "Don't refcount TRACK_DEFAULT requests." am: 114278c9eb
am: a6f193162a

Change-Id: Ib3e0e89a9d80546fbf3555cfdf715f2bd8e4ab94

commit | commitdiff | tree

Chalard Jean [Mon, 19 Feb 2018 03:54:25 +0000 (03:54 +0000)]

Merge "Don't refcount TRACK_DEFAULT requests."
am: 114278c9eb

Change-Id: I094ad8f9764f5cd657e2fe98c846710c8d241b64

commit | commitdiff | tree

Treehugger Robot [Mon, 19 Feb 2018 03:45:27 +0000 (03:45 +0000)]

Merge changes Ic28c5653,Ic635f97b

* changes:
[LT2] Fix release request while lingering.
[LT1] Add a test for release request while lingering

commit | commitdiff | tree

Chalard Jean [Mon, 19 Feb 2018 02:13:48 +0000 (02:13 +0000)]

Merge "Don't refcount TRACK_DEFAULT requests."

commit | commitdiff | tree

Chalard Jean [Mon, 19 Feb 2018 02:01:41 +0000 (02:01 +0000)]

Merge "DO NOT MERGE : fix useless import" am: 473b3b7f03 -s ours am: b68ce4b33e -s ours
am: 0a2dc550b0 -s ours

Change-Id: I7277bdc2fe3340c01004cd0ec3d4fbee25ffee69

commit | commitdiff | tree

Chalard Jean [Fri, 16 Feb 2018 07:08:35 +0000 (16:08 +0900)]

[LT2] Fix release request while lingering.

Test: runtest framework-net
Change-Id: Ic28c5653d16351903b792e76ba8b199b7ed1f8d4

commit | commitdiff | tree

Chalard Jean [Mon, 19 Feb 2018 01:57:09 +0000 (01:57 +0000)]

Merge "DO NOT MERGE : fix useless import" am: 473b3b7f03 -s ours
am: b68ce4b33e -s ours

Change-Id: I75fc8e73f448ffee44a28149843c1d08399e255e

commit | commitdiff | tree

Chalard Jean [Mon, 19 Feb 2018 01:51:39 +0000 (01:51 +0000)]

Merge "DO NOT MERGE : fix useless import"
am: 473b3b7f03 -s ours

Change-Id: Ic717c478266a317fab1c618bc2a894e6610ffdd4

commit | commitdiff | tree

John Muir [Fri, 16 Feb 2018 22:29:14 +0000 (14:29 -0800)]

AudioService: Allow specification of the USB safe volume.

Previously the USB safe volume was hard coded to -37.0 (see
explanation in AudioService.java). This volume is used to
determine the volume index for a safe level. The USB index can be
much lower than the similar volume index defined by
config_safe_media_volume_index, even though both may meet the EN
60950 specification (according to the test engineer).

Add a configuration property that allows the OEM to change the
USB safe volume for their device. The new property's name is
config_safe_media_volume_usb_mB. The safe volume is stored in
millibel to avoid using floating point numbers in the
configuration xml.

Bug: 73351887
Test: Default safe volume remains at -37.0dB.
Overlay can be used to modify the safe volume.
Change-Id: I2a2ecfbc4277fddaf724f38aef7c531c71ee5c3b
(cherry picked from commit b4b2da50c942151830643aff14d394597812cb29)

commit | commitdiff | tree

Tony Wickham [Mon, 19 Feb 2018 00:04:59 +0000 (00:04 +0000)]

Merge "Recents onboarding fixes"

commit | commitdiff | tree

Chalard Jean [Sun, 18 Feb 2018 23:14:42 +0000 (23:14 +0000)]

Merge "DO NOT MERGE : fix useless import"

commit | commitdiff | tree

TreeHugger Robot [Sun, 18 Feb 2018 19:43:54 +0000 (19:43 +0000)]

Merge "Switch to inline mockito for a bunch of tests"

commit | commitdiff | tree

Jason Monk [Thu, 14 Dec 2017 18:22:58 +0000 (13:22 -0500)]

Switch to inline mockito for a bunch of tests

So we can mock final stuff

Test: The tests
Change-Id: Ia3a47c6655c4b0b9af0aea0ee6f8f6cb9ebaab09