summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-01-25Merge cherrypicks of [3509910] into oc-mr1-releaseandroid-8.1.0_r16android-8.1.0_r15oreo-mr1-s1-releaseandroid-build-team Robot
Change-Id: Id1d5683a00a88832ec7bf746fa7bb918a8d7579c
2018-01-25OMS: Only allow trusted overlays to be registered.Adam Lesinski
Bug: 69383160 Test: cts-tradefed run cts -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.OverlayHostTest Change-Id: I930c11716317cff1ec485a3943d1f22f07a423df Merged-In: I930c11716317cff1ec485a3943d1f22f07a423df (cherry picked from commit 80609e584c9c6155ed3199109735ec8d16f6115c)
2017-12-14Merge cherrypicks of [3365569, 3365570, 3366860, 3366878, 3365571, 3365572, ↵android-vts-8.1_r3android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10android-build-team Robot
3366918, 3365573, 3365589, 3365590, 3366938, 3366902, 3365574, 3365575, 3365576, 3365577, 3366958, 3365824, 3365591, 3366959, 3366960, 3366961, 3366962, 3366963, 3366964, 3366965, 3366919, 3366966, 3366967, 3366968, 3366969, 3366970, 3367018, 3367019, 3365592, 3365593, 3366985, 3365825, 3366988, 3366989, 3366990, 3366991, 3366992, 3366993, 3366994, 3367004, 3367005, 3367006, 3367007, 3367008, 3367009, 3367010, 3367011, 3367012, 3367013, 3367014, 3367015, 3367016, 3367017, 3367038, 3367039, 3367040, 3367041, 3367042, 3367044, 3367045, 3367046, 3367049, 3367050, 3367052, 3367053, 3367054, 3367055, 3367056, 3366920, 3366921, 3366922, 3367079] into oc-mr1-release Change-Id: Iae843903b50e7df11a333cabfff45861e4a17355
2017-12-14Swap the order of synthetic password wrappingRubin Xu
Synthetic password is double encrypted by both a random auth-bound keymaster key and a secret derived from user password. In order to avoid a password verification oracle without rate limiting, synthetic password needs to be encrypted by the derived secret first, and then the auth-bound key. This change corrects the order of encryptions, as well as adds an upgrade path to refresh existing credentials. Test: Running an old build with existing password, flash to new build, verify the device unlocks successfully. Bug: 68694819 Change-Id: Ifdaa01f3f4ddd5bb3f3d808d38f440ced729034f Merged-In: Ifdaa01f3f4ddd5bb3f3d808d38f440ced729034f (cherry picked from commit 78acfe71d5d527ec727ffa3ad33f0de6255d60d7)
2017-11-28Merge cherrypicks of [3276508, 3277765, 3277766, 3277904, 3276473, 3278009, ↵android-8.1.0_r6android-8.1.0_r5android-8.1.0_r4android-8.1.0_r3android-build-team Robot
3278010, 3277767, 3277768, 3277769, 3277770, 3276509, 3276510, 3278011, 3278012, 3278013, 3278014, 3278099, 3278100, 3278101, 3278102, 3278103, 3278104, 3278105, 3278106, 3277800, 3276474, 3278015, 3278016, 3278017, 3278118, 3278119, 3278120, 3278121, 3278122, 3277946, 3277905, 3277947, 3277906, 3277751, 3278123, 3277752, 3278110, 3277771, 3277907, 3278095, 3277908, 3278111, 3277772, 3276475, 3276476] into oc-mr1-release Change-Id: I2f4ccf6bf2dd0827493d7cc3429d9535da532ca5
2017-11-28More dimming tweaks (for accessibility)Jason Monk
- Don't dim when battery saver bar is showing. - Bump alpha by 10% for light nav bar Test: manual Change-Id: I296aa68c0904f7972dd941eb1aac3b4c71114eee Fixes: 63630024 (cherry picked from commit cdec5ff9f496e345d1e2e40f3d36d66938ace5f6)
2017-11-28Adjust Uri host parsing to use last instead of first @.Adam Vartanian
Malformed authority segments can currently cause the parser to produce a hostname that doesn't match the hostname produced by the WHATWG URL parsing algorithm* used by browsers, which means that a URL could be seen as having a "safe" host when checked by an Android app but actually visit a different host when passed to a browser. The WHATWG URL parsing algorithm always produces a hostname based on the last @ in the authority segment, so we do the same. * https://url.spec.whatwg.org/#authority-state resets the "buffer", which is being used to build up the host name, each time an @ is found, so it has the effect of using the content between the final @ and the end of the authority section as the hostname. Bug: 68341964 Test: vogar android.net.UriTest (on NYC branch) Test: cts -m CtsNetTestCases (on NYC branch) Change-Id: Idca79f35a886de042c94d6ab66787c2e98ac8376 (cherry picked from commit cd6228dd377b2a0caa02a1e6df92f3d9ae702a95)
2017-11-28Throw OOME if Bitmap.nativeCreate failsLeon Scroggins III
Bug:33846679 Test: I6ab6cb7a3b3151641a9f9b02b0bfc484e0a4524b This matches the old behavior, prior to switching from Java allocated pixel memory to native allocations (b/27762775). It also better matches what has happened - we ran out of memory. (Better than the current behavior - NullPointerException in the Java code, or an alternative solution of returning null, which would likely result in NPEs in the calling code.) Merged-In: I3958ed1106ac94fb1d3f30e044b620d984875211 Change-Id: I3958ed1106ac94fb1d3f30e044b620d984875211 (cherry picked from commit 5906a4869cdf5c39eba1d9a3125aff894c5e804d)
2017-11-28mtp: fix double free of thumbnail dataChong Zhang
bug: 67864232 Change-Id: I6eb51be839df12317273830521c70a4ed80f9496 (cherry picked from commit e6b98532ee03d0ac1ca93382699893172454a946)
2017-11-02Merge cherrypicks of [3156476, 3155698, 3156194, 3156639, 3156018, 3156477, ↵android-cts-8.1_r1android-8.1.0_r1android-build-team Robot
3156098, 3156099, 3156100, 3156101, 3156102, 3158393, 3155699, 3155700, 3156195, 3156196, 3156019, 3156020, 3158394] into oc-mr1-release Change-Id: I5b1e8ce0b0d4c129cf502ab21733dd7bc65aed67
2017-11-02Preventing recursive referrence in drawablesSunny Goyal
Bug: 68706673 Bug: 66498711 Test: Added CTS tests Change-Id: I8034f49d16f9a7bc1749714fd6d6231bba5088d0 (cherry picked from commit 99b25d2817a1058e56c5384a43040e0f3f291ce1)
2017-11-02Respect legacy color mode settingsChristine Franks
Bug: 68411440 Test: make -j100, verified starting with each of the three options. Change-Id: I73e701a86733e0f8a5d017949052b16cdf58f398 (cherry picked from commit 17947177b38c0b583ce263b1f66454b84cb5959e) (cherry picked from commit 8ab97c1e417620b99a2057b7dd6ad59ecc419853)
2017-11-02Allow dnd access for secondary usersJulia Reynolds
Test: runtest systemui-notification Change-Id: Ie63b767bcd25b7b3e7cac08afcf3351adc97263f Merged-In: Ie63b767bcd25b7b3e7cac08afcf3351adc97263f Fixes: 68060759 (cherry picked from commit ee611537e935ca419b4333cc82c9dee5d2e7a92d)
2017-11-02DO NOT MERGE Remove orientation restriction to only fullscreen activities.Bryce Lee
This changelist removes checks that enforce that only fullscreen, opaque activities may request orientation changes. An application may itself be compatible with the change and update their SDK level. However, it is possible they use a library that has not itself been updated and still leverages this feature for non-fullscreen activities. Fixes: 68684796 Test: bit FrameworksServicesTests:com.android.server.wm.AppWindowTokenTests Change-Id: Ib5a60f0b660ad145d07e953e541a0a1b801aeef2 (cherry picked from commit a89b183ef9323f4426941b207e2378064b5c7de3)
2017-11-02AAPT2: Allow for nested inline xmlsMichael Wachenschwanz
Add recursion to InlineXmlFormatParser::Consume for handling nested aapt:attr Change-Id: Iabf98945b4f5ef22a3b8fdc4ca2bac092a377629 Fixes: 64385167 Test: make aapt2_tests (cherry picked from commit 7b6b02bd13aea90b938c3ab3b1eaa3fb5043f931) (cherry picked from commit c8f5fc284cc635f7056307e55121e439b21ac83a)
2017-10-27Merge cherrypicks of [3134552, 3130583, 3131953, 3131954, 3131955, 3131956, ↵android-build-team Robot
3131957, 3131958, 3131959, 3132062, 3132336, 3131074, 3133939, 3131024, 3131025, 3131026, 3130584, 3130879, 3130880] into oc-mr1-release Change-Id: I345643be0750801a95bd6a61a235f1576501807f
2017-10-27Give fg services a shelf life before they go bad.Dan Sandler
When a fg service starts (as indicated by its presence in a NOTE_FOREGROUND_SERVICES notification), we note the service start time (as encoded in Notification.when in ActivityMgr). SysUI will suppress the dungeon (foreground service disclosure) notification until 5 seconds have elapsed since the earliest service start time. After that, if the service is still running, the disclosure will be shown. Bug: 67819284 Test: runtest -x frameworks/base/packages/SystemUI/tests/src/com/android/systemui/ForegroundServiceControllerTest.java Change-Id: I5b6df95eb673e2f551aaa3ecc5a7df617f815a90 (cherry picked from commit 9830b5a8e41c3b477064e3b378734fc129e8342f)
2017-10-27Allow internal services access to instant appsTodd Kennedy
Any system UID [those with a UID < Process.FIRST_APPLICATION_UID] should be able to see instant applications. These are trusted processes and will often need to verify permissions of the calling instant app. Change-Id: I4ec899ffd45d931a17d4ea0bfacf3004d3e074ef Fixes: 67849834 Test: Manual. Test: Install hellozip_base.apk from bug: Test: $ adb install --instantapp -i com.android.vending hellozip_base.apk Test: Run hellozip Test: $ adb shell am start -a android.intent.action.VIEW -c android.intent.category.BROWSABLE -d https://hello.samples.androidinstantapps.com/hello Test: Try to capture a photo and see that the app crashes with a SecurityException before the patch and that a photo is taken after the patch Test: Try to record audio and see that the app crashes with an IllegalStateException before the patch and that the app doesn't crash after the patch (cherry picked from commit 17e40d2fb6d5ad2be3b71d3bc1232ea84f6596b6)
2017-10-27AAPT: treat "-I" with lower precedence than main APK for dumping.Donald Chai
This is the desired behavior if resource IDs may overlap, and also happens to improve the behavior of: aapt dump -I base.apk badging feature.apk when both APKs use the same package name with different package IDs (base=0x7F, feature=0x80). Previously, the final call to DynamicRefTable::addMapping was for base.apk, and all references to 0x80 were rewritten in DynamicRefTable::lookupResourceId to 0x7F. After this change resources defined in both APKs are resolved correctly. Note that this is a bit of kludge, and APKs should use different names to avoid conflating the package IDs. Fixes: 67070085 Bug: 64058531 Test: manual with sample in b/67070085#comment2 Change-Id: I285adb6f44a297440b08fc7a1f9ad73c700eb9bc (cherry picked from commit d1ac6e1f9ea3a4d6c0d6d4a118c61526b8234a5f) (cherry picked from commit 94251fac62b12f030c404132a395fdef73e7ab29)
2017-10-27AAPT leave <gradient> alone for VDCztenghui
bug: 62421666 Test: Tested with changes for Gradient of VDC. Change-Id: I07b39721aeaaafd888416a0f71f6cbd5fce97732 (cherry picked from commit ab2a38c03d54fad1ed0873ac091959ee38823cd6) (cherry picked from commit f49cce3aa6f625cfc7288886c044992e1580dbbc)
2017-10-27AAPT2: Sanitize resource qualifiers before using in split names.Donald Chai
Fixes: 67960909 Test: UtilTest.SplitNamesAreSanitized Change-Id: I9ba1b8430a00cc7ce981075a60388f275c41dbea (cherry picked from commit b8f078c9a0c9f32ad84c475c26299ecb00962ffa) (cherry picked from commit 50bae79111afcdb8d36d73cac15155cb61df2dc0)
2017-10-25Merge cherrypicks of [3120219, 3121602, 3124243, 3125180] into oc-mr1-releaseandroid-build-team Robot
Change-Id: Iba119bfeb023f798076d19b82546db78ab06edb5
2017-10-25DO NOT MERGE - Support native and srgb for night displayChristine Franks
Bug: 68159303 Test: make -j100 Change-Id: Iea4b38bd8c9037f50b7ffa6e3c4f12b0e536a8ce (cherry picked from commit 8c9f91eba618c1fc5ad7f7ddef2b8854d4d10fce)
2017-10-25Merge cherrypicks of [3122088, 3121430, 3119129, 3119130, 3119131, 3120667] ↵android-build-team Robot
into oc-mr1-release Change-Id: I27e7d8f0f1dc1d73083eb6949e0c40d1ed77445c
2017-10-25Add color mode settingRomain Guy
The new setting appears on devices that support color management and wide color gamut rendering. The setting allows the user to choose between natural (sRGB), boosted (sRGB + 10% saturation) and saturated (unmanaged colors; colors are remapped to the device's native gamut). This change adds a metric constant for analytics in Settings and uses a persistent system property to know when to suppress color management. Bug: 68159303 Test: manual Change-Id: I83cc972fc3a2290ff106eae0e76a3ee799503813 (cherry picked from commit 62e8c175257d25c64ed19e5ccccd4e3cd987b8ad)
2017-10-23Snap for 4411005 from 6575d483cc12747e8f6790e369ed59c15e3ff91a to oc-mr1-releaseandroid-build-team Robot
Change-Id: I5ec74e6de18301999f2140642016f85fda1d6a6a
2017-10-20Merge "Fix netlink group mismatch in fds used for offload" into oc-mr1-devTreeHugger Robot
2017-10-20Fix netlink group mismatch in fds used for offloadNiranjan Pendharkar
Existing groups used for binding to netlink conntrack events don't seem to work as expected. Fix this by using exact groups defined in IOffloadConfig hal. Test: as follows - Compiles and boots on walleye - Validated conntrack destroy events are received as expected. - Validated offload works as expected. Bug:68018148 CRs-fixed:2126789 Merged-In: I2dcebec1c08bb7b067621331533d8a65dd7b5083 Merged-In: I96d6d5601aff009879f452975be91b6e7e40bb57 Change-Id: I76178fd7f109b82a4e4961347b8949937813d71d (cherry picked from commit f10282b830af4c7ea56b2c64e73a7ffd3c006007)
2017-10-20Snap for 4407597 from 7bd96d32a17553cf5772c7abf5a759636bcc4943 to oc-mr1-releaseandroid-build-team Robot
Change-Id: I9e76506b991d8147e5b6a5a3dbcc3e16ed825def
2017-10-20Merge "DO NOT MERGE Revert "Convert ICarrierService to oneway."" into oc-mr1-devJonathan Basseri
2017-10-20DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: ca7ffa06bc -s ↵Jeff Sharkey
ours am: edb6b17ebc -s ours am: 08bd3a75fb am: 9c441159f9 am: 2f8dbe9693 am: 3bb6994a0b -s ours am: 73a4e88df8 am: 832890f6e2 am: 34e4628cfb am: 76d9732106 am: af70ac2914 -s ours am: 571c8a4507 am: 45829c0c41 Change-Id: I9c80ad1cde980004a625ba7a0df579c7432d14ae
2017-10-20DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 1f2a5d3622 -s ↵Jeff Sharkey
ours am: b52056d549 am: 563ea682e7 am: 901c587c6b am: 1455bd6492 -s ours am: 7f00f14d81 am: 3c30346de2 am: b049f43f9b am: 1b40397eb0 am: 00183554a9 -s ours am: 61d6dd8185 am: 438ed4369d Change-Id: I467f1f279116602880a6533cadf0dc7721bdfe88
2017-10-20DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: ca7ffa06bc -s ↵Jeff Sharkey
ours am: edb6b17ebc -s ours am: 08bd3a75fb am: 9c441159f9 am: 2f8dbe9693 am: 3bb6994a0b -s ours am: 73a4e88df8 am: 832890f6e2 am: 34e4628cfb am: 76d9732106 am: af70ac2914 -s ours am: 571c8a4507 Change-Id: Ie4e871d2017d505461027c376946e2034105062a
2017-10-20Fix ClipboardService device lock check for cross profile am: 0595b5a94b am: ↵Siyamed Sinir
9e5a4ed6c3 -s ours am: 1c7cdde2d3 am: 63bb54738d am: 4c7113461f am: 74b3298994 am: 4afdfec2d9 am: bf5b9d7e8e am: 9f073ee9fd am: c257b61ec2 am: 21bdeacae7 am: 6ecad744a9 am: 289db3b4f3 Change-Id: I71991fe9cd3b442dff4ce84657cd84936511a8b2
2017-10-20DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 1f2a5d3622 -s ↵Jeff Sharkey
ours am: b52056d549 am: 563ea682e7 am: 901c587c6b am: 1455bd6492 -s ours am: 7f00f14d81 am: 3c30346de2 am: b049f43f9b am: 1b40397eb0 am: 00183554a9 -s ours am: 61d6dd8185 Change-Id: I9b862fb8aa4858bf57aa390c7d54a65bb19d12fd
2017-10-20Fix ClipboardService device lock check for cross profile am: 0595b5a94b am: ↵Siyamed Sinir
9e5a4ed6c3 -s ours am: 1c7cdde2d3 am: 63bb54738d am: 4c7113461f am: 74b3298994 am: 4afdfec2d9 am: bf5b9d7e8e am: 9f073ee9fd am: c257b61ec2 am: 21bdeacae7 am: 6ecad744a9 Change-Id: I11a06f501b8278c356e7c2072c00b7d86470a64a
2017-10-20DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: ca7ffa06bc -s ↵Jeff Sharkey
ours am: edb6b17ebc -s ours am: 08bd3a75fb am: 9c441159f9 am: 2f8dbe9693 am: 3bb6994a0b -s ours am: 73a4e88df8 am: 832890f6e2 am: 34e4628cfb am: 76d9732106 am: af70ac2914 -s ours Change-Id: Ie750d6963f29c0f60a6e2e4ef2a0e8fa4201e06a
2017-10-20DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: ca7ffa06bc -s ↵Jeff Sharkey
ours am: edb6b17ebc -s ours am: 08bd3a75fb am: 9c441159f9 am: 2f8dbe9693 am: 3bb6994a0b -s ours am: 73a4e88df8 am: 832890f6e2 am: 34e4628cfb am: 76d9732106 Change-Id: Idfdb3ab78f68d6b41d99bca533045118cc34574e
2017-10-20DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 1f2a5d3622 -s ↵Jeff Sharkey
ours am: b52056d549 am: 563ea682e7 am: 901c587c6b am: 1455bd6492 -s ours am: 7f00f14d81 am: 3c30346de2 am: b049f43f9b am: 1b40397eb0 am: 00183554a9 -s ours Change-Id: I6ff359477121027efd13e82ce530a4fce32d3564
2017-10-20Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into ↵Beverly Tai
lmp-mr1-dev am: f2b592726d -s ours am: dfbaa1fd8b am: d7ece4da2c am: 06bd19c1fb am: 7b1157a92e -s ours am: bcdb9079ef am: 5fda53b294 am: 791d8a5b16 am: 4dd01948c1 am: 260ef208ac -s ours am: b6ecd1f88a am: f2e1ef2297 Change-Id: I99d77a01bbd5992effb98cc2cec15a27ab78d223
2017-10-20DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 1f2a5d3622 -s ↵Jeff Sharkey
ours am: b52056d549 am: 563ea682e7 am: 901c587c6b am: 1455bd6492 -s ours am: 7f00f14d81 am: 3c30346de2 am: b049f43f9b am: 1b40397eb0 Change-Id: If7bafe99a0d9563f9c09f5632b6e023ee328ffdb
2017-10-20Fix ClipboardService device lock check for cross profile am: 0595b5a94b am: ↵Siyamed Sinir
9e5a4ed6c3 -s ours am: 1c7cdde2d3 am: 63bb54738d am: 4c7113461f am: 74b3298994 am: 4afdfec2d9 am: bf5b9d7e8e am: 9f073ee9fd am: c257b61ec2 am: 21bdeacae7 Change-Id: I3c633755286caa3ae6538581bc05a8374a8ef691
2017-10-20DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: ca7ffa06bc -s ↵Jeff Sharkey
ours am: edb6b17ebc -s ours am: 08bd3a75fb am: 9c441159f9 am: 2f8dbe9693 am: 3bb6994a0b -s ours am: 73a4e88df8 am: 832890f6e2 am: 34e4628cfb Change-Id: I0b37777cbd94bb4c3bc60315aff3a2ebc324273c
2017-10-20Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into ↵Beverly Tai
lmp-mr1-dev am: f2b592726d -s ours am: dfbaa1fd8b am: d7ece4da2c am: 06bd19c1fb am: 7b1157a92e -s ours am: bcdb9079ef am: 5fda53b294 am: 791d8a5b16 am: 4dd01948c1 am: 260ef208ac -s ours am: b6ecd1f88a Change-Id: Id7edf88371f89d5ff9a4aad06c25cd133eb17415
2017-10-20Fix ClipboardService device lock check for cross profile am: 0595b5a94b am: ↵Siyamed Sinir
9e5a4ed6c3 -s ours am: 1c7cdde2d3 am: 63bb54738d am: 4c7113461f am: 74b3298994 am: 4afdfec2d9 am: bf5b9d7e8e am: 9f073ee9fd am: c257b61ec2 Change-Id: I5369e96fe95e0db7206c61bb1af5b140a788890a
2017-10-20DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: ca7ffa06bc -s ↵Jeff Sharkey
ours am: edb6b17ebc -s ours am: 08bd3a75fb am: 9c441159f9 am: 2f8dbe9693 am: 3bb6994a0b -s ours am: 73a4e88df8 am: 832890f6e2 Change-Id: Ie3d4564dc4d4790f6cae5cbef45c47aa2eb5000a
2017-10-20DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 1f2a5d3622 -s ↵Jeff Sharkey
ours am: b52056d549 am: 563ea682e7 am: 901c587c6b am: 1455bd6492 -s ours am: 7f00f14d81 am: 3c30346de2 am: b049f43f9b Change-Id: Id6f534c7fb34dcd7a16478de7a0de80688322d47
2017-10-20Clearing up invalid entries when SyncStorageEngine starts am: 271702fc28 am: ↵Suprabh Shukla
8b438236ce -s ours am: 159648d6e5 am: 6f0e6952ef am: 8fb52c8d06 am: cf8fe172a1 am: 55ffaea04b am: d1150b7e55 am: a4454ba4a9 am: 29257874f9 am: 02d89a3c0c am: 14164f1bdf am: 7078aaa62a Change-Id: I00826913bfa33d529b3056c7d4a2b4a9215172d8
2017-10-19Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into ↵Beverly Tai
lmp-mr1-dev am: f2b592726d -s ours am: dfbaa1fd8b am: d7ece4da2c am: 06bd19c1fb am: 7b1157a92e -s ours am: bcdb9079ef am: 5fda53b294 am: 791d8a5b16 am: 4dd01948c1 am: 260ef208ac -s ours Change-Id: If5929149e8173cd14c15e9d4d6e513e10f96f876
2017-10-19DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: ca7ffa06bc -s ↵Jeff Sharkey
ours am: edb6b17ebc -s ours am: 08bd3a75fb am: 9c441159f9 am: 2f8dbe9693 am: 3bb6994a0b -s ours am: 73a4e88df8 Change-Id: I4ea13f580157d2985890d2115fdfc0a38f31e614
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 18:49:20 +0000