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

Android Build Merger (Role) [Fri, 28 Apr 2017 22:11:05 +0000 (22:11 +0000)]

Merge "Merge "Bluetooth: bluetooth.le API fixes" am: cf95973276 am: 6af9bde898 am: 62fc08f684 am: 9cc225e482"

Jakub Pawlowski [Fri, 28 Apr 2017 22:10:23 +0000 (22:10 +0000)]

Merge "Bluetooth: bluetooth.le API fixes" am: cf95973276 am: 6af9bde898 am: 62fc08f684
am: 9cc225e482

Change-Id: I9a3be0d19c13029aaf3ecdde3608e8fdf246229d

commit | commitdiff | tree

TreeHugger Robot [Fri, 28 Apr 2017 22:10:05 +0000 (22:10 +0000)]

Merge "AOD: Don't use DOZE screen state on AOD2"

commit | commitdiff | tree

Jakub Pawlowski [Fri, 28 Apr 2017 22:02:52 +0000 (22:02 +0000)]

Merge "Bluetooth: bluetooth.le API fixes" am: cf95973276 am: 6af9bde898
am: 62fc08f684

Change-Id: I98bf6fc7d8d58f102b1268cb3e6d27fb6fd86b78

commit | commitdiff | tree

Tomasz Wasilczyk [Fri, 28 Apr 2017 21:56:47 +0000 (21:56 +0000)]

Merge "Fix equality method implementation in BandConfig class." am: 30a34ec0e2 am: 5acbf70872 am: 3329b63b40
am: ffe7134de5

Change-Id: I8697d26ff3f3cd13a5504432e2689d219d8bba1d

commit | commitdiff | tree

Jakub Pawlowski [Fri, 28 Apr 2017 21:55:50 +0000 (21:55 +0000)]

Merge "Bluetooth: bluetooth.le API fixes" am: cf95973276
am: 6af9bde898

Change-Id: I20d885ee7f12821885767a13cafac6c3dec4ba2d

commit | commitdiff | tree

fionaxu [Fri, 28 Apr 2017 21:48:53 +0000 (21:48 +0000)]

Merge "better defualt behaviour for msim" am: fd810d8727 am: 6512f5eb10 am: 2113a60b56 -s ours
am: 34a75f53ca

Change-Id: Ic196c9ad5bca020fcaf337279eb496cf5dd238e0

commit | commitdiff | tree

Tomasz Wasilczyk [Fri, 28 Apr 2017 21:46:20 +0000 (21:46 +0000)]

Merge "Fix equality method implementation in BandConfig class." am: 30a34ec0e2 am: 5acbf70872
am: 3329b63b40

Change-Id: I45bf3234ccc66e5bcac071c0931846eed2e27f2b

commit | commitdiff | tree

Jakub Pawlowski [Fri, 28 Apr 2017 21:46:14 +0000 (21:46 +0000)]

Merge "Bluetooth: bluetooth.le API fixes"
am: cf95973276

Change-Id: I67075df5e7d457cd85b40faefb3fe68946775330

commit | commitdiff | tree

Aurimas Liutikas [Fri, 28 Apr 2017 21:43:55 +0000 (21:43 +0000)]

Merge "Enable Checkstyle for "repo upload" for more projects."

commit | commitdiff | tree

fionaxu [Fri, 28 Apr 2017 21:40:00 +0000 (21:40 +0000)]

Merge "better defualt behaviour for msim" am: fd810d8727 am: 6512f5eb10
am: 2113a60b56 -s ours

Change-Id: If1efb858a531eb1b6d88a151e3b1800605b8b778

commit | commitdiff | tree

Aurimas Liutikas [Fri, 28 Apr 2017 21:30:26 +0000 (14:30 -0700)]

Enable Checkstyle for "repo upload" for more projects.

This CL enables Checkstyle for the following directories:
- core/java/android/
- core/tests/coretests/src/android/

