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

Calin Juravle [Sat, 31 Mar 2018 05:20:16 +0000 (05:20 +0000)]

Merge "Fix BackgroundDexOptTest" into pi-dev am: ddc4e1ab06
am: 5df6423a29

Change-Id: Ia84e0b99df1765f88b4b2644714da347b6f28880

commit | commitdiff | tree

Benedict Wong [Sat, 31 Mar 2018 05:15:34 +0000 (05:15 +0000)]

[automerger skipped] Merge "Disallow Reserved SPI Allocation" into pi-dev am: 35147b2dae -s ours
am: 5250798702 -s ours

Change-Id: I440ec61196f14e1ceb88255469a1cb15408999c5

commit | commitdiff | tree

Nathan Harold [Sat, 31 Mar 2018 03:30:31 +0000 (03:30 +0000)]

[automerger skipped] Disallow Reserved SPI Allocation am: 0f8c8bb01a -s ours
am: 99a9661d51 -s ours

Change-Id: I974bf075bc595d37f6e1358ea9d4cb9b9491dad1

commit | commitdiff | tree

Chris Craik [Sat, 31 Mar 2018 03:25:48 +0000 (03:25 +0000)]

Merge "Document expected colors, deprecate old ones" into pi-dev am: dbd39fc619
am: 8992dfe3c2

Change-Id: Ifcbc449fa74fdfab9ef1430cc9e911dbe1ac5006

commit | commitdiff | tree

Brad Ebinger [Sat, 31 Mar 2018 03:21:05 +0000 (03:21 +0000)]

Merge "Unhide @SystemApi Constructor" into pi-dev am: 77fcc0da3b
am: cf49f62de5

Change-Id: I704459fc125cfda6b40f6ec96cd40f70d09a6aab

commit | commitdiff | tree

Yangster-mac [Sat, 31 Mar 2018 03:16:37 +0000 (03:16 +0000)]

Merge "Guardrail for dimension in condition in duration tracker." into pi-dev am: 014432cb67
am: 2a5d9a6fef

Change-Id: I8e2bdad5e16d4d6ed9918ccc9149aa296211c6ba

commit | commitdiff | tree

Evan Rosky [Sat, 31 Mar 2018 03:06:38 +0000 (03:06 +0000)]

Merge "Restored focusableViewAvailable logic on visibility change" into pi-dev am: 4d0a5fd7e7
am: 759d87a01f

Change-Id: I33ab28d6a89966b8ea59ddc1b3031e0bb6b9311c

commit | commitdiff | tree

Amin Shaikh [Sat, 31 Mar 2018 03:02:19 +0000 (03:02 +0000)]

Merge "Control the QS label marquees." into pi-dev am: b17c2388a5
am: c3e00577e6

Change-Id: Id9ea9aaba47b78ce65244bd769dee01f2261ff1e

commit | commitdiff | tree

Tarandeep Singh [Sat, 31 Mar 2018 02:52:26 +0000 (02:52 +0000)]

Merge "Disable optimize startInput in IMMS" into pi-dev am: d44712584a
am: fd0169ef39

Change-Id: I65d0e9882f9e6a9df8e29e07a683e3ba340eb8e4

commit | commitdiff | tree

Rohan Shah [Sat, 31 Mar 2018 02:48:05 +0000 (02:48 +0000)]

Merge "Revert "[Notif] Disable "Customize" for blocking helper"" into pi-dev am: 13c78d15d8
am: 7cc9d8a41d

Change-Id: I23fe385bc902aec098a30e61b43dfe4400a3ad32

commit | commitdiff | tree

Amin Shaikh [Sat, 31 Mar 2018 02:43:47 +0000 (02:43 +0000)]

Merge "Update QS edit layout." into pi-dev am: 6a8ea4fe24
am: 0c9cedd8ad

Change-Id: I845e889fc234d1c6f2639be515f452fcfc8d1cf0

commit | commitdiff | tree

