OSDN Git Service
TreeHugger Robot [Sat, 29 Apr 2017 03:05:25 +0000 (03:05 +0000)]
Merge "API: make "what's the quota?" an operation on the backup data sinks" into oc-dev
TreeHugger Robot [Sat, 29 Apr 2017 02:48:24 +0000 (02:48 +0000)]
Merge "Throttle location update rate in proximity alert" into oc-dev
Chris Craik [Fri, 28 Apr 2017 23:03:57 +0000 (23:03 +0000)]
Merge "Revert "Temporarily enable GL validation"" into oc-dev
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
Jeff Sharkey [Fri, 28 Apr 2017 22:54:34 +0000 (22:54 +0000)]
Merge "Respond to API council feedback." into oc-dev
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
Lifu Tang [Fri, 24 Mar 2017 06:48:00 +0000 (23:48 -0700)]
Throttle location update rate in proximity alert
Bug:
36197768
Test: manual
Change-Id: I2427ed7e77e9153c20e7c65e8f861de4c7ffeac6
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
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
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
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
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
Chris Warrington [Fri, 28 Apr 2017 20:36:57 +0000 (20:36 +0000)]
Merge "AAPT2: Error reporting through JNI." into oc-dev
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
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
TreeHugger Robot [Fri, 28 Apr 2017 20:02:16 +0000 (20:02 +0000)]
Merge "Focus the SaveUi-Yes-Button by default" into oc-dev
Andrew Sapperstein [Fri, 28 Apr 2017 19:56:14 +0000 (19:56 +0000)]
Merge "Set Theme.DeviceDefault.Settings's colorEdgeEffect" into oc-dev
TreeHugger Robot [Fri, 28 Apr 2017 18:51:07 +0000 (18:51 +0000)]
Merge "Allow system apps to define ephemeral permissions" into oc-dev
TreeHugger Robot [Fri, 28 Apr 2017 18:47:31 +0000 (18:47 +0000)]
Merge "Add conic support for Path#approximate" into oc-dev
TreeHugger Robot [Fri, 28 Apr 2017 18:43:37 +0000 (18:43 +0000)]
Merge "AudioService: fix missing AUDIO_BECOMING_NOISY intent" into oc-dev
Pavel Grafov [Fri, 28 Apr 2017 18:09:38 +0000 (19:09 +0100)]
Use List instead of array in network logging API.
Bug:
37625453
Test: runtest --path frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/NetworkEventTest.java
Test: ts-tradefed run cts -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.DeviceOwnerTest#testNetworkLoggingWithSingleUser
Change-Id: Icba7e3178202e0e650689d98c4010a9b40c6a53c
Matthew Ng [Tue, 18 Apr 2017 20:55:45 +0000 (13:55 -0700)]
Window can only be fully drawn if app window is not relaunching
This fixes the glitch of having transitions be calculated incorrectly
when starting new activity when other windows still exist. For example
launcher3 has minus one window exist even if the main activity is
destroyed causing incorrect transition going home. This change only
allows the calculation to occur when the app window is not relaunching.
Test: manual - launch app, rotate screen, go home
Change-Id: I7e323486ee6e05ba4c8704832ca0f9d6e648ac90
Fixes:
36113180
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
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
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
Chad Brubaker [Fri, 28 Apr 2017 18:02:26 +0000 (11:02 -0700)]
Create Instant App cookie dir if it doesn't exist
Bug:
37778533
Test: run instant app in b/
37778533
Change-Id: I54ef62f6e5a290f3ccfa49ebde2a9d64a38de6a6
Chad Brubaker [Fri, 28 Apr 2017 17:56:57 +0000 (10:56 -0700)]
Allow Instant Apps to read Settings defined by apps
This is a temporary solution, in the future we will investigate adding
an API that requires the app adding a setting to specify if the setting
should be visible to Instant Apps or not.
Test: run instant app from b/
37765840, see denials are gone.
Bug:
37765840
Change-Id: Ib256d375d2a07f743b360c61ed25c9857aafa36c
Shane Brennan [Fri, 28 Apr 2017 17:56:50 +0000 (17:56 +0000)]
Merge "Update comment to getDataOnlyRemoteInputs per API review." into oc-dev
Jeff Sharkey [Fri, 28 Apr 2017 17:53:09 +0000 (17:53 +0000)]
Merge "Change ClipData.addItem signature" into oc-dev
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
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
Andrew Scull [Fri, 28 Apr 2017 17:41:48 +0000 (17:41 +0000)]
Merge "Expand abbreviation in constant identifier." into oc-dev
TreeHugger Robot [Fri, 28 Apr 2017 17:28:01 +0000 (17:28 +0000)]
Merge "expose the UID in the EventLog API" into oc-dev
Jeff Sharkey [Fri, 28 Apr 2017 17:10:20 +0000 (17:10 +0000)]
Merge "@hide non-Handler variant of SM.openProxyFileDescriptor" into oc-dev
TreeHugger Robot [Fri, 28 Apr 2017 17:10:12 +0000 (17:10 +0000)]
Merge "Respond to API council feedback." into oc-dev
Chris Craik [Fri, 28 Apr 2017 17:09:51 +0000 (17:09 +0000)]
Merge "Make SurfaceTexture#isReleased public API" into oc-dev
Evan Rosky [Fri, 28 Apr 2017 17:05:40 +0000 (17:05 +0000)]
Merge "removeAllViews should also clean-up focusedInCluster" into oc-dev
Eric Laurent [Fri, 28 Apr 2017 01:31:22 +0000 (18:31 -0700)]
AudioService: fix missing AUDIO_BECOMING_NOISY intent
If Bluetooth service calls onBluetoothA2dpDeviceConfigChange() before
setBluetoothA2dpDeviceConnectionState(), there is a chance that the
first method fails leaving the A2DP device state disconnected in audio
policy manager while it appears as connected in AudioService causing a
failure to send the AUDIO_BECOMING_NOISY intent.
Bug:
37687852
Test: Verify AUDIO_BECOMING_NOISY intent is sent even if race
condition occurs.
Change-Id: I014d145e7da5e7d267991ffb2ff50626e71247eb
TreeHugger Robot [Fri, 28 Apr 2017 15:50:26 +0000 (15:50 +0000)]
Merge "Improved Autofill logging." into oc-dev
Chris Wren [Thu, 27 Apr 2017 20:56:54 +0000 (16:56 -0400)]
expose the UID in the EventLog API
Bug:
32806111
Test: runtest --path frameworks/base/core/tests/coretests/src/android/metrics
Change-Id: I16800a33bc6d4d37b3addd71b675fd760bd5d7b8
Julia Reynolds [Fri, 28 Apr 2017 14:47:56 +0000 (14:47 +0000)]
Merge "Default number badging off." into oc-dev
Julia Reynolds [Thu, 27 Apr 2017 14:12:50 +0000 (10:12 -0400)]
Default number badging off.
Test: cts
Bug:
37737008
Change-Id: I5f73a648936d18c59c74334083b33e131395a681
TreeHugger Robot [Fri, 28 Apr 2017 14:29:06 +0000 (14:29 +0000)]
Merge "Workaround an interpreter behavior to fix leak" into oc-dev
Pavel Grafov [Fri, 28 Apr 2017 14:15:53 +0000 (14:15 +0000)]
Merge "Introduce DISALLOW_BLUETOOTH_SHARING." into oc-dev
Kirill Grouchnikov [Fri, 28 Apr 2017 13:56:22 +0000 (13:56 +0000)]
Merge "Tweak initialization order of LinearLayout's dividers" into oc-dev
Felipe Leme [Thu, 27 Apr 2017 20:56:22 +0000 (13:56 -0700)]
Improved Autofill logging.
- Removed ui.Helper.
- Replaced DEBUG and VERBOSE constants by sDebug and sVerbose.
- Added a shell command to dynamically set the constants.
- Removed obsoleted log statements.
- Changed log-level of some log entries.
- Removed unused methods.
Fixes:
36141126
Test: CtsAutoFillServiceTestCases pass
Test: manual verification
Change-Id: Ic08ee9a2adc10e63f49bbcc7ed126455462dc9c1
Julia Reynolds [Fri, 28 Apr 2017 13:44:04 +0000 (13:44 +0000)]
Merge "Documentation updates" into oc-dev
TreeHugger Robot [Fri, 28 Apr 2017 13:40:53 +0000 (13:40 +0000)]
Merge "Fix notification text not wrapping and clipping switch." into oc-dev
Jorim Jaggi [Thu, 27 Apr 2017 15:44:00 +0000 (17:44 +0200)]
Workaround an interpreter behavior to fix leak
When a local variable (cachedThumbnailData) gets out of scope,
the interpreter might still keep a reference to it in the
register. Thus, we extract the handling of this local variable
into a method such that it gets removed from the register.
Test: Open recents, go home, take dump, make sure no reference
from HandlerThread to ThumbnailData is still existing.
Fixes:
37630958
Change-Id: If25456b212341be7a66882a0adfd5afb4a64ce23
Andrew Scull [Tue, 25 Apr 2017 13:44:24 +0000 (14:44 +0100)]
Expand abbreviation in constant identifier.
The abbreviation is not in common use. Also remove FBE from
documentation as it also isn't used elsewhere.
Test: Build success
Bug:
37621349
Change-Id: Icf19be5e96e71dcd45aa7cac8f58b05b6d77d02b
TreeHugger Robot [Fri, 28 Apr 2017 09:49:41 +0000 (09:49 +0000)]
Merge "Notify WifiManager of interface state changes" into oc-dev
TreeHugger Robot [Fri, 28 Apr 2017 09:48:45 +0000 (09:48 +0000)]
Merge "Apply static RRO when parsing Android manifest of a target package" into oc-dev
TreeHugger Robot [Fri, 28 Apr 2017 09:24:59 +0000 (09:24 +0000)]
Merge "Refactored Autofill to move starting flag out of Session." into oc-dev
Chris Warrington [Thu, 27 Apr 2017 14:27:01 +0000 (15:27 +0100)]
AAPT2: Error reporting through JNI.
Rather than relying on stderr being wired correctly.
Test: Tests for JNI integration in studio-master-dev.
Change-Id: I1c7e7130bc4e56d61de259a9596bee3a6b3520fb
Narayan Kamath [Fri, 28 Apr 2017 08:42:34 +0000 (08:42 +0000)]
Merge "AppErrors: Refine notion of "interesting" processes for b/g ANRs." into oc-dev
Erik Kline [Thu, 27 Apr 2017 11:57:23 +0000 (20:57 +0900)]
Notify WifiManager of interface state changes
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
(except for an unrelated IpConnectivityMetricsTest error)
Bug:
31466854
Bug:
32163131
Change-Id: I702ea79eb2c02604761e4e1ebcd5f9e445178efb
Jaekyun Seok [Tue, 11 Apr 2017 00:41:11 +0000 (09:41 +0900)]
Apply static RRO when parsing Android manifest of a target package
This CL creates idmaps for static RROs right before parsing a target
package. Those idmaps will be used to parse correctly the Android
manifest of the target package.
Later, OverlayManagerService will update each idmap with the correct
gid from the target package app id.
Note that the idmaps generated here will be used by OverlayManagerService
as well until they are outdated (http://ag/
2127839).
Additionally a target package should be parsed again if its overlays are
updated to apply the changes.
Test: building succeeded and tested with sailfish-userdebug.
Bug:
37179531
Change-Id: Ie0d5e92ae6e06b2d377ebd4cfdb0a8519b49a944
TreeHugger Robot [Fri, 28 Apr 2017 06:42:17 +0000 (06:42 +0000)]
Merge "Changed HtmlInfo.getAttributes() to return List instead of ArrayList" into oc-dev
Felipe Leme [Wed, 26 Apr 2017 19:36:01 +0000 (12:36 -0700)]
Refactored Autofill to move starting flag out of Session.
Otherwise, all onFillRequest() calls in the same partition would use
the same flags.
Fixes:
37675138
Test: existing CtsAutoFillServiceTestCases pass
Test: CtsAssistTestCases pass
Test: PartitionedActivityTest.testAutofill4ParitionsMixManualAndAuto() pass
Change-Id: I03c8a036637bae534904d4f41265e451088cf940
Svetoslav Ganov [Fri, 28 Apr 2017 06:29:58 +0000 (06:29 +0000)]
Merge "Implement the rest of autofill importance modes" into oc-dev
Svetoslav Ganov [Fri, 28 Apr 2017 06:29:19 +0000 (06:29 +0000)]
Merge "Force autofill on overflow only if empty" into oc-dev
Daichi Hirono [Fri, 28 Apr 2017 05:53:19 +0000 (14:53 +0900)]
@hide non-Handler variant of SM.openProxyFileDescriptor
Bug:
37749462
Test: Build succeeded
Change-Id: I2e3d0cf9e219353eae4dae384c93d99b9ef60ea9
Felipe Leme [Thu, 27 Apr 2017 22:24:19 +0000 (15:24 -0700)]
Changed HtmlInfo.getAttributes() to return List instead of ArrayList
Fixes:
37747396
Test: CtsAutoFillServiceTestCases pass
Change-Id: Ief53e6d71805f561577b73e57a9d36bc3769862a
Lorenzo Colitti [Fri, 28 Apr 2017 03:58:06 +0000 (03:58 +0000)]
Merge "Address ConnectivityManager API comments." into oc-dev
TreeHugger Robot [Fri, 28 Apr 2017 03:41:57 +0000 (03:41 +0000)]
Merge "Rename FingerprintGestureCallback.onGesture" into oc-dev
TreeHugger Robot [Fri, 28 Apr 2017 03:41:29 +0000 (03:41 +0000)]
Merge "@NonNull on AccessibilityButtonController methods" into oc-dev
TreeHugger Robot [Fri, 28 Apr 2017 03:40:38 +0000 (03:40 +0000)]
Merge "FP won't wake device if daemon dies" into oc-dev
TreeHugger Robot [Fri, 28 Apr 2017 03:27:43 +0000 (03:27 +0000)]
Merge "AudioService: unmute media on connection of new audio accessory" into oc-dev
Erik Kline [Fri, 28 Apr 2017 03:01:06 +0000 (03:01 +0000)]
Merge "Switch to WifiManager.{start,stop}SoftAp()" into oc-dev
TreeHugger Robot [Fri, 28 Apr 2017 02:21:41 +0000 (02:21 +0000)]
Merge "Follow acronym convention for Companion BLE filter" into oc-dev
Erik Kline [Fri, 28 Apr 2017 01:56:57 +0000 (01:56 +0000)]
Merge "WifiManager: add updateInterfaceIpState" into oc-dev
TreeHugger Robot [Fri, 28 Apr 2017 01:36:04 +0000 (01:36 +0000)]
Merge "Fixed requestAutofill()." into oc-dev
TreeHugger Robot [Fri, 28 Apr 2017 01:21:48 +0000 (01:21 +0000)]
Merge "Fix LoginActivityTest#testIsServiceEnabled" into oc-dev
Selim Gurun [Fri, 28 Apr 2017 01:20:25 +0000 (01:20 +0000)]
Merge "Hide onMovedToDisplay for WebView" into oc-dev
TreeHugger Robot [Fri, 28 Apr 2017 01:19:40 +0000 (01:19 +0000)]
Merge "Do not autofill twice" into oc-dev
Svet Ganov [Wed, 26 Apr 2017 22:54:27 +0000 (15:54 -0700)]
Implement the rest of autofill importance modes
Test: CTS tests pass; augmented tests to verify new behavior
bug:
36171235
Change-Id: Ieff2b8d7e1c3a3eba456deca7bed70c8e29c415e
Jean-Michel Trivi [Thu, 27 Apr 2017 22:37:34 +0000 (15:37 -0700)]
AudioService: unmute media on connection of new audio accessory
When plugging in a new audio device:
- if the device is considered an external accessory
- and media volume is muted
- and the media volume is non-zero for this device
- and it is used for media playback
then unmute STREAM_MUSIC.
Log when AVRCP absolute volume is supported.
Test: mute media volume with icon, insert headset then play music, music should not be muted
Bug:
30440012
Change-Id: I102f26c435fa5cbd1e1bc4c14f51629d3cc51fb3
Selim Cinek [Fri, 28 Apr 2017 00:30:50 +0000 (17:30 -0700)]
Fixes a bug where the asynctask wasn't removed when inflating
Test: runtest systemui
Bug:
36561228
Change-Id: I9b5099d4a32be1f18db2ab1f8c94fe6f35a51b18
Winson Chung [Fri, 28 Apr 2017 00:58:18 +0000 (00:58 +0000)]
Merge "Only sublist array by size or limit, whichever is smaller." into oc-dev
TreeHugger Robot [Fri, 28 Apr 2017 00:41:21 +0000 (00:41 +0000)]
Merge "Expose missing accessibility settings to instant apps" into oc-dev
Winson Chung [Fri, 28 Apr 2017 00:38:13 +0000 (17:38 -0700)]
Only sublist array by size or limit, whichever is smaller.
Bug:
37756537
Test: Set < 3 actions, ensure no crash...
Change-Id: I93a5ac78292fcdd870ebd897441c2cef0774d134
Mathias Agopian [Fri, 28 Apr 2017 00:29:28 +0000 (00:29 +0000)]
Merge "Plumb gralloc producer/consumer bits correctly" into oc-dev
Selim Cinek [Fri, 28 Apr 2017 00:24:49 +0000 (00:24 +0000)]
Merge changes from topic 'music_extraction' into oc-dev
* changes:
Make music notifications not dimmable
Implementing gradual image fade for the media template
Extracting the notification colors based on the album art
Moved notification builder creation to the background
Mathias Agopian [Thu, 20 Apr 2017 23:36:15 +0000 (16:36 -0700)]
Plumb gralloc producer/consumer bits correctly
Bug:
33350696
Test: compile, boot device, its
Change-Id: I6129cedce0b35acfef1702afdd178ba043dd53cb
TreeHugger Robot [Fri, 28 Apr 2017 00:04:07 +0000 (00:04 +0000)]
Merge "Bluetooth: Add constants to ScanResult" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 23:57:38 +0000 (23:57 +0000)]
Merge "Remove reference to removed string" into oc-dev
Android Build Merger (Role) [Thu, 27 Apr 2017 23:52:53 +0000 (23:52 +0000)]
Merge "Add logging around dream start/stop am:
4769b54d49 am:
b50a0cdd5e" into oc-dev
Erik Wolsheimer [Thu, 27 Apr 2017 23:51:45 +0000 (23:51 +0000)]
Add logging around dream start/stop am:
4769b54d49
am:
b50a0cdd5e
Change-Id: I0db4f7ff4c7782e71ff7a4e7528776462132d3ed
TreeHugger Robot [Thu, 27 Apr 2017 23:51:28 +0000 (23:51 +0000)]
Merge "add 'changes' cmd to dumpsys" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 23:45:38 +0000 (23:45 +0000)]
Merge "AAPT2: Add workaround for non-standard package IDs" into oc-dev
Erik Wolsheimer [Thu, 27 Apr 2017 23:43:19 +0000 (23:43 +0000)]
Add logging around dream start/stop
am:
4769b54d49
Change-Id: If77de68a0c775b32b6df7e95462f698efc2f84ee
TreeHugger Robot [Thu, 27 Apr 2017 23:38:22 +0000 (23:38 +0000)]
Merge "Throttle wifi scan requests from background apps (1/2)." into oc-dev
Chris Craik [Thu, 27 Apr 2017 22:26:17 +0000 (15:26 -0700)]
Add conic support for Path#approximate
Fixes:
37722722
Test: bit CtsGraphicsTestCases:PathTest
Test: bit CtsUiRenderingTestCases:android.uirendering.cts.testclasses.PathTests
Also adds static asserts to path-walking code, to avoid this problem
in the future.
Also adds annotations, since this is public API now.
Change-Id: Ic39b167968b98fd8197be2d0f9aca79949717237
TreeHugger Robot [Thu, 27 Apr 2017 23:17:06 +0000 (23:17 +0000)]
Merge "Remove FontsContract.buildTypeface with weight/italic argument." into oc-dev
Joe Onorato [Thu, 27 Apr 2017 23:15:09 +0000 (23:15 +0000)]
Merge "Turn off log spew, and make it use Slog.w instead of e.printStackTrace" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 23:02:31 +0000 (23:02 +0000)]
Merge "Fixing service notification on secondary users" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 22:56:03 +0000 (22:56 +0000)]
Merge "Change snoozing behavior for notifications in groups" into oc-dev
Chad Brubaker [Thu, 27 Apr 2017 22:28:57 +0000 (15:28 -0700)]
Expose missing accessibility settings to instant apps
Fixes:
37631050
Test: EphemeralTest#testWebViewLoads
Change-Id: I9c4c6d5dd4b8f2c1e27009d77f6f11035d4f1667
Selim Cinek [Tue, 25 Apr 2017 05:18:48 +0000 (22:18 -0700)]
Make music notifications not dimmable
For contrast requirements and for the image effect
to work properly, music notifications should not be
dimmable.
Test: add music notification, look at lockscreen
Fixes:
36561228
Merged-In: I58313e1828c64d34737390ad03e1deef078a7059
Change-Id: I58313e1828c64d34737390ad03e1deef078a7059
Vladislav Kaznacheev [Thu, 20 Apr 2017 15:38:21 +0000 (08:38 -0700)]
Change ClipData.addItem signature
Make ContentResolver the first parameter.
Bug:
37419379
Test: android.content.cts.ClipboardManagerTest
Change-Id: I3f7772e8ddc93eec0e930b62c722a145f9e6f0fa