Bug: 34746646
Test: None
Change-Id: Ib8b3f198000be19e9a7a61aa5abd61d827454eba

commit | commitdiff | tree

Jakub Pawlowski [Fri, 28 Apr 2017 21:36:10 +0000 (21:36 +0000)]

Merge "Bluetooth: bluetooth.le API fixes"

commit | commitdiff | tree

Jakub Pawlowski [Fri, 28 Apr 2017 11:11:26 +0000 (04:11 -0700)]

Bluetooth: bluetooth.le API fixes

Fix minor spelling problems.
Throw IllegalStateException instead of IllegalArgumentException in
build().

Bug: 37532634
Test: none
Change-Id: I73b6f04aec98f5baffb06a363e2a3f71e8cec3c4

commit | commitdiff | tree

Sudheer Shanka [Fri, 28 Apr 2017 21:29:15 +0000 (21:29 +0000)]

Merge "Consider allow-in-power-save-except-idle whitelist while updating rules." into oc-dev am: 5ee9a1dfa3
am: 4074687cd2

Change-Id: I86bcdb4e905586f9fc19c365c82b4103b316d87a

commit | commitdiff | tree

Sudheer Shanka [Fri, 28 Apr 2017 21:22:51 +0000 (21:22 +0000)]

Merge "Consider allow-in-power-save-except-idle whitelist while updating rules." into oc-dev
am: 5ee9a1dfa3

Change-Id: I463477157db84a7496e0659fbdd60c5ad4342989

commit | commitdiff | tree

Adrian Roos [Fri, 28 Apr 2017 21:17:25 +0000 (21:17 +0000)]

Merge "AOD: Show keyguard while dozing but not locked"

commit | commitdiff | tree

Sudheer Shanka [Fri, 28 Apr 2017 21:08:28 +0000 (21:08 +0000)]

Merge "Consider allow-in-power-save-except-idle whitelist while updating rules." into oc-dev

commit | commitdiff | tree

Chris Warrington [Fri, 28 Apr 2017 20:57:10 +0000 (20:57 +0000)]

Merge "AAPT2: Error reporting through JNI." into oc-dev am: f49baef4b9
am: 128b206af8

Change-Id: Idc23d214eeea75c60dc1d12aef77270724f95a2e

commit | commitdiff | tree

Felipe Leme [Fri, 28 Apr 2017 20:49:56 +0000 (20:49 +0000)]

Merge "Changed EXTRA_DATA_EXTRAS to EXTRA_CLIENT_STATE." into oc-dev am: c21f723ca2
am: 977cbc6690

Change-Id: Ibc07c8b9b614e5fbfc1fbedd609f45f1a2fe7398

commit | commitdiff | tree

Adrian Roos [Thu, 27 Apr 2017 22:50:14 +0000 (15:50 -0700)]

AOD: Don't use DOZE screen state on AOD2

Fixes an issue where AOD2 had low color gamut. Instead, we now use
the high-power screen state there.

Bug: 36781008
Test: Receive notification on AOD2, observe that color is not distorted
Change-Id: I370a74c0f1d5cfd49194b53b9e20bf1f0dc5d4d0

commit | commitdiff | tree

Chris Warrington [Fri, 28 Apr 2017 20:44:19 +0000 (20:44 +0000)]

Merge "AAPT2: Error reporting through JNI." into oc-dev
am: f49baef4b9

Change-Id: I7dab9ad1acb5cdfedd9f68d15f6a49c63e638aae

commit | commitdiff | tree

Felipe Leme [Fri, 28 Apr 2017 20:37:38 +0000 (20:37 +0000)]

Merge "Changed EXTRA_DATA_EXTRAS to EXTRA_CLIENT_STATE." into oc-dev
am: c21f723ca2

Change-Id: I275df43deb93de8b228484fe164e11227ab95311

commit | commitdiff | tree

Chris Warrington [Fri, 28 Apr 2017 20:36:57 +0000 (20:36 +0000)]