Howard Ro [Sat, 31 Mar 2018 02:39:55 +0000 (02:39 +0000)]

Merge "Remove bad configs by counting the number of statsd deaths" into pi-dev am: ea16812ad2
am: 2720c9ef26

Change-Id: Ia492862b87f4cd7739d78230272839fa3caba9c4

commit | commitdiff | tree

Yi Jin [Sat, 31 Mar 2018 02:35:52 +0000 (02:35 +0000)]

Merge "Use unique_fd with the clear ownership." into pi-dev am: 1ebfc94aa1
am: 29bcccc579

Change-Id: Ic14b88d76560812fe2cc3d0ed9c23a32ffc233b0

commit | commitdiff | tree

Chenjie Yu [Sat, 31 Mar 2018 02:27:56 +0000 (02:27 +0000)]

Merge "Clean up atoms.proto" into pi-dev am: 9fef2594f3
am: 622b392c20

Change-Id: I6cb3f225714c742e5f2c294babc964f65e2ccc8f

commit | commitdiff | tree

Rahul Frias [Sat, 31 Mar 2018 02:23:22 +0000 (02:23 +0000)]

Merge "Clarified app behavior on REQUEST_TYPE_NONE" into pi-dev am: 1b7162ad3d
am: 02c7881824

Change-Id: I7c553068bc702f822006e0445e5e0e35dc7db157

commit | commitdiff | tree

Benedict Wong [Sat, 31 Mar 2018 02:19:16 +0000 (02:19 +0000)]

[automerger skipped] Merge changes from topic "encap-api" into pi-dev am: 36f2d8a4e1 -s ours
am: d3b9df79e3 -s ours

Change-Id: I9e585b4b1064719e5a151537496b2021c8d29a8e

commit | commitdiff | tree

Benedict Wong [Sat, 31 Mar 2018 02:14:34 +0000 (02:14 +0000)]

Merge "[automerger skipped] Require explicitly supplied truncation length am: bfa67c81bf -s ours" into pi-dev-plus-aosp
am: bdad02b32b -s ours

Change-Id: I2ebfb8ff36a53565d41c464b6e1e259e6a2ffc72

commit | commitdiff | tree

Benedict Wong [Sat, 31 Mar 2018 01:49:32 +0000 (01:49 +0000)]

[automerger skipped] Require explicitly supplied truncation length am: bfa67c81bf -s ours
am: 793f5bb428 -s ours

Change-Id: Id2e4b9be42efc88d199974edc65687c37b52aa59

commit | commitdiff | tree

Evan Laird [Sat, 31 Mar 2018 01:39:39 +0000 (01:39 +0000)]

Merge "Merge "Remove SignalClusterView in favor of IconManager" into pi-dev am: eff51d566a" into pi-dev-plus-aosp
am: 9d89c35ce4

Change-Id: I94f41aec8240eded9f384f149859db07f75bf303

commit | commitdiff | tree

Calin Juravle [Sat, 31 Mar 2018 01:34:28 +0000 (01:34 +0000)]

Merge "Fix BackgroundDexOptTest" into pi-dev
am: ddc4e1ab06

Change-Id: Icd564239c493ed402fe9914f52c48da72a3d58db

commit | commitdiff | tree

Paul Jensen [Sat, 31 Mar 2018 01:30:29 +0000 (01:30 +0000)]

Merge "[automerger skipped] Merge "Fix socket leaks in various android.net.Network methods." am: 34ce11f2bd am: f6ab9a5f96 -s ours" into pi-dev-plus-aosp
am: ee86dc2737 -s ours

Change-Id: I4782f78435921ac4c9fb091081ae48a95080b89b

commit | commitdiff | tree

Benedict Wong [Sat, 31 Mar 2018 01:30:03 +0000 (01:30 +0000)]

[automerger skipped] Merge "Disallow Reserved SPI Allocation" into pi-dev
am: 35147b2dae -s ours

Change-Id: I80f554392a01a4942b5c4927b8ad13d11dd5490a

