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

Bill Yi [Sun, 30 Apr 2017 03:32:09 +0000 (20:32 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Renat Aksitov [Sat, 29 Apr 2017 00:07:15 +0000 (00:07 +0000)]

Merge "Voice Messaging Intent API."

commit | commitdiff | tree

Tomasz Wasilczyk [Fri, 28 Apr 2017 23:43:41 +0000 (23:43 +0000)]

Merge "Convert band configuration when passing to and from HAL."

commit | commitdiff | tree

Zac Iqbal [Fri, 28 Apr 2017 23:43:34 +0000 (23:43 +0000)]

Merge "Added indication text stubs for changes to trust."

commit | commitdiff | tree

Chris Craik [Fri, 28 Apr 2017 23:34:02 +0000 (23:34 +0000)]

Merge "Merge "Revert "Temporarily enable GL validation"" into oc-dev am: 8f4ac4ac05" into oc-dev-plus-aosp
am: ed6ebc5b09

Change-Id: I908b67fb00b1e5846601541038c7e856f9234091

commit | commitdiff | tree

Andreas Gampe [Fri, 28 Apr 2017 23:27:37 +0000 (23:27 +0000)]

Merge "Aapt2: Fix png leak" am: f62e38583a am: 5d4c38c637 am: caecc66ba0 -s ours
am: cfc5aff07f

Change-Id: I7cb92299774b11b46e6f150aefb2280b6ec375f0

commit | commitdiff | tree

Pavel Grafov [Fri, 28 Apr 2017 23:21:48 +0000 (23:21 +0000)]

Merge "Use List instead of array in network logging API." into oc-dev am: 83d139bd1b
am: 49e5ce52bb

Change-Id: If86cf7e255281caf7f0c4ffcded56c025a7d6409

commit | commitdiff | tree

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

Merge "Merge "Revert "Temporarily enable GL validation"" into oc-dev am: 8f4ac4ac05" into oc-dev-plus-aosp

commit | commitdiff | tree

Jeff Sharkey [Fri, 28 Apr 2017 23:15:55 +0000 (23:15 +0000)]

Merge "Respond to API council feedback." into oc-dev am: d275dc83be
am: 858fd1bf47

Change-Id: Ie58915ab6882725ac030a024a09b719f7f9db249

commit | commitdiff | tree

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

Merge "Revert "Temporarily enable GL validation"" into oc-dev
am: 8f4ac4ac05

Change-Id: I7a44ab6a8a2a05c124bbe0d84475f5c21b1b7bf4

commit | commitdiff | tree

Andreas Gampe [Fri, 28 Apr 2017 23:13:59 +0000 (23:13 +0000)]

Merge "Aapt2: Fix png leak" am: f62e38583a am: 5d4c38c637
am: caecc66ba0 -s ours

Change-Id: I91911edbd4b9203a11067bc678807b7ca46895a7

commit | commitdiff | tree

Pavel Grafov [Fri, 28 Apr 2017 23:07:47 +0000 (23:07 +0000)]

Merge "Use List instead of array in network logging API." into oc-dev
am: 83d139bd1b

Change-Id: Iede6b7a87dd76d931ebfd05c8701169ecf162a5e

commit | commitdiff | tree

Matthew Ng [Fri, 28 Apr 2017 23:07:05 +0000 (23:07 +0000)]

Merge "Window can only be fully drawn if app window is not relaunching" into oc-dev am: f7e6f581c0
am: 848eac1df2

Change-Id: Iab7c0bc2cd74ecb7f60c3f047bc0597edd476bbf

commit | commitdiff | tree

Jeff Sharkey [Fri, 28 Apr 2017 23:05:44 +0000 (23:05 +0000)]

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

Change-Id: Ibfe675230ef74e5dea9eb7974604a66003e548fc

commit | commitdiff | tree

Chad Brubaker [Fri, 28 Apr 2017 23:05:23 +0000 (23:05 +0000)]

Merge "Create Instant App cookie dir if it doesn't exist" into oc-dev am: d2cc513e9f
am: 75a64a450e

Change-Id: Ie4d9d3f3f84920a75afd4cd1bd07737f3ad95aa8

commit | commitdiff | tree

Andreas Gampe [Fri, 28 Apr 2017 23:04:23 +0000 (23:04 +0000)]

Merge "Aapt2: Fix png leak" am: f62e38583a
am: 5d4c38c637

Change-Id: I0a14e885d6e2cf886b9e87f395ffa5a600ef7f28

commit | commitdiff | tree

Chris Craik [Fri, 28 Apr 2017 23:03:57 +0000 (23:03 +0000)]

Merge "Revert "Temporarily enable GL validation"" into oc-dev

commit | commitdiff | tree

TreeHugger Robot [Fri, 28 Apr 2017 22:59:55 +0000 (22:59 +0000)]

Merge "Use List instead of array in network logging API." into oc-dev

commit | commitdiff | tree

Matthew Ng [Fri, 28 Apr 2017 22:59:03 +0000 (22:59 +0000)]

Merge "Window can only be fully drawn if app window is not relaunching" into oc-dev
am: f7e6f581c0

Change-Id: I9556d5c24d9192674338cbcf45cd042e02740a73

commit | commitdiff | tree

TreeHugger Robot [Fri, 28 Apr 2017 22:58:30 +0000 (22:58 +0000)]

Merge "AOD: Fix mistaken fall-through in switch statement"

commit | commitdiff | tree

Andreas Gampe [Fri, 28 Apr 2017 22:57:50 +0000 (22:57 +0000)]

Merge "Aapt2: Fix png leak"
am: f62e38583a

Change-Id: I902d6350fa90ebb18b49c3abe6050cfe5471dbb7

commit | commitdiff | tree

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

Merge "Create Instant App cookie dir if it doesn't exist" into oc-dev
am: d2cc513e9f

Change-Id: I28d2e598a9599ded68f9682a058133fcb12eec9e

commit | commitdiff | tree

Jeff Sharkey [Fri, 28 Apr 2017 22:54:34 +0000 (22:54 +0000)]

Merge "Respond to API council feedback." into oc-dev

commit | commitdiff | tree

Dianne Hackborn [Fri, 28 Apr 2017 22:52:35 +0000 (22:52 +0000)]

Merge "Fix issue #37324532: API Review: android.content.pm.InstrumentationInfo" into oc-dev am: fb5840b0e6
am: 0ef4ea95f2

Change-Id: Ib196133e3affc2a9adc8bb66ffdf7dbf0792d307

commit | commitdiff | tree

TreeHugger Robot [Fri, 28 Apr 2017 22:49:21 +0000 (22:49 +0000)]

Merge "Window can only be fully drawn if app window is not relaunching" into oc-dev

commit | commitdiff | tree

Andreas Gampe [Fri, 28 Apr 2017 22:45:25 +0000 (22:45 +0000)]

Merge "Aapt2: Fix png leak"

commit | commitdiff | tree

Dianne Hackborn [Fri, 28 Apr 2017 22:44:35 +0000 (22:44 +0000)]

Merge "Fix issue #37324532: API Review: android.content.pm.InstrumentationInfo" into oc-dev
am: fb5840b0e6

Change-Id: Ib6855dbaec382426038855ab43d5be6d7dcb8892

commit | commitdiff | tree

Hall Liu [Fri, 28 Apr 2017 22:43:53 +0000 (22:43 +0000)]

Merge "eMBMS API update" am: 99b21ccb34 am: 6b4841d116 am: cfb792830c
am: 5184e5ded2

Change-Id: If9978bbcf26c89171057896356c01f4d376540d9

commit | commitdiff | tree

TreeHugger Robot [Fri, 28 Apr 2017 22:39:46 +0000 (22:39 +0000)]

Merge "Create Instant App cookie dir if it doesn't exist" into oc-dev

commit | commitdiff | tree

Hall Liu [Fri, 28 Apr 2017 22:38:27 +0000 (22:38 +0000)]

Merge "eMBMS API update" am: 99b21ccb34 am: 6b4841d116
am: cfb792830c

Change-Id: I4d227eeae02910f4be020b3e9abf3ec5decc168d

commit | commitdiff | tree

Chad Brubaker [Fri, 28 Apr 2017 22:36:22 +0000 (22:36 +0000)]

Merge "Allow Instant Apps to read Settings defined by apps" into oc-dev am: 5d80c9d5fe
am: d9b3c78bfd

Change-Id: Ide88d884e467989bef65ccd3b778b13bdccee3f1

commit | commitdiff | tree

Dianne Hackborn [Fri, 28 Apr 2017 22:34:48 +0000 (22:34 +0000)]

Merge "Fix issue #37324532: API Review: android.content.pm.InstrumentationInfo" into oc-dev

commit | commitdiff | tree

Hall Liu [Fri, 28 Apr 2017 22:32:52 +0000 (22:32 +0000)]

Merge "eMBMS API update" am: 99b21ccb34
am: 6b4841d116

Change-Id: I54ea1661b0d7a341ea94c3a2348d1e6233fd0d80

commit | commitdiff | tree

Chad Brubaker [Fri, 28 Apr 2017 22:31:23 +0000 (22:31 +0000)]

Merge "Allow Instant Apps to read Settings defined by apps" into oc-dev
am: 5d80c9d5fe

Change-Id: I75ae6c210ccd1903d0bd4a814c231e0c570c6288

commit | commitdiff | tree

Hall Liu [Fri, 28 Apr 2017 22:25:53 +0000 (22:25 +0000)]

Merge "eMBMS API update"
am: 99b21ccb34

Change-Id: Ic459910f1a06979cf8e1813d18400236eeb1ad49

commit | commitdiff | tree

TreeHugger Robot [Fri, 28 Apr 2017 22:25:46 +0000 (22:25 +0000)]

Merge "Allow Instant Apps to read Settings defined by apps" into oc-dev

commit | commitdiff | tree

Hall Liu [Fri, 28 Apr 2017 22:17:50 +0000 (22:17 +0000)]

Merge "eMBMS API update"

commit | commitdiff | tree

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

Merge "Merge "Merge "Bluetooth: bluetooth.le API fixes" am: cf95973276 am: 6af9bde898 am: 62fc08f684" into oc-dev-plus-aosp am: d965b300ab"

commit | commitdiff | tree

Jakub Pawlowski [Fri, 28 Apr 2017 22:11:33 +0000 (22:11 +0000)]

Merge "Merge "Bluetooth: bluetooth.le API fixes" am: cf95973276 am: 6af9bde898 am: 62fc08f684" into oc-dev-plus-aosp
am: d965b300ab

Change-Id: I184e2ab1a9692e04ffcef9601d7bab5856611bba

commit | commitdiff | tree

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"

commit | commitdiff | tree

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

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

Merge "Merge "Bluetooth: bluetooth.le API fixes" am: cf95973276 am: 6af9bde898 am: 62fc08f684" into oc-dev-plus-aosp

commit | commitdiff | tree

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

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

Change-Id: I7f8f4cb532afd05df48147068c4e51d1cba310d1

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

Adrian Roos [Fri, 28 Apr 2017 01:04:25 +0000 (18:04 -0700)]

AOD: Fix mistaken fall-through in switch statement

Bug: 36781008
Test: Trigger AOD2, observe that SysUI does not crash after.
Change-Id: I187bd01bf32ae2d8e9bdca50209e9639f760b59d

commit | commitdiff | tree

Andreas Gampe [Fri, 28 Apr 2017 20:51:39 +0000 (13:51 -0700)]

Aapt2: Fix png leak

do9Patch is leaking two rows of data.

Bug: 37782695
Test: ASAN_OPTIONS= SANITIZE_HOST=address m
Change-Id: Ibd2198919cd9c24f2de9f50b23c87753f2190708

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

Zachary Iqbal [Fri, 21 Apr 2017 00:56:42 +0000 (17:56 -0700)]

Added indication text stubs for changes to trust.

Notes:
- Subclasses of KeyguardIndicationController can now provide indication text to be displayed when trust has been granted.

Test: runtest sysui
Bug: 37487319
Change-Id: I030954d51a5c3000c45e465fcd261e4887520aa6

commit | commitdiff | tree

Dianne Hackborn [Fri, 28 Apr 2017 20:36:00 +0000 (13:36 -0700)]

Fix issue #37324532: API Review: android.content.pm.InstrumentationInfo

targetProcess -> targetProcesses

Test: bit CtsAppTestCases:InstrumentationTest

Change-Id: I859985c689cc588c585cd0ec6e0a20411493a7c0

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

Renat Aksitov [Fri, 28 Apr 2017 20:27:20 +0000 (13:27 -0700)]

Voice Messaging Intent API.

Removing EXTRA_SENDER_ACCOUNT_HASH, needs more work.

Bug 37747843

Test: make -j11 docs

Change-Id: I3046611510f85cf69ceff7c2274cda3b692581b9

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

Jeff Sharkey [Fri, 28 Apr 2017 20:19:50 +0000 (14:19 -0600)]

Respond to API council feedback.

Test: builds
Bug: 37752002
Change-Id: I7ae1699c4c5e1a098d16465c41fb41510478b678

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