Merge "AAPT2: Error reporting through JNI." into oc-dev

commit | commitdiff | tree

Guang Zhu [Fri, 28 Apr 2017 20:36:57 +0000 (20:36 +0000)]

Merge "Revert "Extend extension support""

commit | commitdiff | tree

Guang Zhu [Fri, 28 Apr 2017 20:32:31 +0000 (20:32 +0000)]

Revert "Extend extension support"

Bug: 37785708

This reverts commit 9933c1cf931c88c9220cc8e4c12fe5d05eb1d940.

Change-Id: Ic96e178835f5a9bbd2416f0e573975c60172388c

commit | commitdiff | tree

Felipe Leme [Fri, 28 Apr 2017 20:29:45 +0000 (20:29 +0000)]

Merge "Changed EXTRA_DATA_EXTRAS to EXTRA_CLIENT_STATE." into oc-dev

commit | commitdiff | tree

Tomasz Wasilczyk [Fri, 28 Apr 2017 20:25:43 +0000 (20:25 +0000)]

Merge "Fix equality method implementation in BandConfig class." am: 30a34ec0e2
am: 5acbf70872

Change-Id: I57e6fa0f946f25048da1524f07fa4eb13fdb2f1c

commit | commitdiff | tree

Philip P. Moltmann [Fri, 28 Apr 2017 20:21:29 +0000 (20:21 +0000)]

Merge "Focus the SaveUi-Yes-Button by default" into oc-dev am: 5bfeece239
am: 52d9ce9921

Change-Id: I2c1236313d50378c87cadb488af92093054fd56d

commit | commitdiff | tree

Tomasz Wasilczyk [Fri, 28 Apr 2017 20:19:11 +0000 (20:19 +0000)]

Merge "Fix equality method implementation in BandConfig class."
am: 30a34ec0e2

Change-Id: I15d46cb69410efdc369d628f1681a880c1420d9d

commit | commitdiff | tree

Andrew Sapperstein [Fri, 28 Apr 2017 20:13:00 +0000 (20:13 +0000)]

Merge "Set Theme.DeviceDefault.Settings's colorEdgeEffect" into oc-dev am: 2233ba3eb5
am: 93aee3993b

Change-Id: Ied1782027bb1a922f6c2dfc1bba972b57ed68695

commit | commitdiff | tree

Philip P. Moltmann [Fri, 28 Apr 2017 20:12:44 +0000 (20:12 +0000)]

Merge "Focus the SaveUi-Yes-Button by default" into oc-dev
am: 5bfeece239

Change-Id: If07dfcceafc5f2c6d1e6acbbb2d662ae80d0b2df

commit | commitdiff | tree

Tomasz Wasilczyk [Fri, 28 Apr 2017 20:09:03 +0000 (20:09 +0000)]

Merge "Fix equality method implementation in BandConfig class."

commit | commitdiff | tree

Andrew Sapperstein [Fri, 28 Apr 2017 20:06:21 +0000 (20:06 +0000)]

Merge "Set Theme.DeviceDefault.Settings's colorEdgeEffect" into oc-dev
am: 2233ba3eb5

Change-Id: I578a447f88ee09da77f4974bce1a23e2c93ed40f

commit | commitdiff | tree

fionaxu [Fri, 28 Apr 2017 20:03:56 +0000 (20:03 +0000)]

Merge "better defualt behaviour for msim" am: fd810d8727
am: 6512f5eb10

Change-Id: Iedf27158b48f606a1f24e8780f98c3399e3337c7

commit | commitdiff | tree

TreeHugger Robot [Fri, 28 Apr 2017 20:02:16 +0000 (20:02 +0000)]

Merge "Focus the SaveUi-Yes-Button by default" into oc-dev

commit | commitdiff | tree

Andrew Sapperstein [Fri, 28 Apr 2017 19:56:14 +0000 (19:56 +0000)]