commit | commitdiff | tree

Rohan Shah [Sat, 31 Mar 2018 01:10:23 +0000 (01:10 +0000)]

Merge "[Notif] Disable "Customize" for blocking helper" into pi-dev am: 21ba6eff91
am: 2b1e63ed60

Change-Id: I115ee83285e802263a1bcf8445d6d1b85988ba11

commit | commitdiff | tree

Vishwath Mohan [Sat, 31 Mar 2018 01:05:32 +0000 (01:05 +0000)]

Merge "Don't clear mPattern when clearing visual pattern." into pi-dev am: 74d7f50597
am: 48934218dd

Change-Id: I230b9518e16be582103bcce88d52a4c6e98a1678

commit | commitdiff | tree

Nathan Harold [Sat, 31 Mar 2018 01:05:18 +0000 (01:05 +0000)]

[automerger skipped] Disallow Reserved SPI Allocation
am: 0f8c8bb01a -s ours

Change-Id: I64fb79980348f96116ad73893571babe3d7d29a6

commit | commitdiff | tree

Leon Scroggins III [Sat, 31 Mar 2018 01:01:39 +0000 (01:01 +0000)]

Remove chaining from ImageDecoder setters am: d9b53a097d
am: fe49dd165e

Change-Id: I1ca209b9bce4c50fdaf5b5a983669f0a305d022b

commit | commitdiff | tree

Chris Craik [Sat, 31 Mar 2018 00:59:01 +0000 (00:59 +0000)]

Merge "Document expected colors, deprecate old ones" into pi-dev
am: dbd39fc619

Change-Id: Ie386264b33c3a546cdc0fbdaa6bb461865463558

commit | commitdiff | tree

Brian C. Young [Sat, 31 Mar 2018 00:58:18 +0000 (00:58 +0000)]

Merge "Enable "Unlocked device required" API" into pi-dev am: 1e0a9b0b1b
am: 58731c1483

Change-Id: Ie0b2d1454b77b1e21d341aca492ec25e3a46252f

commit | commitdiff | tree

Brad Ebinger [Sat, 31 Mar 2018 00:53:48 +0000 (00:53 +0000)]

Merge "Unhide @SystemApi Constructor" into pi-dev
am: 77fcc0da3b

Change-Id: Idbf2a71018f1bd06f8445b07fc52bc65cb6776f6

commit | commitdiff | tree

Jason Monk [Sat, 31 Mar 2018 00:53:32 +0000 (00:53 +0000)]

Merge "Add auto-grant permission slice API" into pi-dev am: 4ced90cb12
am: 650287c699

Change-Id: I1dc8ccfc76c70eb5b019eecd2cd84e7192bd5ff0

commit | commitdiff | tree

Yangster-mac [Sat, 31 Mar 2018 00:49:16 +0000 (00:49 +0000)]

Merge "Guardrail for dimension in condition in duration tracker." into pi-dev
am: 014432cb67

Change-Id: I5801bf467d7635208b5ed93fa17b6f10fac81de1

commit | commitdiff | tree

Evan Rosky [Sat, 31 Mar 2018 00:34:15 +0000 (00:34 +0000)]

Merge "Restored focusableViewAvailable logic on visibility change" into pi-dev
am: 4d0a5fd7e7

Change-Id: I4f4805629698d306fbb8f40e3b62e0f2ca99ad8c

commit | commitdiff | tree

Amin Shaikh [Sat, 31 Mar 2018 00:29:24 +0000 (00:29 +0000)]

Merge "Control the QS label marquees." into pi-dev
am: b17c2388a5

Change-Id: I6e8f0108af5c63129c692da65cf65ffb7c935d25

commit | commitdiff | tree

Tarandeep Singh [Sat, 31 Mar 2018 00:16:40 +0000 (00:16 +0000)]

Merge "Disable optimize startInput in IMMS" into pi-dev
am: d44712584a

Change-Id: I57195512dfba25d2d2133055ce2069fd5720fbe0

