OSDN Git Service
Yueming Wang [Sat, 24 Feb 2018 03:30:17 +0000 (03:30 +0000)]
Revert "Block adb from changing certain settings value when corresponding user"
This reverts commit
4140f6c4e3de454dfbcf060112517408ac69e96c.
Reason for revert: This CL is merged accidentally as it got merged together with another CL.
Change-Id: I043a5872f370775a4261a1ca7ccb00489a588303
TreeHugger Robot [Sat, 24 Feb 2018 10:25:40 +0000 (10:25 +0000)]
Merge "Flip order of arguments"
TreeHugger Robot [Sat, 24 Feb 2018 10:25:18 +0000 (10:25 +0000)]
Merge "Ignore stopped state when becoming visible and ensuring configuration."
TreeHugger Robot [Sat, 24 Feb 2018 10:19:21 +0000 (10:19 +0000)]
Merge "Add CertPath to KeyChainSnapshot and startRecoverySession"
TreeHugger Robot [Sat, 24 Feb 2018 10:13:19 +0000 (10:13 +0000)]
Merge "Avoid creating temporary objects in FiterValue()."
Yangster-mac [Fri, 23 Feb 2018 21:08:03 +0000 (13:08 -0800)]
Avoid creating temporary objects in FiterValue().
It reduces the cpu time from 1000ns to 750ns
Test: statsd test.
Change-Id: Ifa7e98e3368f8d55f85c7b09d05a6c416482981d
TreeHugger Robot [Sat, 24 Feb 2018 03:37:30 +0000 (03:37 +0000)]
Merge "Fixes crash when tap on nav bar without using quickstep"
tiansiming [田思明] [Sat, 24 Feb 2018 03:04:26 +0000 (03:04 +0000)]
Merge "Let sendShowMessage called from hide to show" am:
e7d04d728c am:
f91fddddd1
am:
ef2ac4066b
Change-Id: Ic2dc363d4a26b9c3a10e0b7d1072765501eec383
tiansiming [田思明] [Sat, 24 Feb 2018 02:56:15 +0000 (02:56 +0000)]
Merge "Let sendShowMessage called from hide to show" am:
e7d04d728c
am:
f91fddddd1
Change-Id: I8aa277a5448b999496b79f6b5721738d3b5f9af7
tiansiming [田思明] [Sat, 24 Feb 2018 02:43:03 +0000 (02:43 +0000)]
Merge "Let sendShowMessage called from hide to show"
am:
e7d04d728c
Change-Id: If406d79d0489a9c61322c0937fce2c9a9a5c4dc1
TreeHugger Robot [Sat, 24 Feb 2018 02:38:26 +0000 (02:38 +0000)]
Merge "Store carrier app name in global settings for SIM dialog/notification"
TreeHugger Robot [Sat, 24 Feb 2018 02:37:38 +0000 (02:37 +0000)]
Merge "Fix sleep time in Cellular"
TreeHugger Robot [Sat, 24 Feb 2018 02:13:27 +0000 (02:13 +0000)]
Merge "Explicitly do not support SEARCH_SERVICE on UI_MODE_TYPE_WATCH"
Ruchi Kandoi [Sat, 24 Feb 2018 02:12:34 +0000 (02:12 +0000)]
Merge "Wrap raw binder interface into public classes" am:
a4bde27012 am:
3cd878df0f
am:
21b4edb3cd
Change-Id: I9797e593a44b86f32f6c8c343d8bb15076e6ca87
Ruchi Kandoi [Sat, 24 Feb 2018 02:04:37 +0000 (02:04 +0000)]
Merge "Wrap raw binder interface into public classes" am:
a4bde27012
am:
3cd878df0f
Change-Id: I896528596006eb76241e706bb71d958214fb6499
TreeHugger Robot [Sat, 24 Feb 2018 02:03:24 +0000 (02:03 +0000)]
Merge "BatteryStatsImpl: Fix parceling error"
TreeHugger Robot [Sat, 24 Feb 2018 01:52:41 +0000 (01:52 +0000)]
Merge "Fixed an issue where the collapsing was called on the wrong thread"
Ruchi Kandoi [Sat, 24 Feb 2018 01:51:26 +0000 (01:51 +0000)]
Merge "Wrap raw binder interface into public classes"
am:
a4bde27012
Change-Id: Idd3b7a5563b2432654af1a331a6f040c1e98832a
Andrew Zeng [Sat, 24 Feb 2018 01:36:50 +0000 (01:36 +0000)]
Merge "Update wear default app icon color."
Selim Cinek [Sat, 24 Feb 2018 01:28:54 +0000 (01:28 +0000)]
Merge "Fixed the actions for the ambient layout"
Treehugger Robot [Sat, 24 Feb 2018 01:27:13 +0000 (01:27 +0000)]
Merge "Let sendShowMessage called from hide to show"
TreeHugger Robot [Sat, 24 Feb 2018 01:21:34 +0000 (01:21 +0000)]
Merge "Implement issue #
73301635: Ability to extract device configuration"
TreeHugger Robot [Sat, 24 Feb 2018 01:07:45 +0000 (01:07 +0000)]
Merge "Update the Bluetooth Active Device state in the Device Manager"
Mike Ma [Sat, 24 Feb 2018 00:50:29 +0000 (00:50 +0000)]
Merge "Fix strict mode violation"
Bo Zhu [Fri, 23 Feb 2018 05:43:52 +0000 (21:43 -0800)]
Add CertPath to KeyChainSnapshot and startRecoverySession
CertPath will include a cert of the trusted hardware and necessary
intermediate certificates.
Bug:
73784851
Change-Id: Ic70616b8f119891a82402b91035456e404c5f6de
Test: adb shell am instrument -w -e package \
com.android.server.locksettings.recoverablekeystore \
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
TreeHugger Robot [Sat, 24 Feb 2018 00:37:08 +0000 (00:37 +0000)]
Merge "Added CTS test cases for getNetworkId() and getSystemId()"
TreeHugger Robot [Sat, 24 Feb 2018 00:24:03 +0000 (00:24 +0000)]
Merge "Improve reporting of bucketing reason"
Treehugger Robot [Sat, 24 Feb 2018 00:19:29 +0000 (00:19 +0000)]
Merge "Wrap raw binder interface into public classes"
Erik Wolsheimer [Tue, 5 Dec 2017 21:11:50 +0000 (13:11 -0800)]
Explicitly do not support SEARCH_SERVICE on UI_MODE_TYPE_WATCH
Bug:
69950606
Change-Id: Ia195e88d8652cd7875d0ce03875034698367001c
(cherry picked from commit
980ba14b921932e85cdc0447af0398778a1c0d64)
Wale Ogunwale [Fri, 23 Feb 2018 04:44:56 +0000 (20:44 -0800)]
Ignore stopped state when becoming visible and ensuring configuration.
We normally don't ensure configuration for activities in the stopped
state since it doesn't make sense to be relaunching something that isn't
visible. However, if the activity is becoming visible, then ignore the
stopped state allowing the configuration to be ensured and the activity
relaunched if needed.
Change-Id: If953b624105c8c522f01cfb8fc68ded4fb18698d
Fixes:
73696401
Test: atest ActivityLifecycleTests#testRelaunchConfigurationChangedWhileBecomingVisible
Selim Cinek [Fri, 23 Feb 2018 23:22:04 +0000 (15:22 -0800)]
Fixed the actions for the ambient layout
Change-Id: I9620144cf20f0f2ee6b0d0fa3cc6e81778357db3
Fixes:
73819192
Test: add ambient notification, observe no action overlap
TreeHugger Robot [Fri, 23 Feb 2018 23:31:47 +0000 (23:31 +0000)]
Merge "SettingsLib: Move DefaultAppInfo CandidateInfo from Settings"
Dianne Hackborn [Tue, 20 Feb 2018 18:31:02 +0000 (10:31 -0800)]
Implement issue #
73301635: Ability to extract device configuration
am get-config can now return its information as a protobuf,
so that we have a nice machine readable representation of the
configuration available. This is available through the new
"--proto" option.
Also add a new "--device" option which will include additional
device configuration information in the output.
Defined the protos to contain all of this information. Updated
Configuration to generate everything it should in the proto.
The output has been changed so that configuration history
will not be returned unless you specify the --days option.
Bug:
73301635
Test: Booted, ran, output
Change-Id: I074b92b45d6b1da1c1a499080db9e006d12b9fea
TreeHugger Robot [Fri, 23 Feb 2018 23:18:47 +0000 (23:18 +0000)]
Merge "Add userRestriction attribute in Location settings injector."
Selim Cinek [Fri, 23 Feb 2018 19:19:45 +0000 (11:19 -0800)]
Fixed an issue where the collapsing was called on the wrong thread
With work profiles, the collapsing of the panel would happen on the wrong
thread.
Change-Id: I617465d9b285d456162bb7d9ed6ee27659ab1134
Fixes:
73728329
Test: unlock work profile from work profile notification
Kurt Nelson [Thu, 22 Feb 2018 19:21:15 +0000 (11:21 -0800)]
Flip order of arguments
Callbacks as the second parameter is more Kotlin friendly.
Bug:
73751206
Test: cts-tradefed run commandAndExit cts-dev --module CtsOsTestCases --test android.os.cts.StrictModeTest
Change-Id: Ib9c9469be1b81dc65e74c9e303f474c54a43b18b
Sunny Goyal [Fri, 23 Feb 2018 23:12:08 +0000 (23:12 +0000)]
Merge "Extrating out icon generation logic so that it can customized"
Matthew Ng [Fri, 23 Feb 2018 23:02:07 +0000 (15:02 -0800)]
Fixes crash when tap on nav bar without using quickstep
Fixes crash on nav bar by setting default pos/states of home button and
track opacity to avoid null error when tapping the nav bar before using
quick scrub. Also fixes the lack of animation of quick scrub when it
retracts.
Fixes:
73814434
Test: tap the nav bar upon reboot (or kill sysui process) before using
quickscrub
Change-Id: I2d35dcdf6e860ffb3959d48b4a4cdc319e939d1b
TreeHugger Robot [Fri, 23 Feb 2018 22:55:50 +0000 (22:55 +0000)]
Merge "Add information of microphone on peripheral for mic enumeration APIs."
TreeHugger Robot [Fri, 23 Feb 2018 22:54:44 +0000 (22:54 +0000)]
Merge changes from topic "wipedata"
* changes:
Rename WipeDataWithReason API to wipeData.
Block adb from changing certain settings value when corresponding user restriction is on.
TreeHugger Robot [Fri, 23 Feb 2018 22:33:21 +0000 (22:33 +0000)]
Merge "Add timestamp for events pulled by companision service."
Gopinath Elanchezhian [Fri, 23 Feb 2018 22:20:22 +0000 (22:20 +0000)]
Merge "Add support for hot launch in App launch test."
Lucas Dupin [Fri, 23 Feb 2018 22:11:06 +0000 (22:11 +0000)]
Merge "Alignment of clock and shade"
Pavlin Radoslavov [Wed, 7 Feb 2018 00:14:00 +0000 (16:14 -0800)]
Update the Bluetooth Active Device state in the Device Manager
The Bluetooth Active Device state should be updated for all
CachedBluetoothDevice entries.
This should be done inside CachedBluetoothDeviceManager in SettingsLib
instead of BluetoothDeviceUpdater in the Settings app.
Also:
* Added a new CachedBluetoothDeviceManagerTest.java unit test
* Added a new method CachedBluetoothDevice.isActiveDevice()
for testing.
Bug:
72316092
Test: Manual - two headsets and switching the active device
Unit tests - "make RunSettingsLibRoboTests -j 40"
Change-Id: Ic3fbf667c66ed2de8e5c3352bc1ffd829a9052cf
goneil [Sat, 17 Feb 2018 01:33:56 +0000 (17:33 -0800)]
Store carrier app name in global settings for SIM dialog/notification
Bug:
70042722
Test: Manual QA
Change-Id: If3e97e90a37ac4e585a64c21ddfe234259cd0813
Jeff Davidson [Fri, 23 Feb 2018 21:47:01 +0000 (21:47 +0000)]
Merge "Factor out telephony permission checks into a helper class." am:
fc5d8c8f31 am:
5275c0b123
am:
644c763b0d -s ours
Change-Id: I151703d7cb39b7dca2cbe10a572de5c3c4f00826
TreeHugger Robot [Fri, 23 Feb 2018 21:41:49 +0000 (21:41 +0000)]
Merge "Guard against updateDoze after detach"
Jeff Davidson [Fri, 23 Feb 2018 21:33:07 +0000 (21:33 +0000)]
Merge "Factor out telephony permission checks into a helper class." am:
fc5d8c8f31
am:
5275c0b123
Change-Id: Ieedbcc2f40f70beb43cfb4d0e677d72f6b3ff8f5
Andreas Gampe [Fri, 23 Feb 2018 21:26:02 +0000 (21:26 +0000)]
Merge "Frameworks: Remove bogus test method" am:
c65d52ff78 am:
8120e8616b
am:
dd531adbd2
Change-Id: I0317dedfe5c20c54551f72e6c691dea67dde83ca
Jeff Davidson [Fri, 23 Feb 2018 21:24:36 +0000 (21:24 +0000)]
Merge "Factor out telephony permission checks into a helper class."
am:
fc5d8c8f31
Change-Id: I25cda3c74bb15d5a50414ecb5dbf788ce2d32828
TreeHugger Robot [Fri, 23 Feb 2018 21:21:20 +0000 (21:21 +0000)]
Merge "Use PooledLambda in print code"
TreeHugger Robot [Fri, 23 Feb 2018 21:20:20 +0000 (21:20 +0000)]
Merge "Use android reinterpret hash for float as it is faster."
Gil O'Neil [Fri, 23 Feb 2018 21:18:40 +0000 (21:18 +0000)]
Merge "Allow certificates to be stored in the carrier app whitelist"
Andrew Zeng [Thu, 8 Feb 2018 19:40:24 +0000 (11:40 -0800)]
Update wear default app icon color.
Change-Id: I8c1013d8b7a4de4f4646f4c394a57d4ccde38ed6
Zhi An Ng [Fri, 23 Feb 2018 21:15:32 +0000 (21:15 +0000)]
Merge "Revert "Revert "Log the apk optimization state in the MetricsLogger"""
Andreas Gampe [Fri, 23 Feb 2018 21:15:06 +0000 (21:15 +0000)]
Merge "Frameworks: Remove bogus test method" am:
c65d52ff78
am:
8120e8616b
Change-Id: I1dd4cb24ed7c5afdb9185bacabf7b0a3e8f3a7d8
Andreas Gampe [Fri, 23 Feb 2018 21:08:46 +0000 (21:08 +0000)]
Merge "Frameworks: Remove bogus test method"
am:
c65d52ff78
Change-Id: Iee4a75368b1f8d0cc9cc0594126f29acb0b5a5b7
TreeHugger Robot [Fri, 23 Feb 2018 21:08:38 +0000 (21:08 +0000)]
Merge "Import translations. DO NOT MERGE"
Adam Lesinski [Fri, 23 Feb 2018 20:35:55 +0000 (12:35 -0800)]
BatteryStatsImpl: Fix parceling error
Bug:
73818082
Test: manual
Change-Id: I6e25cfc3270e5af559a2d077ed7e9786aa1771a8
TreeHugger Robot [Fri, 23 Feb 2018 21:05:23 +0000 (21:05 +0000)]
Merge "Provide the option to disable fading the pattern."
Sunny Goyal [Fri, 23 Feb 2018 19:46:18 +0000 (11:46 -0800)]
Extrating out icon generation logic so that it can customized
Test: Created jar and varified launcher is works properly
Change-Id: Ic07083d6394bb65d857b665fd86fa67f6323ed7b
Leon Scroggins [Fri, 23 Feb 2018 20:39:21 +0000 (20:39 +0000)]
Merge "Add AnimatedImageDrawable.getLoopCount"
TreeHugger Robot [Fri, 23 Feb 2018 20:25:56 +0000 (20:25 +0000)]
Merge "Make mapIntentToUri understand meta-data hookup"
TreeHugger Robot [Fri, 23 Feb 2018 20:25:36 +0000 (20:25 +0000)]
Merge "Modify framework default app icon for Wear."
TreeHugger Robot [Fri, 23 Feb 2018 20:18:28 +0000 (20:18 +0000)]
Merge "GnssLocationProvider metrics race condition fix"
TreeHugger Robot [Fri, 23 Feb 2018 20:18:23 +0000 (20:18 +0000)]
Merge "Revert "Disabled presubmit for flakey test""
Dake Gu [Wed, 21 Feb 2018 01:03:37 +0000 (17:03 -0800)]
SettingsLib: Move DefaultAppInfo CandidateInfo from Settings
Bug:
3600711
Test: DefaultAppInfoTest moved from SettingsLib
m RunSettingsLibRoboTests
Change-Id: Iba7f60aacaf97774e8f120cccaacd1d1389fd227
Jeff Davidson [Fri, 23 Feb 2018 20:00:15 +0000 (20:00 +0000)]
Merge "Factor out telephony permission checks into a helper class."
TreeHugger Robot [Fri, 23 Feb 2018 19:53:17 +0000 (19:53 +0000)]
Merge "Update call to null out GrVkAlloc in VulkanManager"
gopinath [Wed, 21 Feb 2018 01:21:18 +0000 (17:21 -0800)]
Add support for hot launch in App launch test.
force-stop-app option is added to control hot launch and
cold launch.
Bug: b/
73091210
Test:
am instrument -w -r -e debug false -e launch_directory /sdcard
-e apps "Calculator^Calculator|Clock^Clock" -e trial_launch true
-e log false -e timeout_msec 300000 -e force-stop-app false
-e launch_order CYCLIC -e simpleperf_cmd "simpleperf stat -a"
-e launch_iterations 10 com.android.tests.applaunch/android.test.InstrumentationTestRunner
Change-Id: I4b0f7a61c46e8091e69cad9fa65b5b34f680252d
Treehugger Robot [Fri, 23 Feb 2018 19:28:55 +0000 (19:28 +0000)]
Merge "Frameworks: Remove bogus test method"
Yangster-mac [Fri, 23 Feb 2018 19:11:36 +0000 (11:11 -0800)]
Use android reinterpret hash for float as it is faster.
Test: statsd test
Change-Id: I593edac1d7dcd0c5e84195602b42b7c6c3072a38
Lucas Dupin [Mon, 19 Feb 2018 03:39:32 +0000 (19:39 -0800)]
Alignment of clock and shade
Test: visual
Change-Id: If7ff8c34a5053d5df8f6dc38c53cc728fef89ede
Fixes:
72968018
Fixes:
72417398
Fixes:
73087486
Fixes:
72566197
Eugene Susla [Tue, 13 Feb 2018 00:17:26 +0000 (16:17 -0800)]
Use PooledLambda in print code
This replaces the usage of handler message types with PooledLambda
Test: atest CtsPrintTestCases
Change-Id: I19b01278b67b5fe18d48a2e0bb8300bbe1413a63
Mike Ma [Fri, 23 Feb 2018 19:07:53 +0000 (11:07 -0800)]
Fix strict mode violation
Change-Id: I3c6391c52f06e4bb94162f8def1ab9b5f4c747fc
Fixes:
73549195
Test: KernelWakelockReaderTest
Eugene Susla [Fri, 23 Feb 2018 19:06:14 +0000 (19:06 +0000)]
Merge "Use PooledLambda in A11yManagerService"
Chavi Weingarten [Fri, 23 Feb 2018 19:04:55 +0000 (19:04 +0000)]
Merge "Move performSurfacePlacement after tryStartExitingAnimation"
TreeHugger Robot [Fri, 23 Feb 2018 19:04:11 +0000 (19:04 +0000)]
Merge "MediaCas: use HidlMemory to avoid handle leaks"
Yangster-mac [Thu, 22 Feb 2018 18:00:45 +0000 (10:00 -0800)]
Add timestamp for events pulled by companision service.
Test: statsd cts test
Change-Id: I2658dba747ff93a120c50b5294f696918588e9fe
TreeHugger Robot [Fri, 23 Feb 2018 18:50:16 +0000 (18:50 +0000)]
Merge "Statsd alerts can inform subscribers probabilistically"
TreeHugger Robot [Fri, 23 Feb 2018 18:47:56 +0000 (18:47 +0000)]
Merge "camera: Add OisSamples synthetic key"
Michal Karpinski [Fri, 23 Feb 2018 18:47:03 +0000 (18:47 +0000)]
Merge "Support bmgr wipe also for full backup apps"
Amith Yamasani [Mon, 19 Feb 2018 06:23:00 +0000 (22:23 -0800)]
Improve reporting of bucketing reason
Keep track of main and sub reason for bucket change
Bug:
73178753
Test: atest AppIdleHistoryTests
Change-Id: I4936281ac06046bb5ffed9f3306efa24c7fd47ab
Bryce Lee [Fri, 23 Feb 2018 18:38:37 +0000 (18:38 +0000)]
Merge "Always finish activity when moving to a destroyed state."
Jorim Jaggi [Fri, 23 Feb 2018 18:33:52 +0000 (18:33 +0000)]
Merge "Don't wait keyguard drawn if device has no keyguard" am:
a6e5165b2c am:
94ec9e3e4b
am:
239d74fa19
Change-Id: I19abbe828a0004888143be02fd6ca834d8013a64
TreeHugger Robot [Fri, 23 Feb 2018 18:26:36 +0000 (18:26 +0000)]
Merge "New APIs to let app developers manage autofill semantics when reusing views."
Jorim Jaggi [Fri, 23 Feb 2018 18:20:35 +0000 (18:20 +0000)]
Merge "Don't wait keyguard drawn if device has no keyguard" am:
a6e5165b2c
am:
94ec9e3e4b
Change-Id: I1391b28a04611f4e4445d53d3323fad8fb98528f
Adrian Roos [Fri, 23 Feb 2018 18:19:49 +0000 (18:19 +0000)]
Merge "Follow up to Iff58235b5bdfd0d49df259a91b05e54e3864f41c"
Greg Daniel [Fri, 23 Feb 2018 18:16:12 +0000 (13:16 -0500)]
Update call to null out GrVkAlloc in VulkanManager
Test: manual testing
Change-Id: Ia0af7526cad2dc4614afc73c31bf07e25890c677
Zhizhi Liu [Fri, 23 Feb 2018 18:12:19 +0000 (18:12 +0000)]
Merge "Make SuggestionController guard RuntimeException."
Andrew Zeng [Fri, 19 Jan 2018 19:07:37 +0000 (11:07 -0800)]
Modify framework default app icon for Wear.
Bug:
67707364
Change-Id: I7e88d8822fc041c2187fba76770b98bde6ed22fd
(cherry picked from commit
8299f13e4d63a5ae2df3ede43bb740b496385247)
(cherry picked from commit
b35da3135c797722a04f4cbf9e1f5fa7e27b993f)
Jorim Jaggi [Fri, 23 Feb 2018 18:08:13 +0000 (18:08 +0000)]
Merge "Don't wait keyguard drawn if device has no keyguard"
am:
a6e5165b2c
Change-Id: I8e198596eaec74fb022530544adad8efa0aadf52
jiabin [Fri, 23 Feb 2018 00:21:53 +0000 (16:21 -0800)]
Add information of microphone on peripheral for mic enumeration APIs.
Bug:
64038649
Test: run cts
Change-Id: If66747359b6544d239898fc16fbf1d99002b6402
Erik Wolsheimer [Wed, 15 Nov 2017 20:08:32 +0000 (12:08 -0800)]
Guard against updateDoze after detach
Bug:
68815183
Change-Id: I147f04af4ea1af59f95757a14de3c34021e048a5
TreeHugger Robot [Fri, 23 Feb 2018 17:53:32 +0000 (17:53 +0000)]
Merge "DisplayCutout: Let dreams always extend under the cutout"
TreeHugger Robot [Fri, 23 Feb 2018 17:49:17 +0000 (17:49 +0000)]
Merge "STOPSHIP: Roll forward: Add UidCpuPower global setting"
Jack Yu [Fri, 23 Feb 2018 17:46:03 +0000 (17:46 +0000)]
Merge "Fixed service state CTS test failing" am:
ab5bc3be50 am:
f535f8108d
am:
09da9870d0
Change-Id: Iac059a0df9bf6c3920327101d4423ef9acc60ebb
TreeHugger Robot [Fri, 23 Feb 2018 17:42:45 +0000 (17:42 +0000)]
Merge "Revert "Add "Unlocked device required" parameter to keys""
Christine Franks [Fri, 23 Feb 2018 17:39:21 +0000 (17:39 +0000)]
Merge "Support forced Night Display auto mode"
Jack Yu [Fri, 23 Feb 2018 17:27:20 +0000 (17:27 +0000)]
Merge "Fixed service state CTS test failing" am:
ab5bc3be50
am:
f535f8108d
Change-Id: Ia3e1e58acda7aa3099c93f1f6c2bef9f53828e4d