Merge "Set Theme.DeviceDefault.Settings's colorEdgeEffect" into oc-dev

commit | commitdiff | tree

Tyler Gunn [Fri, 28 Apr 2017 19:53:51 +0000 (19:53 +0000)]

Merge "Add sort order extra for phoneaccount" am: 78d3f9e1f5 am: bd4140a945 am: 9001d22999
am: ea55ba44e7

Change-Id: I8780a5fb1a675d31d0ef4dcfe7bc5fd740a602fe

commit | commitdiff | tree

fionaxu [Fri, 28 Apr 2017 19:53:38 +0000 (19:53 +0000)]

Merge "better defualt behaviour for msim"
am: fd810d8727

Change-Id: I242527153b768879acd1c105e69de5672678b006

commit | commitdiff | tree

Treehugger Robot [Fri, 28 Apr 2017 19:44:49 +0000 (19:44 +0000)]

Merge "better defualt behaviour for msim"

commit | commitdiff | tree

Chen Xu [Fri, 28 Apr 2017 19:38:12 +0000 (19:38 +0000)]

Merge "Updated javadocs for sendUssd APIs." am: 763ff42a69 am: 85f2654bb7 am: 88af063701 -s ours
am: 578469f707

Change-Id: I71195077b60dac5c3048fbfdae5f655d5e794561

commit | commitdiff | tree

Tyler Gunn [Fri, 28 Apr 2017 19:32:55 +0000 (19:32 +0000)]

Merge "Add sort order extra for phoneaccount" am: 78d3f9e1f5 am: bd4140a945
am: 9001d22999

Change-Id: I903198c9b488bc2571f4cfba8ffd25fe15b7260d

commit | commitdiff | tree

Chen Xu [Fri, 28 Apr 2017 19:31:14 +0000 (19:31 +0000)]

Merge "Update VVM API" am: ac29d38623 am: fe7e5970ac am: 21ee1e2b54 -s ours
am: 42e3665651

Change-Id: Ie4f0da1a0b9ce1e256c5d43b59ae0244e081019b

commit | commitdiff | tree

Chen Xu [Fri, 28 Apr 2017 19:30:43 +0000 (19:30 +0000)]

Merge "Updated javadocs for sendUssd APIs." am: 763ff42a69 am: 85f2654bb7
am: 88af063701 -s ours

Change-Id: Ib01f856091f65bd6af36c1f256cc06d749b28ea4

commit | commitdiff | tree

Chen Xu [Fri, 28 Apr 2017 19:21:19 +0000 (19:21 +0000)]

Merge "Update VVM API" am: ac29d38623 am: fe7e5970ac
am: 21ee1e2b54 -s ours

Change-Id: I2ba1d502edfeafbf94c84f0154e0ff05b90bf6ab

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 28 Apr 2017 19:19:14 +0000 (19:19 +0000)]

Merge "Merge "Allow system apps to define ephemeral permissions" into oc-dev am: 0ddca92018 am: 987da51b85"

commit | commitdiff | tree

Chad Brubaker [Fri, 28 Apr 2017 19:17:57 +0000 (19:17 +0000)]

Merge "Allow system apps to define ephemeral permissions" into oc-dev am: 0ddca92018
am: 987da51b85

Change-Id: I281a7ca5437ce52034ced8aa9b03f497e27b9343

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 28 Apr 2017 19:17:23 +0000 (19:17 +0000)]

Merge "Merge "Add conic support for Path#approximate" into oc-dev am: ebd44d0076 am: a1e500ebf4"

commit | commitdiff | tree

Chris Craik [Fri, 28 Apr 2017 19:15:19 +0000 (19:15 +0000)]

Merge "Add conic support for Path#approximate" into oc-dev am: ebd44d0076
am: a1e500ebf4

Change-Id: I2e4a6b53332fb746df83cda46104fe5206289519

commit | commitdiff | tree