commit | commitdiff | tree

Victor Hsieh [Sat, 31 Mar 2018 00:12:56 +0000 (00:12 +0000)]

Merge "Fix fs-verity per fs-verity spec change" into pi-dev am: 01a0288ca1
am: 943eb5a051

Change-Id: I0a4c8d6bfeedef853a864e755cb21b61b4ff80f8

commit | commitdiff | tree

John Reck [Sat, 31 Mar 2018 00:07:05 +0000 (00:07 +0000)]

Merge "Fix MemoryFileTest coretest" into pi-dev am: ae202c6fda
am: 8c5026006a

Change-Id: If88e3524baeab25ad7282cf7ef8062d01fd3a6df

commit | commitdiff | tree

Roshan Pius [Sat, 31 Mar 2018 00:02:03 +0000 (00:02 +0000)]

Merge "wifi metrics(proto): Add scan throttling metrics" into pi-dev am: 09a42e9553
am: 48819fad54

Change-Id: I4e0c6c2a76bb8afd0d0243b8295f5296120ff843

commit | commitdiff | tree

Pavlin Radoslavov [Fri, 30 Mar 2018 23:57:21 +0000 (23:57 +0000)]

Merge "Update Bluetooth codec related strings" into pi-dev am: 68458a5148
am: 701cdd5372

Change-Id: I3e2a5407fcb38063ead3f3465d7d99fc6cd01729

commit | commitdiff | tree

Tomasz Wasilczyk [Fri, 30 Mar 2018 23:49:32 +0000 (23:49 +0000)]

Merge "Workaround HAL 1.1 program list fetching limitation by preferring FM." into pi-dev am: 86021cff1b
am: 9566033122

Change-Id: Ie80b1d32682c5014f8b489ce628eca441c1489a8

commit | commitdiff | tree

Rohan Shah [Fri, 30 Mar 2018 23:43:44 +0000 (23:43 +0000)]

Merge "Revert "[Notif] Disable "Customize" for blocking helper"" into pi-dev
am: 13c78d15d8

Change-Id: I8f46afcb00e1bbee4e64803163e3a814ab2bf71b

commit | commitdiff | tree

Amin Shaikh [Fri, 30 Mar 2018 23:39:30 +0000 (23:39 +0000)]

Merge "Update QS edit layout." into pi-dev
am: 6a8ea4fe24

Change-Id: I1fb88d70ac7568085c774fb5d75a54218c4e271d

commit | commitdiff | tree

Howard Ro [Fri, 30 Mar 2018 23:35:17 +0000 (23:35 +0000)]

Merge "Remove bad configs by counting the number of statsd deaths" into pi-dev
am: ea16812ad2

Change-Id: I623f417660ee57f106cf8aa87641873c1242b0dd

commit | commitdiff | tree

Yi Jin [Fri, 30 Mar 2018 23:30:40 +0000 (23:30 +0000)]

Merge "Use unique_fd with the clear ownership." into pi-dev
am: 1ebfc94aa1

Change-Id: I478af4173025470829785ef99e0444609c36ddf0

commit | commitdiff | tree

Calin Juravle [Fri, 30 Mar 2018 23:12:31 +0000 (23:12 +0000)]

Merge "Fix BackgroundDexOptTest" into pi-dev

commit | commitdiff | tree

Chenjie Yu [Fri, 30 Mar 2018 23:09:17 +0000 (23:09 +0000)]

Merge "Clean up atoms.proto" into pi-dev
am: 9fef2594f3

Change-Id: If643c3ebd8800c1d55d20a21850e9b56e35acfab

commit | commitdiff | tree

TreeHugger Robot [Fri, 30 Mar 2018 23:02:25 +0000 (23:02 +0000)]

Merge "Remove getCurrentUser call to find an alternative"

commit | commitdiff | tree

Rahul Frias [Fri, 30 Mar 2018 23:02:15 +0000 (23:02 +0000)]

