OSDN Git Service
Jack Yu [Tue, 2 Apr 2019 20:56:37 +0000 (20:56 +0000)]
Merge "Passing ServiceState as byte array into ServiceStateProvider"
TreeHugger Robot [Tue, 2 Apr 2019 20:53:39 +0000 (20:53 +0000)]
Merge "Pick the primary color as the best color to use."
Michael Wachenschwanz [Tue, 2 Apr 2019 20:52:50 +0000 (20:52 +0000)]
Merge "Clarify timebase for UsageStats Api"
TreeHugger Robot [Tue, 2 Apr 2019 20:51:19 +0000 (20:51 +0000)]
Merge "OMS: remove duplicate mState line from 'cmd overlay dump'"
TreeHugger Robot [Tue, 2 Apr 2019 20:23:35 +0000 (20:23 +0000)]
Merge "Fix ringtone null pointer exception"
Lucas Dupin [Tue, 2 Apr 2019 20:13:41 +0000 (20:13 +0000)]
Merge "Expand NPV when bouncer is gone"
Jian Jin [Tue, 2 Apr 2019 19:57:08 +0000 (19:57 +0000)]
Merge "Create and log atom SystemServerWatchdogOccurred, TombStoneOccurred."
Youming Ye [Mon, 1 Apr 2019 22:52:50 +0000 (15:52 -0700)]
Fix ringtone null pointer exception
Bug:
128468578
Test: Build
Change-Id: If65f0194712c8358fdbd88e7d04478f8395a012b
Andrii Kulian [Tue, 2 Apr 2019 19:38:44 +0000 (19:38 +0000)]
Merge "Update Activity lifecycle documentation"
Daniel Nishi [Tue, 2 Apr 2019 19:33:59 +0000 (19:33 +0000)]
Merge "Explicitly close file stream when initializing quotas."
Evan Laird [Tue, 2 Apr 2019 19:21:46 +0000 (19:21 +0000)]
Merge "Battery drawable powersave tweaks"
TreeHugger Robot [Tue, 2 Apr 2019 19:19:10 +0000 (19:19 +0000)]
Merge "WifiManager: setWifiEnabled bypass for older apps"
Robert Snoeberger [Tue, 2 Apr 2019 17:21:42 +0000 (13:21 -0400)]
Pick the primary color as the best color to use.
Previously, the best color was picked by checking the colors
against the blacklist. The logic was for picking the best color
was broken When the blacklist was removed for
b/
124180048.
Fixes:
b129762944
Test: New test points added to TonalTest.java
Change-Id: Ie51806735910bb40e5e66d7baf545ea213e4a01e
Lucas Dupin [Tue, 2 Apr 2019 18:58:08 +0000 (18:58 +0000)]
Merge "Fix flickering when receiving notification"
Mårten Kongstad [Fri, 29 Mar 2019 06:38:20 +0000 (07:38 +0100)]
OMS: remove duplicate mState line from 'cmd overlay dump'
Commit
38988345744 duplicated the mState part of the OMS dump output (by
mistake). Remove the offending line.
Test: manual (adb shell cmd overlay dump)
Change-Id: Ie5dd9e10b691e3d5b3ac1c60a3a5d01fdc17bdac
Jack Yu [Tue, 2 Apr 2019 17:49:35 +0000 (10:49 -0700)]
Passing ServiceState as byte array into ServiceStateProvider
This allows the provider to reconstruct the service state
object correctly. Also we can get rid of all the 'set'
methods in ServiceState, which we'd like to remove in the future.
Test: Manual
Bug:
129768354
Change-Id: I835d30e544b3ed49d5d0b6b1ca981a81e3ee2039
TreeHugger Robot [Tue, 2 Apr 2019 18:14:53 +0000 (18:14 +0000)]
Merge "SurfaceView: Correct comparison operator."
Tarandeep Singh [Tue, 2 Apr 2019 18:12:23 +0000 (18:12 +0000)]
Merge "Keep IME target till window is closing and not removed"
jianjin [Fri, 29 Mar 2019 21:03:08 +0000 (14:03 -0700)]
Create and log atom SystemServerWatchdogOccurred, TombStoneOccurred.
Bug:
126127632
Change-Id: I1e78069589185a4702d65cd026bc44b374a31f0a
Fix:
126127632
Test: none
TreeHugger Robot [Tue, 2 Apr 2019 17:53:24 +0000 (17:53 +0000)]
Merge "Sharesheet - Give shortcut api results priority"
Jian Jin [Tue, 2 Apr 2019 17:44:42 +0000 (17:44 +0000)]
Merge "Write active metrics to disk on all shutdown cases"
Android Build Merger (Role) [Tue, 2 Apr 2019 17:40:17 +0000 (17:40 +0000)]
Merge "[automerger skipped] Merge "Convert frameworks/base/cmds/* to Android.bp" am:
179e132823 am:
aa9e302a63 am:
86860a5254 -s ours am skip reason: change_id Ieb54feb3902bddfd5a571369fbf50161ae646647 with SHA1
0a2d8cbb26 is in history"
Colin Cross [Tue, 2 Apr 2019 17:38:36 +0000 (10:38 -0700)]
[automerger skipped] Merge "Convert frameworks/base/cmds/* to Android.bp" am:
179e132823 am:
aa9e302a63
am:
86860a5254 -s ours
am skip reason: change_id Ieb54feb3902bddfd5a571369fbf50161ae646647 with SHA1
0a2d8cbb26 is in history
Change-Id: Iac4445001f4ed12a5da331dc353bfa3918e22e78
Lei Yu [Tue, 2 Apr 2019 17:34:21 +0000 (17:34 +0000)]
Merge "Update bt icon color"
Andrew Sapperstein [Tue, 2 Apr 2019 17:32:25 +0000 (17:32 +0000)]
Merge "Default enable feature flag for Safety Hub"
Colin Cross [Tue, 2 Apr 2019 17:19:15 +0000 (10:19 -0700)]
Merge "Convert frameworks/base/cmds/* to Android.bp" am:
179e132823
am:
aa9e302a63
Change-Id: I05de333caa6aa5ed6b33389e2c320d845b9a36ee
TreeHugger Robot [Tue, 2 Apr 2019 17:14:44 +0000 (17:14 +0000)]
Merge "BaseIDevicePolicyManager Q cleanup."
Chavi Weingarten [Tue, 2 Apr 2019 17:12:07 +0000 (17:12 +0000)]
Merge "Remove closeTransactionSync since it's no longer used."
Colin Cross [Tue, 2 Apr 2019 16:59:30 +0000 (09:59 -0700)]
Merge "Convert frameworks/base/cmds/* to Android.bp"
am:
179e132823
Change-Id: I22698f8a29dfe60b7dc1198ac62af5d59827e9d7
Lucas Dupin [Tue, 2 Apr 2019 16:58:27 +0000 (16:58 +0000)]
Merge "Do not colorize dark mode actions"
Colin Cross [Tue, 2 Apr 2019 16:39:04 +0000 (16:39 +0000)]
Merge "Convert frameworks/base/cmds/* to Android.bp"
John Reck [Tue, 2 Apr 2019 16:38:48 +0000 (16:38 +0000)]
Merge "Fix performance regression in textclassifier"
TreeHugger Robot [Tue, 2 Apr 2019 16:20:23 +0000 (16:20 +0000)]
Merge "Sharesheet - Photos -> Sharesheet in work profile crashes"
TreeHugger Robot [Tue, 2 Apr 2019 16:20:19 +0000 (16:20 +0000)]
Merge "Fix hotspot icon tint in Settings."
TreeHugger Robot [Tue, 2 Apr 2019 16:18:29 +0000 (16:18 +0000)]
Merge "Use system user when installing APKs."
Janis Danisevskis [Tue, 2 Apr 2019 16:13:15 +0000 (16:13 +0000)]
Merge "Keystore.java: Make apps tolerant to keystore crashes"
Janis Danisevskis [Wed, 27 Mar 2019 22:50:28 +0000 (15:50 -0700)]
Keystore.java: Make apps tolerant to keystore crashes
Since keystore accepts asynchronous requests it may be that apps wait
forever if keystore dies. This patch adds a death recipient to all
keystore promises so that Keystore.java gets notified when keystore
dies.
Test: atest android.keystore.cts
Bug:
111443219
Bug:
128991260
Change-Id: Ie6e4a4f371287f83a2cdf4069d5686c67d8aebc1
Josh Tsuji [Tue, 2 Apr 2019 16:01:49 +0000 (16:01 +0000)]
Merge "Disable the restored at resting position test, it's being flaky."
Joshua Tsuji [Tue, 2 Apr 2019 15:56:21 +0000 (11:56 -0400)]
Disable the restored at resting position test, it's being flaky.
Test: disabling a test
Change-Id: I3fa36378bf93929c6e8f195d26a79ee3e2217150
Lucas Dupin [Tue, 2 Apr 2019 15:55:12 +0000 (15:55 +0000)]
Merge "ClockManager listeners receive separate ClockPlugin instances."
Benjamin Miller [Tue, 2 Apr 2019 15:45:38 +0000 (08:45 -0700)]
Merge "docs: Linked VpnService class description to guide." am:
97f778f0b5 am:
a2443f115e
am:
ff94fa9d4e
Change-Id: I0758c4d7c79810bbb0c7a78a803f5e875f35cf48
Benjamin Miller [Tue, 2 Apr 2019 15:36:21 +0000 (08:36 -0700)]
Merge "docs: Linked VpnService class description to guide." am:
97f778f0b5
am:
a2443f115e
Change-Id: I2a43d91af59ea51a8f81aecc0970e7ba77eaa3b1
Benjamin Miller [Tue, 2 Apr 2019 15:28:16 +0000 (08:28 -0700)]
Merge "docs: Linked VpnService class description to guide."
am:
97f778f0b5
Change-Id: I567720f4d1410b5d2da415321d7eebc2f79f35f6
Lenka Trochtova [Tue, 2 Apr 2019 11:39:51 +0000 (13:39 +0200)]
BaseIDevicePolicyManager Q cleanup.
Bug:
126706812
Test: make && atest DevicePolicyManagerTest
Change-Id: Ie9a62b76b0cc47a50bf4b0d26fe60cc541bcb18d
Treehugger Robot [Tue, 2 Apr 2019 15:14:28 +0000 (15:14 +0000)]
Merge "docs: Linked VpnService class description to guide."
Matt Pietal [Mon, 1 Apr 2019 15:29:56 +0000 (11:29 -0400)]
Sharesheet - Give shortcut api results priority
Limit the direct share list to MAX_SERVICE_COUNT and discard any
results over that. Do not furthur rank results from App Prediction
Service, and also give other shortcut results priority over older
direct share targets
Bug:
126568576
Test: atest ChooserActivityTest
Change-Id: I2e2d53134273583a504c71ae4daa9f1db951b164
Aaron Heuckroth [Tue, 2 Apr 2019 14:39:52 +0000 (14:39 +0000)]
Merge "Fix crash on power menu rotation, and re-render power menu onUiModeChanged."
TreeHugger Robot [Tue, 2 Apr 2019 14:32:11 +0000 (14:32 +0000)]
Merge "Fix sharesheet permissioned icon loading bug"
Matt Pietal [Tue, 2 Apr 2019 14:10:22 +0000 (10:10 -0400)]
Sharesheet - Photos -> Sharesheet in work profile crashes
The issue stems from adding the incorrect userid when first entering
the sharesheet. The flow from Photos sendkit directly to the work
profile sharesheet was setting the incorrect userid on the content
uris. Move this logic to the correct location.
Bug:
129280812
Test: Manually retest Photos->Share->Work Profile->Chat
Change-Id: I3660684336450172852cf86bea1f3c60cf15aa87
Android Build Merger (Role) [Tue, 2 Apr 2019 13:55:15 +0000 (13:55 +0000)]
Merge "Merge "Automatically greylist code in 3P packages" am:
1f80714c2d am:
8b1745650b am:
4f0fdf2d43"
Andrei-Valentin Onea [Tue, 2 Apr 2019 13:54:25 +0000 (06:54 -0700)]
Merge "Automatically greylist code in 3P packages" am:
1f80714c2d am:
8b1745650b
am:
4f0fdf2d43
Change-Id: Iaa456ba488b37b87b1b65e312074a60c9b43a9a2
Amin Shaikh [Tue, 2 Apr 2019 13:49:15 +0000 (09:49 -0400)]
Fix hotspot icon tint in Settings.
Also fix tinting other Settings icons and delete unused sysui icon.
Fixes:
126764703
Test: make; flash, change theme, open Settings Network & internet
Change-Id: Idc0dfaf646e6c09974a2fb2aab3963f5da096c01
Cody Northrop [Tue, 2 Apr 2019 13:47:30 +0000 (13:47 +0000)]
Merge "ANGLE: Allow libs from debug package"
Andrei-Valentin Onea [Tue, 2 Apr 2019 13:40:33 +0000 (06:40 -0700)]
Merge "Automatically greylist code in 3P packages" am:
1f80714c2d
am:
8b1745650b
Change-Id: I73ba988cc378c6204a95e3f9e6931336aaf3d953
TreeHugger Robot [Tue, 2 Apr 2019 13:37:05 +0000 (13:37 +0000)]
Merge "Add workaround for qualcomm vulkan AHDARDWAREBUFFER_USAGE_VENDER_0"
Andrei-Valentin Onea [Tue, 2 Apr 2019 13:29:51 +0000 (06:29 -0700)]
Merge "Automatically greylist code in 3P packages"
am:
1f80714c2d
Change-Id: Icb8a10c22c6ecfb807fa8d1669940f02edfd97c4
Dario Freni [Tue, 2 Apr 2019 10:45:13 +0000 (11:45 +0100)]
Use system user when installing APKs.
For Mainline module updates, this will effectively be the same operation
as installing the packages as a secondary user, since the packages are
preinstalled and preinstalled packages are visible to users. Also,
Mainline modules cannot be disabled per-user.
Since staged install are only issued by privileged apps having
INSTALL_PACKAGES permission, we believe this change is safe for the sake
of mainline.
Fix:
129397974
Bug:
129744602
Test: repro b/
129397974 and verify install succeeds.
Change-Id: I5b388707848b6cdbf20511eea02a0c2abd768b86
Greg Daniel [Mon, 1 Apr 2019 13:29:44 +0000 (09:29 -0400)]
Add workaround for qualcomm vulkan AHDARDWAREBUFFER_USAGE_VENDER_0
Test: manual building and testing on device. Bugs related to lack of
flag go away.
Bug:
128923272
Change-Id: I2457988c097d73020162947c346a8716d373185e
Misha Wagner [Tue, 2 Apr 2019 13:19:49 +0000 (13:19 +0000)]
Merge "Add diffing to KernelCpuThreadReader"
Andrei-Valentin Onea [Tue, 2 Apr 2019 13:10:37 +0000 (13:10 +0000)]
Merge "Automatically greylist code in 3P packages"
Alan Stokes [Tue, 2 Apr 2019 12:57:50 +0000 (12:57 +0000)]
Merge "Allow background activity starts to be controlled by DeviceConfig."
TreeHugger Robot [Tue, 2 Apr 2019 12:55:44 +0000 (12:55 +0000)]
Merge "Fix flaky test on daylight savings"
TreeHugger Robot [Tue, 2 Apr 2019 12:52:54 +0000 (12:52 +0000)]
Merge "Fix AndroidTest.xml"
Junyu Lai [Tue, 2 Apr 2019 11:24:18 +0000 (04:24 -0700)]
Merge "Ignore the asynchronous result while stopping keepalive" am:
7934214f4c am:
deae9510db
am:
ef940cfef0
Change-Id: I5f1709f35a5faec7d9a110f3fa24e89ed1b05fbe
Junyu Lai [Tue, 2 Apr 2019 11:15:07 +0000 (04:15 -0700)]
Merge "Ignore the asynchronous result while stopping keepalive" am:
7934214f4c
am:
deae9510db
Change-Id: I25daef8b1bbbbe93e636c320a032a486751ebcc9
Junyu Lai [Tue, 2 Apr 2019 11:05:49 +0000 (04:05 -0700)]
Merge "Ignore the asynchronous result while stopping keepalive"
am:
7934214f4c
Change-Id: Idc6d76ca412f7bbae3b32e81756c419d84dc2c80
Junyu Lai [Tue, 2 Apr 2019 10:48:23 +0000 (10:48 +0000)]
Merge "Ignore the asynchronous result while stopping keepalive"
Richard Uhler [Tue, 2 Apr 2019 09:07:17 +0000 (09:07 +0000)]
Merge "Block getAvailableRollbacks on the handler thread."
Paul Hu [Tue, 2 Apr 2019 08:29:08 +0000 (01:29 -0700)]
Merge "Address leftover comments on 923337 and 930217." am:
1e97aab6f4 am:
55a22b5d17
am:
1d7b92b9d5
Change-Id: I75eadb66c81d72c768e77feddd383d60f8accd65
Paul Hu [Tue, 2 Apr 2019 08:14:24 +0000 (01:14 -0700)]
Merge "Address leftover comments on 923337 and 930217." am:
1e97aab6f4
am:
55a22b5d17
Change-Id: Ibbc8dd7bb869f76515c9f57793db02953dd07804
Paul Hu [Tue, 2 Apr 2019 07:58:18 +0000 (00:58 -0700)]
Merge "Address leftover comments on 923337 and 930217."
am:
1e97aab6f4
Change-Id: I733160ae51b8f0e80f78ab375cdb0a547b74f68d
Zimuzo Ezeozue [Tue, 2 Apr 2019 07:47:27 +0000 (07:47 +0000)]
Merge "Update activity recognition permission naming"
Paul Hu [Tue, 2 Apr 2019 07:39:04 +0000 (07:39 +0000)]
Merge "Address leftover comments on 923337 and 930217."
TreeHugger Robot [Tue, 2 Apr 2019 06:38:55 +0000 (06:38 +0000)]
Merge "Avoid holding WM lock on input path"
Frank Li [Tue, 2 Apr 2019 06:13:00 +0000 (06:13 +0000)]
Merge "update dns message atom"
Mohammad Samiul Islam [Tue, 2 Apr 2019 05:33:44 +0000 (05:33 +0000)]
Merge "Improve PackageInfo parsing for apex files"
TreeHugger Robot [Tue, 2 Apr 2019 05:01:28 +0000 (05:01 +0000)]
Merge "fail multi install when child fails"
TreeHugger Robot [Tue, 2 Apr 2019 04:14:44 +0000 (04:14 +0000)]
Merge "Migrate away from WebView fallback logic."
Joshua Mccloskey [Tue, 2 Apr 2019 03:56:00 +0000 (03:56 +0000)]
Merge "Adding latency biometric for enroll."
TreeHugger Robot [Tue, 2 Apr 2019 03:55:48 +0000 (03:55 +0000)]
Merge "Remove allocation in onLayout"
Steven Moreland [Tue, 2 Apr 2019 03:14:55 +0000 (20:14 -0700)]
Merge "Revert "Revert "Preload non-bootclasspath Java lib ClassLoaders.""" am:
4b5ca28dfe am:
4e709ea3fd
am:
96724b57ae
Change-Id: I3de2f4b4fb092d0db5001209d68ea217e150b8da
Jeff Sharkey [Tue, 2 Apr 2019 02:59:38 +0000 (02:59 +0000)]
Merge "Remove greylist of apps that gain legacy access."
Steven Moreland [Tue, 2 Apr 2019 02:50:13 +0000 (19:50 -0700)]
Merge "Revert "Revert "Preload non-bootclasspath Java lib ClassLoaders.""" am:
4b5ca28dfe
am:
4e709ea3fd
Change-Id: Ia5b6280f17a67f0fa791f36544a77e2af99e7e0e
Android Build Merger (Role) [Tue, 2 Apr 2019 02:48:30 +0000 (02:48 +0000)]
Merge "[automerger skipped] Merge "API Feedback for CBRS" am:
9c706654a2 am:
f9edc9fffd am:
4e578310f8 -s ours am skip reason: change_id I2476834a5048d0e3c2c3413d7168a7a3ad2d7042 with SHA1
32240b572b is in history"
Xiangyu/Malcolm Chen [Tue, 2 Apr 2019 02:46:38 +0000 (19:46 -0700)]
[automerger skipped] Merge "API Feedback for CBRS" am:
9c706654a2 am:
f9edc9fffd
am:
4e578310f8 -s ours
am skip reason: change_id I2476834a5048d0e3c2c3413d7168a7a3ad2d7042 with SHA1
32240b572b is in history
Change-Id: I751e7c20c5e7f6eb4b82ea8e0aad6cbcca176ae6
TreeHugger Robot [Tue, 2 Apr 2019 02:41:29 +0000 (02:41 +0000)]
Merge "WM: Add a crop to touchable region if needed"
Steven Moreland [Tue, 2 Apr 2019 02:38:43 +0000 (19:38 -0700)]
Merge "Revert "Revert "Preload non-bootclasspath Java lib ClassLoaders."""
am:
4b5ca28dfe
Change-Id: I63fa6d4a8671db24bf9fce898414c27068547ed2
TreeHugger Robot [Tue, 2 Apr 2019 02:36:21 +0000 (02:36 +0000)]
Merge "Batch the commit-to-disk of new persisted jobs"
jianjin [Fri, 29 Mar 2019 20:53:48 +0000 (13:53 -0700)]
Write active metrics to disk on all shutdown cases
Bug:
126132516
Fixes:
126132516
Test: manual tests
Change-Id: Ic0e897c57d0bf8b55167f185fa4ac80b1d672af0
Paul Hu [Tue, 2 Apr 2019 02:32:54 +0000 (19:32 -0700)]
Merge "[IPMS] Implement regular maintenance" am:
7f10bb1c11 am:
c308297bc2
am:
7da31a0cf5
Change-Id: I5be38b1eb3d05d5e7c8fa93094816bb3dab7b5d4
Xiangyu/Malcolm Chen [Tue, 2 Apr 2019 02:26:11 +0000 (19:26 -0700)]
Merge "API Feedback for CBRS" am:
9c706654a2
am:
f9edc9fffd
Change-Id: I7c449a129ab8bd759b40e0aa0a429dd7847ef755
Paul Hu [Tue, 2 Apr 2019 02:24:38 +0000 (19:24 -0700)]
Merge "Fix IpPrefixTest#testContainsInetAddress fail." am:
66a133858b am:
9872066d02
am:
c13f50f5af
Change-Id: I9e74dc9bf30a53ce78395e502a52891ba488f4b1
Steven Moreland [Tue, 2 Apr 2019 02:19:44 +0000 (02:19 +0000)]
Merge "Revert "Revert "Preload non-bootclasspath Java lib ClassLoaders."""
Xiangyu/Malcolm Chen [Tue, 2 Apr 2019 02:10:02 +0000 (19:10 -0700)]
Merge "API Feedback for CBRS"
am:
9c706654a2
Change-Id: I6a6d0a81100093696fc6e4b66b32e34dbed49913
Paul Hu [Tue, 2 Apr 2019 02:09:46 +0000 (19:09 -0700)]
Merge "[IPMS] Implement regular maintenance" am:
7f10bb1c11
am:
c308297bc2
Change-Id: Ia9bb46e1ffaf3c3d0a268de1dc0a2fad03b4e240
Remi NGUYEN VAN [Tue, 2 Apr 2019 02:04:18 +0000 (19:04 -0700)]
[automerger skipped] Merge "Rename NetworkStackPermissionStub" am:
073e73a0c1 am:
63d998d859
am:
aae8aa3dde -s ours
am skip reason: change_id I7bdc058dddfa483823074055ad5c9d7d2efd37b9 with SHA1
63b386cd0b is in history
Change-Id: If16e04ff1d3aefe408895252c7c2b8233238e65d
Lucas Dupin [Tue, 2 Apr 2019 02:03:10 +0000 (19:03 -0700)]
Expand NPV when bouncer is gone
This ensures that we'll have the correct expansion after bouncer
dismissal, instead of relying on updateIsKeyguard() to be called
after KeyguardBouncer#hide
Test: double tap notification on LS, shade, shade locked, AOD
Test: auth or cancel after seeing bouncer on each case
Test: solve SIM PIN challenge
Fixes:
129706733
Change-Id: I7946ac1bc385f36caf1d414fd7505416278b48e8
Lucas Dupin [Tue, 2 Apr 2019 02:00:12 +0000 (19:00 -0700)]
Do not colorize dark mode actions
Test: visual
Fixes:
120080173
Change-Id: I9f016670aa88f13b7fd99e89a509a56f62926797
Paul Hu [Tue, 2 Apr 2019 01:59:35 +0000 (18:59 -0700)]
Merge "Fix IpPrefixTest#testContainsInetAddress fail." am:
66a133858b
am:
9872066d02
Change-Id: I257b51a4f0be974eacf8a6c0f12b5d5aacdc7a5f
Paul Hu [Tue, 2 Apr 2019 01:58:18 +0000 (18:58 -0700)]
Merge "[IPMS] Implement regular maintenance"
am:
7f10bb1c11
Change-Id: I82e4bc47ed3dc2d1b6907c7229df296ba2b4d88e