Chris Craik [Fri, 28 Apr 2017 19:11:02 +0000 (19:11 +0000)]

Merge "Add conic support for Path#approximate" into oc-dev am: ebd44d0076
am: a1e500ebf4

Change-Id: Ifc5033fbb595a672a29539599e39ac7e56c62d50

commit | commitdiff | tree

Eric Laurent [Fri, 28 Apr 2017 19:07:29 +0000 (19:07 +0000)]

Merge "AudioService: fix missing AUDIO_BECOMING_NOISY intent" into oc-dev am: d91cedb76d
am: 82c6833c51

Change-Id: I7c56552a093b8181241dc05584a0e756241921ca

commit | commitdiff | tree

Chad Brubaker [Fri, 28 Apr 2017 19:01:17 +0000 (19:01 +0000)]

Merge "Allow system apps to define ephemeral permissions" into oc-dev
am: 0ddca92018

Change-Id: Ie68abfae227db1b5a62029671ab607ac38620ce3

commit | commitdiff | tree

Dianne Hackborn [Fri, 28 Apr 2017 18:56:44 +0000 (18:56 +0000)]

Merge "Fix issue #37714224: API Review: ACTION_NEW_VIDEO" into oc-dev am: 9cd47a8ff2
am: a0f1fb6b06

Change-Id: Id761a81dd6127f2a1bd05f2e392d8867d7e86e1c

commit | commitdiff | tree

Chris Craik [Fri, 28 Apr 2017 18:53:15 +0000 (18:53 +0000)]

Merge "Add conic support for Path#approximate" into oc-dev
am: ebd44d0076

Change-Id: I68f5924aef7526de1c801f529dd5a304a1a1d287

commit | commitdiff | tree

TreeHugger Robot [Fri, 28 Apr 2017 18:52:42 +0000 (18:52 +0000)]

Merge "Fix bug in translating the outline of a notification."

commit | commitdiff | tree

TreeHugger Robot [Fri, 28 Apr 2017 18:51:07 +0000 (18:51 +0000)]

Merge "Allow system apps to define ephemeral permissions" into oc-dev

commit | commitdiff | tree

Eric Laurent [Fri, 28 Apr 2017 18:51:10 +0000 (18:51 +0000)]

Merge "AudioService: fix missing AUDIO_BECOMING_NOISY intent" into oc-dev
am: d91cedb76d

Change-Id: I0d07b4cb37b9c35086e82bf06d55c99d47b267ad

commit | commitdiff | tree

TreeHugger Robot [Fri, 28 Apr 2017 18:47:31 +0000 (18:47 +0000)]

Merge "Add conic support for Path#approximate" into oc-dev

commit | commitdiff | tree

Shane Brennan [Fri, 28 Apr 2017 18:46:33 +0000 (18:46 +0000)]

Merge "Updating docs for RemoteInput non-textual inputs per API review request." into oc-dev am: 8bfbb0af21
am: 1a0e5ac3cc

Change-Id: I41d8507a7098423719020facf4d33216a442d8f2

commit | commitdiff | tree

Shane Brennan [Fri, 28 Apr 2017 18:44:34 +0000 (18:44 +0000)]

Merge "Update comment to getDataOnlyRemoteInputs per API review." into oc-dev am: 7eec245c62
am: 3ea6d1931d

Change-Id: I0bf694b905d19e64a98ee4659f4f494be04eb922

commit | commitdiff | tree

TreeHugger Robot [Fri, 28 Apr 2017 18:43:37 +0000 (18:43 +0000)]

Merge "AudioService: fix missing AUDIO_BECOMING_NOISY intent" into oc-dev

commit | commitdiff | tree

Jeff Sharkey [Fri, 28 Apr 2017 18:42:27 +0000 (18:42 +0000)]

Merge "Change ClipData.addItem signature" into oc-dev am: 5b26dac2c3
am: bd3fa3c72c