Merge "Clarified app behavior on REQUEST_TYPE_NONE" into pi-dev
am: 1b7162ad3d

Change-Id: I58f01676399514276b18d633bce4638dc179b66c

commit | commitdiff | tree

Benedict Wong [Fri, 30 Mar 2018 22:57:46 +0000 (22:57 +0000)]

[automerger skipped] Merge changes from topic "encap-api" into pi-dev
am: 36f2d8a4e1 -s ours

Change-Id: I19ea85409c7b8653a734e74afc092959e91a0aad

commit | commitdiff | tree

Chris Tate [Fri, 30 Mar 2018 22:50:51 +0000 (22:50 +0000)]

Merge "Don't send idle-maint trigger broadcast as ordered" into pi-dev am: 015f9609a4
am: 6d1e48c298

Change-Id: I01be33d888499021dcc9b9fdf1f34318add6ffec

commit | commitdiff | tree

Rohan Shah [Fri, 30 Mar 2018 22:45:08 +0000 (22:45 +0000)]

Merge "[Notif] Dont show blocking helper for non-blockable notifs" into pi-dev am: 160261a553
am: 2c795ec107

Change-Id: Ie38f622108f2ed32e7bfbd5d845b3efd4862c13c

commit | commitdiff | tree

Stan Iliev [Fri, 30 Mar 2018 22:39:25 +0000 (22:39 +0000)]

Merge "Fix memory leak in ShaderCache" into pi-dev am: e275d0bc19
am: d00eedd25b

Change-Id: If8311555a24baaef993cf4d757f44af8a156bfd6

commit | commitdiff | tree

Salvador Martinez [Fri, 30 Mar 2018 22:32:27 +0000 (22:32 +0000)]

Merge "Update triggering logic for hybrid notification" into pi-dev am: 6abf6254d2
am: 2817608abd

Change-Id: Ic76268398af21a7932364327cb99b3f523ecbd82

commit | commitdiff | tree

Benedict Wong [Fri, 30 Mar 2018 22:29:26 +0000 (22:29 +0000)]

Merge "Disallow Reserved SPI Allocation" into pi-dev

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 30 Mar 2018 22:28:59 +0000 (22:28 +0000)]

Merge "[automerger skipped] Require explicitly supplied truncation length am: bfa67c81bf -s ours" into pi-dev-plus-aosp

commit | commitdiff | tree

TreeHugger Robot [Fri, 30 Mar 2018 22:28:25 +0000 (22:28 +0000)]

Merge "Document expected colors, deprecate old ones" into pi-dev

commit | commitdiff | tree

Benedict Wong [Fri, 30 Mar 2018 22:28:03 +0000 (22:28 +0000)]

[automerger skipped] Require explicitly supplied truncation length
am: bfa67c81bf -s ours

Change-Id: I873ba85ee623a445c2ade21f656bd56e8a0fdeed

commit | commitdiff | tree

Yu-Han Yang [Fri, 30 Mar 2018 22:26:39 +0000 (22:26 +0000)]

Merge "Move HIDL calls away from the main thread" into pi-dev am: 322929af8d
am: 4f937db54a

Change-Id: I3705bd024787505b854aae9278275af54b8791c7

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 30 Mar 2018 22:21:14 +0000 (22:21 +0000)]

Merge "Merge "Remove SignalClusterView in favor of IconManager" into pi-dev am: eff51d566a" into pi-dev-plus-aosp

commit | commitdiff | tree

Winson Chung [Fri, 30 Mar 2018 22:20:55 +0000 (22:20 +0000)]

Merge "Skip waiting for draw when triggering split screen from global action." into pi-dev am: cb903343f0
am: 7411d8dfa8

Change-Id: I581ec3c9bb0c4c5a704969164b468eb341c80c68

commit | commitdiff | tree

Evan Laird [Fri, 30 Mar 2018 22:20:44 +0000 (22:20 +0000)]

Merge "Remove SignalClusterView in favor of IconManager" into pi-dev
am: eff51d566a

