Age | Commit message (Collapse) | Author |
|
session" into android14-gsi
|
|
Ensuring that previous mediaprojection callbacks are stopped before new callbacks are registered, so new projections aren't immediately stopped after starting.
Bug: 279417791
Test: atest FrameworksServicesTests:MediaProjectionManagerServiceTest#testCreateProjection_priorProjectionGrant --iterations=20
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9c037fb1252c7b6e31c4637cf5483e32b5cd8f64)
Merged-In: Ia8f722bec5e63d7417ed93e2e56c0fccfe8e35a6
Change-Id: Ia8f722bec5e63d7417ed93e2e56c0fccfe8e35a6
|
|
|
|
Bug: 327330325
Bug: 327095853
Test: ALSProbeTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:54534f9c7e2830ce98602ab50811d9aa38d3617d)
Merged-In: I7604f1dd8b1314822b141e18b1c2d6fb717db4ae
Change-Id: I7604f1dd8b1314822b141e18b1c2d6fb717db4ae
(cherry picked from commit 5eda411dbfa8861575db9aec1c7c3814a9f7a812)
|
|
|
|
Fixing getTotalBytes by calling a new API in Vold.
1. Returned the original implementation of rounding logic.
Now it only rounds the bytes by increasing the size,
and never by decreasing.
2. Returned the original logic for all the device sizes <= 512GB to
prevent any potential regressions.
3. For devices with larger capacities now calling vold (one-time call,
then the value is stored in memory) to get the block device size. It's
a very precise number of bytes, so only doing a small rounding (up to
3GB) to try to bring the totalBytes to a nice-looking value, otherwise
just return as is.
Should be tested together with a Settings UI fix: I3dcc9698403612f961cf0de41925dcbcb43e260b
Verified on multiple devices with storage <= 512GB: b/290892417#comment26.
Also verified for 1TB devices: personally and in b/295265657#comment10
Bug: 290892417
Bug: 295358118
Test: verified manually + manually verified calling of new API
Test: atest FileUtilsTest
Test: atest StorageHostTest
(cherry picked from commit be2ec6d958d7be2c798513d2b4cba6c3169e8ec5)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f97e97bfa1dbc0b3bfcd81115b22deb267b36ca7)
Merged-In: I01d72ede6c3ac62198d04829866655ba5a92dc45
Change-Id: I01d72ede6c3ac62198d04829866655ba5a92dc45
|
|
android14-gsi
|
|
When MediaCas service is configured to be launched as a lazy service,
getService() fails since it does not launch a service that is not
already running (which is the case with lazy services). Change the call
to waitForDeclaredService() which attempts to launch a service if not already
running.
Test: atest MediaCasTest
Bug: 301834444
Merged-In: I2c50bd8485719da4d77e1862e93129a66c102e83
Change-Id: I2c50bd8485719da4d77e1862e93129a66c102e83
(cherry picked from commit c8dd41c27adcede2543464c9d1bca5c485ae26e3)
|
|
into android14-gsi
|
|
* changes:
Remove HID usage mapping for stylus buttons in Generic.kl
Add new 10x10 bounding box config option
|
|
|
|
... until we figure out a way to determine if a device supports a
specific HID usage code. Right now, having a usage code mapping means we
automatically assume the device can report the key code. Assuming a
device can support a stylus keycode makes the device get classified as a
stylus, leading to widespread misclassifications.
Bug: 291529805
Test: atest inputflinger_tests
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5fb192aaec7a1d4ebb1384d96b3f79d4b2ca2f2c)
Merged-In: I580514bdcbbfbe93df83fa3faa6262077e881243
Change-Id: I580514bdcbbfbe93df83fa3faa6262077e881243
|
|
Bug: 303089534
Bug: 304681045
Test: N/A
Change-Id: I2921289d3ab0eeb80f0e17497711436135caba8a
(cherry picked from commit 5fab6a5a489c9b1751a2a0fa00410475ce29f11b)
|
|
This reverts commit 2832dee607ab33eee688abea206f4adfcfc896f1.
Rollback of Legacy Iwlan for GSI testing
Bug: 300330588
Test: atest FrameworksTelephonyTests
Change-Id: Ie1f99bc6ce52f9268e31f3cfa205cfe3f17bcb1d
|
|
Low memory device that doesn't support multi window will not support AE
either.
Bug: 301861200
Test: atest WMJetpackUnitTests:WindowExtensionsTest
Merged-In: I54656fecfcd022d80d03464e111b582ac64808e8
Change-Id: I54656fecfcd022d80d03464e111b582ac64808e8
|
|
'googleplex-android-review.googlesource.com/24310240', 'googleplex-android-review.googlesource.com/23727470', 'googleplex-android-review.googlesource.com/24444452', 'googleplex-android-review.googlesource.com/24424817', 'googleplex-android-review.googlesource.com/24248274', 'googleplex-android-review.googlesource.com/24484185', 'googleplex-android-review.googlesource.com/24499883', 'googleplex-android-review.googlesource.com/24681253', 'googleplex-android-review.googlesource.com/24499331', 'googleplex-android-review.googlesource.com/24485253', 'googleplex-android-review.googlesource.com/24026633', 'googleplex-android-review.googlesource.com/24499047', 'googleplex-android-review.googlesource.com/24422641', 'googleplex-android-review.googlesource.com/24733945', 'googleplex-android-review.googlesource.com/24677183', 'googleplex-android-review.googlesource.com/24708071', 'googleplex-android-review.googlesource.com/24758914'] into udc-release. am: 6e47c7075b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24776868
Change-Id: I5b247a2b3f6fd99da6d4dd216ab21b20795abc3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
'googleplex-android-review.googlesource.com/24310240', 'googleplex-android-review.googlesource.com/23727470', 'googleplex-android-review.googlesource.com/24444452', 'googleplex-android-review.googlesource.com/24424817', 'googleplex-android-review.googlesource.com/24248274', 'googleplex-android-review.googlesource.com/24484185', 'googleplex-android-review.googlesource.com/24499883', 'googleplex-android-review.googlesource.com/24681253', 'googleplex-android-review.googlesource.com/24499331', 'googleplex-android-review.googlesource.com/24485253', 'googleplex-android-review.googlesource.com/24026633', 'googleplex-android-review.googlesource.com/24499047', 'googleplex-android-review.googlesource.com/24422641', 'googleplex-android-review.googlesource.com/24733945', 'googleplex-android-review.googlesource.com/24677183', 'googleplex-android-review.googlesource.com/24708071', 'googleplex-android-review.googlesource.com/24758914'] into udc-release.
Change-Id: I8023576b9abf5d7976ab4ded6a1c803001da870b
|
|
Test: added test in TextToSpeechServiceTest
Bug: 232438498
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e5364f93d3208a66d599d7256d2e4cfaba989e0e)
Merged-In: Ia587d34e2898930c0956024c56a1f19debb445e4
Change-Id: Ia587d34e2898930c0956024c56a1f19debb445e4
|
|
Storing them with token means that there is a strong reference to the
token, preventing the WeakHashMap from properly purging values
This CP also includes changeID I5731ceeab5b9d0c72ce0131e2c9ba2f74558218c
Bug: 298253183
Test: manual (for WeakHashMap ejection)
atest CtsAttributionSourceTestCases
(cherry picked from commit ed57878c8e89d136264ed419590a0601bdfa18f6)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c5127b478d0b1e72aa60783fcb4f1f1254d01075)
Merged-In: Ie92b76ec83552cebb419318c214057f1ea8455d2
Change-Id: Ie92b76ec83552cebb419318c214057f1ea8455d2
|
|
By default Dialog#onStart will register onBackInvokedCallback, which
should be necessary since InputMethodService will register
CompatOnBackInvokedCallback for input method window.
Bug: 294162707
Test: atest BackGestureInvokedTest
Test: manual, launch Calendar then trigger back several times, verify
the back gesture can close app normally.
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:da6336c35396bbea2191cb0e6b4aa72272a8059a)
Merged-In: Icacfef60666fba1522f9d0f4ddc47e74a4560a32
Change-Id: Icacfef60666fba1522f9d0f4ddc47e74a4560a32
|
|
When we moved trimming code to ResourceTrimmer in I84637049a106a94bf9f06c5261c2941b55db4ba0, we also moved trimMemory(ComponentCallbacks2.TRIM_MEMORY_UI_HIDDEN) which happens after unlock from StatusBarKeyguardViewManager to the ResourceTrimmer behind a TRIM_FONT_CACHES_AT_UNLOCK flag.
Now that we've disabled TRIM_FONT_CACHES_AT_UNLOCK, this also disabled the trimMemory call we were doing since way before Android U.
To full restore pre-U trim font behaviour, this call should not be flag guarded behind the font caching flag.
Bug: 275486055
Bug: 290898642
Bug: 293929945
Test: Updated unit tests
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4bc215c4101b9504c244356ad0264ea1f4912bbd)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:16a1cf9e654bcaf3618213df7b9e82db3bdb5d40)
Merged-In: I677855fff144a53d212b65575111491c78803817
Change-Id: I677855fff144a53d212b65575111491c78803817
|
|
Bug: 295143740
Bug: 293929945
Test: Manually checked codepath with secondary display
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:dea88a049ba8eabe381b5a5318dd77b5aa1d186f)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c9c3e0f81a9c3037d06c7ffa8c66d08d74f0cf40)
Merged-In: I8807d1d58b58f1e5c990c21cef6a810e8b13c1db
Change-Id: I8807d1d58b58f1e5c990c21cef6a810e8b13c1db
|
|
Remove the target SDK gating policy for the selection of hearing aids during
VoIP calls: this could break legacy apps that did not adopt new APIs to
manage hearing aids.
Bug: 295220577
Test: Meets, Skype, Zoom and Celluar calls with hearing aids.
(cherry picked from commit 97014effc039f44910f86a1151a3af375c944926)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6db4ead48e50356918e28594b13c31defdf009a1)
Merged-In: I9e4abfe6d22ac48f50bdec362597a028359dcc9f
Change-Id: I9e4abfe6d22ac48f50bdec362597a028359dcc9f
|
|
By overriding onKeyUp on the Activity itself, without
calling super, I broke legacy back handling. Fortunately,
there is now a better way to handle back!
(Also fix the theme to avoid wallpaper showing through
display cutout insets.)
Test: adb shell input keyevent --longpress KEYCODE_BACK
Test: swipe from edge
Fixes: 289648693
Fixes: 290989795
(cherry picked from commit 5bbab52e0062877e17579bec48031f06ded79963)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:eeacd7d3f11f204057da54a8229eab3b18a08a93)
Merged-In: I4fd4975421d204f06dbd8acda1a0d2a5a99f3465
Change-Id: I4fd4975421d204f06dbd8acda1a0d2a5a99f3465
|
|
This change limits sequencing unlock and wake to only devices where
the configuration has been enabled.
Test: atest KeyguardViewMediatorTest
Test: atest BiometricsUnlockControllerTest
Bug: 289861878
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:45c5e0412c4e9e5c2947f24582e905af1f6b3235)
Merged-In: I2bdf8bb16dba693c4afb824e861ab4b87783d61b
Change-Id: I2bdf8bb16dba693c4afb824e861ab4b87783d61b
|
|
Test: atest WindowContextTests
Fixes: 285630617
(cherry picked from commit 7d860098f5c585c96ce29b199b36f7c82b938249)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:01bd9ec4ceb5da65235d0840c723d9b422168850)
Merged-In: I196bab294c182230edda54241f7b725f44f05570
Change-Id: I196bab294c182230edda54241f7b725f44f05570
|
|
Bug: 296980481
Test: atest CtsShortcutManagerTestCases
(cherry picked from commit 879e92bb81de34d5d0eb341f67e0c2d6a8ba8b43)
(cherry picked from commit a1c34f0aac5acb50b1c912e2c96d9ef7a6a79348)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:76524da868c0619ea2ce43e7ae94f1655945f8f1)
Merged-In: I7a2e85c703d2758f89b0c06d898f9423d6764444
Change-Id: I7a2e85c703d2758f89b0c06d898f9423d6764444
|
|
Bug: 295371293
Test: Manually tested invalid clock ids
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6194a27664896ff9cbae646483659959dfb3aca8)
Merged-In: I98d96bf72cbe09895b644a5a53f86499bf74bfab
Change-Id: I98d96bf72cbe09895b644a5a53f86499bf74bfab
|
|
Since we are changing the default value to false in UDC QPR1, remove the default value specification from the documentation.
Bug: 296586357
Test: N/A
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:8ee1665bcfe83c9481ccf867742853e846f2e332)
Merged-In: Iad6e5b858503617b4a38045fbf32984c0d03619a
Change-Id: Iad6e5b858503617b4a38045fbf32984c0d03619a
|
|
This change sets the package name when computing commit preapproval
reason. Previously, with the package name unavailable that path would
not be able to look up the existing package and so wouldn't know the
owner. Additionally, if the installer required user action, the wrong
dialog would have been displayed when the update ownership dialog should
have been. This fixes both issues.
Add new change id to check whether the build includes the fix or not.
If the change is disabled, it means the build includes the fix. If
the build doesn't include the change id, when the caller checks the
change, it is enabled.
Bug: 293644536
Test: atest PreapprovalInstallTest UpdateOwnershipEnforcementTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:917f02221653e456d83bf58cdfd7f86a54789909)
Merged-In: I210fe1bb13a2096eb7e087806298ed1d4fa4905d
Change-Id: I210fe1bb13a2096eb7e087806298ed1d4fa4905d
|
|
Similar to ag/24422287, but the same URI verification should be done in
SettingsProvider as well, which can be called by apps via
Settings.System API or ContentProvider APIs without using
RingtoneManager.
BUG: 227201030
Test: manual with a test app. Will add a CTS test.
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1b234678ec122994ccbfc52ac48aafdad7fdb1ed)
Merged-In: Ic0ffa1db14b5660d02880b632a7f2ad9e6e5d84b
Change-Id: Ic0ffa1db14b5660d02880b632a7f2ad9e6e5d84b
|
|
This enforcement prevents a bypass of background activity launches. For
Android U, the enforcement just ignores the request and logs a warning.
This change is a backport of ag/23810567.
Test: Manually.
Bug: 272737196
Bug: 272024837
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d455e21711c167223f7d0696809a4e411683182c)
Merged-In: I2412633c0b3afda6776244c72043d0dd78a4c8a1
Change-Id: I2412633c0b3afda6776244c72043d0dd78a4c8a1
|
|
We stripped the token that allows app to retrieve their own notification
and fire their own PI to launch activities from background. But we
forgot to strip the token from notification.publicVersion
Bug: 278558814
Test: NotificationManagerTest#testActivityStartFromRetrievedNotification_isBlocked
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e79cbff7f85ea5497dcdb27b13535e4e3ac9913f)
Merged-In: I8f25d7a5e47890a0496af023149717e1df482f98
Change-Id: I8f25d7a5e47890a0496af023149717e1df482f98
|
|
Bug: 291299076
Test: Build and flash the device and check if it throws exception for
non UsbInterface object
Test: atest CtsUsbManagerTestCases
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:85d7e6712a9eeeed3bdd68ea3c3862c7e88bfe70)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2c9931533cf8f85de9feb1db0b9ad38b8837f3b8)
Merged-In: I2917c8331b6d56caaa9a6479bcd9a2d089f5f503
Change-Id: I2917c8331b6d56caaa9a6479bcd9a2d089f5f503
|
|
AM.backupAgentCreated() should enforce that caller belongs the package called in the API.
Bug: 289549315
Test: atest android.security.cts.ActivityManagerTest#testActivityManager_backupAgentCreated_rejectIfCallerUidNotEqualsPackageUid
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:859abb58cdc7d66dbd22e7d02994509c4bba0416)
Merged-In: I9f3ae5ec0b8f00e020d471cc0eddf8bd8bdbb82d
Change-Id: I9f3ae5ec0b8f00e020d471cc0eddf8bd8bdbb82d
|
|
|
|
Bug: 296225828
Test: atest SystemUITests:com.android.systemui.biometrics
Change-Id: Idd0d071478d7e7424001c205114b84bf0ec2e644
|
|
Bug: 284787798
test: check the dumpsys display
Change-Id: Ic56192d739a2e0b1ac8fb76ba09493a436db652f
|
|
into udc-release. am: 299fe6f5d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24603001
Change-Id: Id2217d07481f79208695b2e482c75fdfbea2754b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
into udc-release.
Change-Id: I41d24af95f967c2c803650c671863991a3ea3524
|
|
Ensure the mHintSessionFuture is accounted for correctly in the
destructor.
Bug: b/297230599
Test: manual
(cherry picked from commit ac620f64a32500890007b0b405ca72405d6db41e)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e4b73a7aa058be845d3ee2433b8da99fc524d7c1)
Merged-In: Idcbd0f2ba87290f090d693f0a64cb46fe8270b95
Change-Id: Idcbd0f2ba87290f090d693f0a64cb46fe8270b95
|
|
|
|
into udc-release. am: 5fa41f5201
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24512197
Change-Id: I7d55ff1e1a3cafc0723fb0702942fb3d2d92f98d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
into udc-release.
Change-Id: I63f8a0d60e05c2ae57d3ef2404bb4f21fd386767
|
|
This reverts commit 5e7f8d8aca7b040f5ab57af3af4a72095d425e0c.
Reason for revert: coastguard doesn't flag the resource file CLs as already merged. Instead cherry-picked it again causing build failure with error:
frameworks/base/packages/SystemUI/res/values-zh-rCN/strings.xml:966: error: duplicate value for resource 'string/controls_media_empty_title' with config 'zh-rCN'.
frameworks/base/packages/SystemUI/res/values-zh-rCN/strings.xml:966: error: resource previously defined here.
frameworks/base/packages/SystemUI/res/values-zh-rCN/strings.xml: error: file failed to compile
BUG:296960974
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:202164834a9139bdf1ec1e53b65c3911002f2909)
Merged-In: I20fe50d806dc799328da7a594cfd42b5c20b4f02
Change-Id: I20fe50d806dc799328da7a594cfd42b5c20b4f02
|
|
Fixed the logic of reading attestation specific properties in
Build.java.
Bug: 110779648
Test: atest CtsKeystoreTestCases:android.keystore.cts.KeyAttestationTest CtsKeystoreTestCases:DeviceOwnerKeyManagementTest
(cherry picked from https://android-review.googlesource.com/q/commit:316e3d16c9f34212f3beace7695289651d15a071)
Merged-In: I9af7daa08cbd8bb52f3509fe93f787ba94b7bbc3
Change-Id: I9af7daa08cbd8bb52f3509fe93f787ba94b7bbc3
|
|
'googleplex-android-review.googlesource.com/23770590', 'googleplex-android-review.googlesource.com/23785419', 'googleplex-android-review.googlesource.com/23675944', 'googleplex-android-review.googlesource.com/23772077', 'googleplex-android-review.googlesource.com/23891752', 'googleplex-android-review.googlesource.com/23545766', 'googleplex-android-review.googlesource.com/24126330', 'googleplex-android-review.googlesource.com/24281855', 'googleplex-android-review.googlesource.com/24150805', 'googleplex-android-review.googlesource.com/24026547', 'googleplex-android-review.googlesource.com/24284551', 'googleplex-android-review.googlesource.com/24034687', 'googleplex-android-review.googlesource.com/24300598', 'googleplex-android-review.googlesource.com/24325540', 'googleplex-android-review.googlesource.com/24116150', 'googleplex-android-review.googlesource.com/24239788'] into udc-release. am: 84dd64521a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24506275
Change-Id: Ib8e7cbdd0f4b051efc97fa9dd6b01fe3981346ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
'googleplex-android-review.googlesource.com/23770590', 'googleplex-android-review.googlesource.com/23785419', 'googleplex-android-review.googlesource.com/23675944', 'googleplex-android-review.googlesource.com/23772077', 'googleplex-android-review.googlesource.com/23891752', 'googleplex-android-review.googlesource.com/23545766', 'googleplex-android-review.googlesource.com/24126330', 'googleplex-android-review.googlesource.com/24281855', 'googleplex-android-review.googlesource.com/24150805', 'googleplex-android-review.googlesource.com/24026547', 'googleplex-android-review.googlesource.com/24284551', 'googleplex-android-review.googlesource.com/24034687', 'googleplex-android-review.googlesource.com/24300598', 'googleplex-android-review.googlesource.com/24325540', 'googleplex-android-review.googlesource.com/24116150', 'googleplex-android-review.googlesource.com/24239788'] into udc-release.
Change-Id: Iffdcd617b2dbe1c72dc952747a2d80c925cd8feb
|
|
Previously, the insets source consumer is only created if the insets
source exists. However, if a control target is not below an insets
source, the target won't receive the source, and the consumer won't be
created, and the insets cannot be controlled.
Also, InsetsSourceConsumer only works when the control exists. So we
don't have to create redundant consumers for types not controllable.
This CL only creates the insets source consumer for the control, not for
the source. This fixes the z-order problem.
Fix: 290884763
Bug: 234093736
Test: atest InsetsControllerTest InsetsSourceConsumerTest
ImeInsetsSourceConsumerTest
Test: Watch a video in Google TV. Long press an icon on taskbar before
taskbar fades out. See if taskbar is visible.
(cherry picked from commit aa27825aff00b69d0a77db6143c52acfa22a41a6)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:28fc69cb89c8090ea8dabbeb2ebf3b5baeedd1f1)
Merged-In: I16a854d52f46d36899c826426afc5ebbcf47b586
Change-Id: I16a854d52f46d36899c826426afc5ebbcf47b586
|
|
This flag is passed to NotificationManagerService, the CallStyle check
will treat byForegroundService flag same as isFgs flag.
Only the ServiceRecord.postNotification() call at startForeground() call has
byForegroundService flag set to true.
Add a test case NotificationManagerServiceTest.java#checkCallStyleNotification_allowedForByForegroundService
Bug: 280003654
Test: atest NotificationManagerServiceTest.java#checkCallStyleNotification_allowedForByForegroundService
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ea56bb0813c03d4b9d14795da979da8c86b8ccb1)
Merged-In: Ibe30526ac0ff52e2e4fe9bc846576509cdf78236
Change-Id: Ibe30526ac0ff52e2e4fe9bc846576509cdf78236
|