Change-Id: I475d9eca8667005959c5578548b622ed7460b2b0

commit | commitdiff | tree

Dianne Hackborn [Fri, 28 Apr 2017 18:42:20 +0000 (18:42 +0000)]

Merge "Fix issue #37714224: API Review: ACTION_NEW_VIDEO" into oc-dev
am: 9cd47a8ff2

Change-Id: I3b0c2cd18126792c6bd7e3894f8ff7753aecc078

commit | commitdiff | tree

Selim Cinek [Fri, 28 Apr 2017 18:36:26 +0000 (18:36 +0000)]

Merge "Fixes a bug where the asynctask wasn't removed when inflating" into oc-dev am: 7188fda4af
am: bf0a784423

Change-Id: I61c6e1e694e9d9168f8398092dba53e4391d6f02

commit | commitdiff | tree

Matthew Ng [Fri, 28 Apr 2017 18:33:54 +0000 (18:33 +0000)]

Merge "Dismiss docked stack when ShowWhenLocked activity is over keyguard (1/2)" into oc-dev am: ba836ad1fa
am: ed6e67388e

Change-Id: Iaad787457b787dbbdc984aaf7009895c4c6d3091

commit | commitdiff | tree

Shane Brennan [Fri, 28 Apr 2017 18:33:03 +0000 (18:33 +0000)]

Merge "Updating docs for RemoteInput non-textual inputs per API review request." into oc-dev
am: 8bfbb0af21

Change-Id: Iadb42396a450c70049544b967a3220db751158ed

commit | commitdiff | tree

Andrew Scull [Fri, 28 Apr 2017 18:25:23 +0000 (18:25 +0000)]

Merge "Expand abbreviation in constant identifier." into oc-dev am: 2c20a0f885
am: 7d32c0bd04

Change-Id: I435db9c38e42cb0d2dbf82441470e45dc37728cc

commit | commitdiff | tree

Shane Brennan [Fri, 28 Apr 2017 18:22:22 +0000 (18:22 +0000)]

Merge "Update comment to getDataOnlyRemoteInputs per API review." into oc-dev
am: 7eec245c62

Change-Id: I5cb8c194e5f6b233720771db8fabb0b7eef3b0b0

commit | commitdiff | tree

Jeff Sharkey [Fri, 28 Apr 2017 18:20:11 +0000 (18:20 +0000)]

Merge "Change ClipData.addItem signature" into oc-dev
am: 5b26dac2c3

Change-Id: Iefe0521f3aaa7978e3805aae326b56c426885cef

commit | commitdiff | tree

Tyler Gunn [Fri, 28 Apr 2017 18:18:11 +0000 (18:18 +0000)]

Merge "Add sort order extra for phoneaccount" am: 78d3f9e1f5
am: bd4140a945

Change-Id: I541d0bf6c370b952e0e725960187e55ecc9e9ac7

commit | commitdiff | tree

Selim Cinek [Fri, 28 Apr 2017 18:17:22 +0000 (18:17 +0000)]

Merge "Fixes a bug where the asynctask wasn't removed when inflating" into oc-dev
am: 7188fda4af

Change-Id: If501b5b534bee5b95f446fd48012c4c6a779bb10

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 28 Apr 2017 18:15:51 +0000 (18:15 +0000)]

Merge "Merge "expose the UID in the EventLog API" into oc-dev am: 8ae5e04636 am: 21abf1cd20"

commit | commitdiff | tree

Matthew Ng [Fri, 28 Apr 2017 18:15:17 +0000 (18:15 +0000)]

Merge "Dismiss docked stack when ShowWhenLocked activity is over keyguard (1/2)" into oc-dev
am: ba836ad1fa

Change-Id: I34b0e717f5da0c029a8dd4d9571dc57291ec34c3

commit | commitdiff | tree

Chen Xu [Fri, 28 Apr 2017 18:12:21 +0000 (18:12 +0000)]