Change-Id: I38db8aab0ca303c854520a12eca062596dea1da3

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 30 Mar 2018 22:17:39 +0000 (22:17 +0000)]

Merge "[automerger skipped] Merge "Fix socket leaks in various android.net.Network methods." am: 34ce11f2bd am: f6ab9a5f96 -s ours" into pi-dev-plus-aosp

commit | commitdiff | tree

Paul Jensen [Fri, 30 Mar 2018 22:17:07 +0000 (22:17 +0000)]

[automerger skipped] Merge "Fix socket leaks in various android.net.Network methods." am: 34ce11f2bd
am: f6ab9a5f96 -s ours

Change-Id: I6da127bed317ba1faf995ebb0236d91774782acb

commit | commitdiff | tree

Rohan Shah [Fri, 30 Mar 2018 22:16:05 +0000 (22:16 +0000)]

Merge "[Notif] Disable "Customize" for blocking helper" into pi-dev
am: 21ba6eff91

Change-Id: I21f6901af21779376c81ff35a5ec50c9ea270b3a

commit | commitdiff | tree

Jason Monk [Fri, 30 Mar 2018 22:15:09 +0000 (22:15 +0000)]

Merge "Add more AppComponentFactory docs" into pi-dev am: 7790a2f2d1
am: 6c85b2babc

Change-Id: I688e2f2bce0876475da456cca0402825d935173e

commit | commitdiff | tree

Vishwath Mohan [Fri, 30 Mar 2018 22:11:54 +0000 (22:11 +0000)]

Merge "Don't clear mPattern when clearing visual pattern." into pi-dev
am: 74d7f50597

Change-Id: I37e2d7e65048d4b4f0cf581bab04ea20baf7837b

commit | commitdiff | tree

Leon Scroggins III [Fri, 30 Mar 2018 22:07:10 +0000 (22:07 +0000)]

Remove chaining from ImageDecoder setters
am: d9b53a097d

Change-Id: Ie8fa1121f804d3e20af03c910ac6001fe0c79bcf

commit | commitdiff | tree

Paul Jensen [Fri, 30 Mar 2018 22:03:22 +0000 (22:03 +0000)]

Merge "Fix socket leaks in various android.net.Network methods."
am: 34ce11f2bd

Change-Id: I1a59fced1f3bcd19bd48150ca215093dff431619

commit | commitdiff | tree

Brian C. Young [Fri, 30 Mar 2018 21:54:45 +0000 (21:54 +0000)]

Merge "Enable "Unlocked device required" API" into pi-dev
am: 1e0a9b0b1b

Change-Id: I5b7e01621d8c9432af06519993b8d65bbb5c6d7e

commit | commitdiff | tree

Jason Monk [Fri, 30 Mar 2018 21:48:11 +0000 (21:48 +0000)]

Merge "Add auto-grant permission slice API" into pi-dev
am: 4ced90cb12

Change-Id: I1cafb654553e62e8720d6c8b101328d5227dc545

commit | commitdiff | tree

Brad Ebinger [Fri, 30 Mar 2018 21:36:35 +0000 (21:36 +0000)]

Merge "Unhide @SystemApi Constructor" into pi-dev

commit | commitdiff | tree

Brian C. Young [Fri, 30 Mar 2018 21:03:15 +0000 (14:03 -0700)]

Remove getCurrentUser call to find an alternative

The call the framework uses to get the current user ID requires the
INTERACT_ACROSS_USERS permission, which not a lot of apps will have.
Find a better way to do that.

Bug: 76430246

Test: CtsKeystoreTestCases
Change-Id: I8a0637d351fff9cfbf40e02946325f90466b68c5

commit | commitdiff | tree

TreeHugger Robot [Fri, 30 Mar 2018 21:27:11 +0000 (21:27 +0000)]

Merge "Guardrail for dimension in condition in duration tracker." into pi-dev

commit | commitdiff | tree

Evan Rosky [Fri, 30 Mar 2018 21:23:32 +0000 (21:23 +0000)]

Merge "Restored focusableViewAvailable logic on visibility change" into pi-dev

commit | commitdiff | tree

TreeHugger Robot [Fri, 30 Mar 2018 21:13:04 +0000 (21:13 +0000)]

Merge "Control the QS label marquees." into pi-dev

commit | commitdiff | tree

TreeHugger Robot [Fri, 30 Mar 2018 21:08:07 +0000 (21:08 +0000)]

Merge "Disable optimize startInput in IMMS" into pi-dev

commit | commitdiff | tree

Victor Hsieh [Fri, 30 Mar 2018 21:08:07 +0000 (21:08 +0000)]

Merge "Fix fs-verity per fs-verity spec change" into pi-dev
am: 01a0288ca1

Change-Id: I4d7aade7fe59008cd31073584fc0973f0ebc234a

commit | commitdiff | tree

Rohan Shah [Fri, 30 Mar 2018 21:05:07 +0000 (21:05 +0000)]

Merge "Revert "[Notif] Disable "Customize" for blocking helper"" into pi-dev

commit | commitdiff | tree

Calin Juravle [Fri, 30 Mar 2018 19:38:59 +0000 (12:38 -0700)]

Fix BackgroundDexOptTest

Test: atest BackgroundDexOptServiceIntegrationTests
Bug: 76425903
Change-Id: I19b72b95ee19ebe1807e1ce108a39dec6196a097

commit | commitdiff | tree

Rohan Shah [Fri, 30 Mar 2018 20:54:37 +0000 (20:54 +0000)]

Revert "[Notif] Disable "Customize" for blocking helper"

This reverts commit 3cfc950708fe22ded741da9e99ac0b86a0de763c.

Reason for revert:
Apparently a breakage got through treehugger - I hadn't synced my changes and one of the params was incorrect. Reverting for now and rebasing before resubmit...

Bug: 77321231
Change-Id: Ib306759d6344a69f17331a6c3c9cc78d1345508b

commit | commitdiff | tree

John Reck [Fri, 30 Mar 2018 21:00:57 +0000 (21:00 +0000)]

Merge "Fix MemoryFileTest coretest" into pi-dev
am: ae202c6fda

Change-Id: I6988af543849b69fb859cfb2e2e384be03fb62b5

commit | commitdiff | tree

TreeHugger Robot [Fri, 30 Mar 2018 21:00:06 +0000 (21:00 +0000)]

Merge "Update QS edit layout." into pi-dev

commit | commitdiff | tree

Howard Ro [Fri, 30 Mar 2018 20:58:51 +0000 (20:58 +0000)]

Merge "Remove bad configs by counting the number of statsd deaths" into pi-dev

commit | commitdiff | tree

Yi Jin [Fri, 30 Mar 2018 20:53:30 +0000 (20:53 +0000)]

Merge "Use unique_fd with the clear ownership." into pi-dev

commit | commitdiff | tree

Treehugger Robot [Fri, 30 Mar 2018 20:52:42 +0000 (20:52 +0000)]

Merge "Fix socket leaks in various android.net.Network methods."

commit | commitdiff | tree

jiabin [Fri, 30 Mar 2018 20:50:20 +0000 (20:50 +0000)]

Merge "Make back mic available when getting all available mic." into pi-dev am: cfe67aa575
am: 3f57ace702

Change-Id: Icb377e9ece76c73e7603a8af790c57a1671bbf8c

commit | commitdiff | tree

TreeHugger Robot [Fri, 30 Mar 2018 20:48:09 +0000 (20:48 +0000)]

Merge "Clean up atoms.proto" into pi-dev

commit | commitdiff | tree

Dmitry Dementyev [Fri, 30 Mar 2018 20:44:06 +0000 (20:44 +0000)]

Merge "Remove deprecated generateAndStoreKey method implementation" into pi-dev am: 912853be10
am: 9f8b95071f

Change-Id: Iefefb75ab66f158c176d31fb6ec716c9ca8321ad