Merge "Updated javadocs for sendUssd APIs." am: 763ff42a69
am: 85f2654bb7

Change-Id: I5231b118c7cc0ce815b4e7f6c253a85c9d9fd929

commit | commitdiff | tree

Dianne Hackborn [Fri, 28 Apr 2017 18:10:35 +0000 (18:10 +0000)]

Merge "Fix issue #37714224: API Review: ACTION_NEW_VIDEO" into oc-dev

commit | commitdiff | tree

Tyler Gunn [Fri, 28 Apr 2017 18:09:34 +0000 (18:09 +0000)]

Merge "Add sort order extra for phoneaccount"
am: 78d3f9e1f5

Change-Id: I7352b5c26122a2cda79687544d314c35c0a8d769

commit | commitdiff | tree

Chen Xu [Fri, 28 Apr 2017 18:04:42 +0000 (18:04 +0000)]

Merge "Update VVM API" am: ac29d38623
am: fe7e5970ac

Change-Id: I4f6ba7b3edd16cf63a6039b9da34db1a9c48cdec

commit | commitdiff | tree

Felipe Leme [Fri, 28 Apr 2017 17:50:20 +0000 (10:50 -0700)]

Changed EXTRA_DATA_EXTRAS to EXTRA_CLIENT_STATE.

Test: CtsAutoFillServiceTestCases pass

Fixes: 37775662

Change-Id: I85c016c3eb84a439371ac707f78b01d9882b75e9

commit | commitdiff | tree

Chris Wren [Fri, 28 Apr 2017 18:02:57 +0000 (18:02 +0000)]

Merge "expose the UID in the EventLog API" into oc-dev am: 8ae5e04636
am: 21abf1cd20

Change-Id: Id1ccf3fa7a50f276003e98cfebee1407e0fa4090

commit | commitdiff | tree

Shane Brennan [Fri, 28 Apr 2017 18:02:39 +0000 (18:02 +0000)]

Merge "Updating docs for RemoteInput non-textual inputs per API review request." into oc-dev

commit | commitdiff | tree

Glenn Kasten [Fri, 28 Apr 2017 18:02:30 +0000 (18:02 +0000)]

Merge "USB audio: increase protection of member fields"

commit | commitdiff | tree

Andrew Scull [Fri, 28 Apr 2017 18:02:08 +0000 (18:02 +0000)]

Merge "Expand abbreviation in constant identifier." into oc-dev
am: 2c20a0f885

Change-Id: I2556528e6eed48196c622695c7d1e48043b5000e

commit | commitdiff | tree

Tyler Gunn [Fri, 28 Apr 2017 17:58:43 +0000 (17:58 +0000)]

Merge "Add sort order extra for phoneaccount"

commit | commitdiff | tree

Chen Xu [Fri, 28 Apr 2017 17:57:29 +0000 (17:57 +0000)]

Merge "Updated javadocs for sendUssd APIs."
am: 763ff42a69

Change-Id: I9a7fd10b652bdbc43b3a171229815f99dfbf8e97

commit | commitdiff | tree

Shane Brennan [Fri, 28 Apr 2017 17:56:50 +0000 (17:56 +0000)]

Merge "Update comment to getDataOnlyRemoteInputs per API review." into oc-dev

commit | commitdiff | tree

Chen Xu [Fri, 28 Apr 2017 17:55:07 +0000 (17:55 +0000)]

Merge "Update VVM API"
am: ac29d38623

Change-Id: Iec4b0f3cb89b49902aeeb7a044fbab0a98ba9e3e

commit | commitdiff | tree

Jeff Sharkey [Fri, 28 Apr 2017 17:53:09 +0000 (17:53 +0000)]

Merge "Change ClipData.addItem signature" into oc-dev

commit | commitdiff | tree

Srikanth Chintala [Mon, 27 Mar 2017 13:57:52 +0000 (19:27 +0530)]

Add sort order extra for phoneaccount