commit | commitdiff | tree

Julia Reynolds [Fri, 30 Mar 2018 20:39:26 +0000 (20:39 +0000)]

Merge "Catch unbinding errors" into pi-dev am: 47335f6e1c
am: d296f55f53

Change-Id: I46a17cbcde9e89eac3795ee930d1195f414edb10

commit | commitdiff | tree

Pavel Maltsev [Fri, 30 Mar 2018 20:35:37 +0000 (20:35 +0000)]

Merge "Add OEM_PAID capability to system api" into pi-dev am: 8982a81f3c
am: 0230db03df

Change-Id: I6e9c4130db23a4f1c89ce7e9071ae519a2b0b7ec

commit | commitdiff | tree

Rahul Frias [Fri, 30 Mar 2018 20:33:24 +0000 (20:33 +0000)]

Merge "Clarified app behavior on REQUEST_TYPE_NONE" into pi-dev

commit | commitdiff | tree

Jeff Sharkey [Fri, 30 Mar 2018 20:28:41 +0000 (20:28 +0000)]

Merge "API council requested tweaks to NetworkRequest." into pi-dev am: e6b1a7804d
am: 7121e04797

Change-Id: I539184f7385c1f288cfb77be8307e4463e07e9e6

commit | commitdiff | tree

Benedict Wong [Fri, 30 Mar 2018 20:28:19 +0000 (20:28 +0000)]

Merge changes from topic "encap-api" into pi-dev

* changes:
Require explicitly supplied truncation length
Clarify UDP encapsulation socket API

commit | commitdiff | tree

Julia Reynolds [Fri, 30 Mar 2018 20:23:15 +0000 (20:23 +0000)]

Merge "Show media stream always when a11y is active stream" into pi-dev am: 9ba5dfc750
am: 4f78dc712a

Change-Id: If3de4ed9ed06da94acc143494c377f86b7f5c9dd

commit | commitdiff | tree

TreeHugger Robot [Fri, 30 Mar 2018 20:22:16 +0000 (20:22 +0000)]

Merge "Remove SignalClusterView in favor of IconManager" into pi-dev

commit | commitdiff | tree

Rohan Shah [Fri, 30 Mar 2018 20:18:08 +0000 (20:18 +0000)]

Merge "[QS] Override/add long click accessibility action" into pi-dev am: 2d2f598d69
am: cdab6badc4

Change-Id: I86dda7f75d4e239ca9575569fb0ee8d819080575

commit | commitdiff | tree

Roshan Pius [Fri, 30 Mar 2018 20:15:57 +0000 (20:15 +0000)]

Merge "wifi metrics(proto): Add scan throttling metrics" into pi-dev
am: 09a42e9553

Change-Id: I7eb5d12578c6810bc96e02795313cbf5fc24f3e5

commit | commitdiff | tree

Beverly [Fri, 30 Mar 2018 20:12:45 +0000 (20:12 +0000)]

Merge "System notif channels updated on locale change" into pi-dev am: e3ba496485
am: f488941fc9

Change-Id: I4b6af08d6d892413f5d1cc6dd84dec141aeed940

commit | commitdiff | tree

Pavlin Radoslavov [Fri, 30 Mar 2018 20:07:54 +0000 (20:07 +0000)]

Merge "Update Bluetooth codec related strings" into pi-dev
am: 68458a5148

Change-Id: I0d78d63c8ac749e96f648c20ae68677de3d6ec24

commit | commitdiff | tree

Jason Monk [Fri, 30 Mar 2018 20:07:42 +0000 (20:07 +0000)]

Merge "Slices: Fix up some formatting and add examples" into pi-dev am: ea3377b4d4
am: e7c23d8ddb

Change-Id: If8245a3f80c2a7ff2d406f6b5bde7d6626563c22

commit | commitdiff | tree

TreeHugger Robot [Fri, 30 Mar 2018 20:03:11 +0000 (20:03 +0000)]