Add sort order extra for phoneaccount
which will be used while sorting
phone accounts in Telecomm

Test: Manual
Bug: 34872161
Merged-In: I268d2250cc9bcd1a5e9eb8be99dcb23e2bcceadc
Change-Id: I268d2250cc9bcd1a5e9eb8be99dcb23e2bcceadc

commit | commitdiff | tree

Jeff Sharkey [Fri, 28 Apr 2017 17:51:04 +0000 (17:51 +0000)]

Merge "@hide non-Handler variant of SM.openProxyFileDescriptor" into oc-dev am: 4315c1e3d5
am: 1737e50fa1

Change-Id: I92766efee7b312e9dd09bc7fcac42850f457a5e9

commit | commitdiff | tree

Selim Cinek [Fri, 28 Apr 2017 17:48:55 +0000 (17:48 +0000)]

Merge "Fixes a bug where the asynctask wasn't removed when inflating" into oc-dev

commit | commitdiff | tree

Jeff Sharkey [Fri, 28 Apr 2017 17:48:26 +0000 (17:48 +0000)]

Merge "Respond to API council feedback." into oc-dev am: 77cc43e0d2
am: 86e27f65f8

Change-Id: I7933a8ba6858d38423b29a52dfc5f9f65c641faf

commit | commitdiff | tree

Chris Wren [Fri, 28 Apr 2017 17:46:02 +0000 (17:46 +0000)]

Merge "expose the UID in the EventLog API" into oc-dev
am: 8ae5e04636

Change-Id: Id199e23d3024c9b137946e7802ee57e5e85281db

commit | commitdiff | tree

TreeHugger Robot [Fri, 28 Apr 2017 17:45:21 +0000 (17:45 +0000)]

Merge "Dismiss docked stack when ShowWhenLocked activity is over keyguard (1/2)" into oc-dev

commit | commitdiff | tree

fionaxu [Thu, 6 Apr 2017 17:31:48 +0000 (10:31 -0700)]

better defualt behaviour for msim

switch behaviour for the default case based on caller's context,
some API prefer defaultDataId while others prefer
defaultVoiceId/DefaultSmsId.

Bug: 36818721
Change-Id: Icf8053258f8a95a0b16eb5cf59ec05c0c400ae7a
Merged-in: Icf8053258f8a95a0b16eb5cf59ec05c0c400ae7a

commit | commitdiff | tree

Andrew Scull [Fri, 28 Apr 2017 17:41:48 +0000 (17:41 +0000)]

Merge "Expand abbreviation in constant identifier." into oc-dev

commit | commitdiff | tree

Jeff Sharkey [Fri, 28 Apr 2017 17:38:33 +0000 (17:38 +0000)]

Merge "@hide non-Handler variant of SM.openProxyFileDescriptor" into oc-dev
am: 4315c1e3d5

Change-Id: I8ec2d24a8b6bda9641bbb627e69521914240942f

commit | commitdiff | tree

Chris Craik [Fri, 28 Apr 2017 17:32:16 +0000 (17:32 +0000)]

Merge "Make SurfaceTexture#isReleased public API" into oc-dev am: 533538c96e
am: 7b026d8aa4

Change-Id: Ia6d5b4179881c20f30a4de3b3e2efde38bfa4c23

commit | commitdiff | tree

TreeHugger Robot [Fri, 28 Apr 2017 17:28:01 +0000 (17:28 +0000)]

Merge "expose the UID in the EventLog API" into oc-dev

commit | commitdiff | tree

Jeff Sharkey [Fri, 28 Apr 2017 17:27:53 +0000 (17:27 +0000)]

Merge "Respond to API council feedback." into oc-dev
am: 77cc43e0d2

Change-Id: I0c2b86d34cfd2b2f5b94bc693657b40ecbd764fe

commit | commitdiff | tree

Jeff Hao [Fri, 28 Apr 2017 17:27:01 +0000 (17:27 +0000)]