-
Notifications
You must be signed in to change notification settings - Fork 249
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ASB - January 2024 Security Patches integration
Integrating Security Patches Test done: STS r22 TCs Passed Tracked-On: OAM-114311 Signed-off-by: Alam, SahibeX <[email protected]>
- Loading branch information
Showing
14 changed files
with
1,306 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
36 changes: 36 additions & 0 deletions
36
...av/32_0032-Codec2BufferUtils-Use-cropped-dimensions-in-RGB-to-YUV-conversi.bulletin.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| From 74880c6156ad038bbf0397bffc39504454f3acdd Mon Sep 17 00:00:00 2001 | ||
| From: Harish Mahendrakar <[email protected]> | ||
| Date: Mon, 28 Aug 2023 17:35:56 +0000 | ||
| Subject: [PATCH] Codec2BufferUtils: Use cropped dimensions in RGB to YUV | ||
| conversion | ||
|
|
||
| Bug: 283099444 | ||
| Test: poc in the bug | ||
| (cherry picked from https://partner-android-review.googlesource.com/q/commit:3875b858a347e25db94574e6362798a849bf9ebd) | ||
| (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4eba80f6698cb2d7aa48ea4f7728dbdf11f29fd3) | ||
| (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:aaddf2a49d758a55319b88c8331d5b1209858c41) | ||
| (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3ee0378ac5b39fe57fb91f0a8113e0fd18ec1822) | ||
| Merged-In: I42c71616c9d50f61c92f461f6a91f5addb1d724a | ||
| Change-Id: I42c71616c9d50f61c92f461f6a91f5addb1d724a | ||
| --- | ||
| media/codec2/sfplugin/utils/Codec2BufferUtils.cpp | 4 ++-- | ||
| 1 file changed, 2 insertions(+), 2 deletions(-) | ||
|
|
||
| diff --git a/media/codec2/sfplugin/utils/Codec2BufferUtils.cpp b/media/codec2/sfplugin/utils/Codec2BufferUtils.cpp | ||
| index 5f87c664af..46c2e1e3bd 100644 | ||
| --- a/media/codec2/sfplugin/utils/Codec2BufferUtils.cpp | ||
| +++ b/media/codec2/sfplugin/utils/Codec2BufferUtils.cpp | ||
| @@ -551,8 +551,8 @@ status_t ConvertRGBToPlanarYUV( | ||
| uint8_t maxLvlChroma = colorRange == C2Color::RANGE_FULL ? 255 : 240; | ||
|
|
||
| #define CLIP3(min,v,max) (((v) < (min)) ? (min) : (((max) > (v)) ? (v) : (max))) | ||
| - for (size_t y = 0; y < src.height(); ++y) { | ||
| - for (size_t x = 0; x < src.width(); ++x) { | ||
| + for (size_t y = 0; y < src.crop().height; ++y) { | ||
| + for (size_t x = 0; x < src.crop().width; ++x) { | ||
| uint8_t r = *pRed; | ||
| uint8_t g = *pGreen; | ||
| uint8_t b = *pBlue; | ||
| -- | ||
| 2.43.0.rc1.413.gea7ed67945-goog | ||
|
|
34 changes: 34 additions & 0 deletions
34
...v/33_0033-Fix-convertYUV420Planar16ToY410-overflow-issue-for-unsupported-c.bulletin.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| From 7bf2507adf6fc9acd9818474623c985d0898afc5 Mon Sep 17 00:00:00 2001 | ||
| From: Songyue Han <[email protected]> | ||
| Date: Tue, 3 Oct 2023 22:40:14 +0000 | ||
| Subject: [PATCH] Fix convertYUV420Planar16ToY410 overflow issue for | ||
| unsupported cropwidth. | ||
|
|
||
| Bug: 300476626 | ||
| Test: color_conversion_fuzzer | ||
| (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:de2ad0fad97d6d97d1e01f0e8d8309536eb268b4) | ||
| (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:745ab99f7343bc236b88b9d63cd7b06ab192f9e9) | ||
| (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:aa8298ec8eb903e1e3dd915fa24f32e1aea1f76c) | ||
| Merged-In: I8631426188af3c5f9b6c1ff6a0039254c252f733 | ||
| Change-Id: I8631426188af3c5f9b6c1ff6a0039254c252f733 | ||
| --- | ||
| media/libstagefright/colorconversion/ColorConverter.cpp | 3 ++- | ||
| 1 file changed, 2 insertions(+), 1 deletion(-) | ||
|
|
||
| diff --git a/media/libstagefright/colorconversion/ColorConverter.cpp b/media/libstagefright/colorconversion/ColorConverter.cpp | ||
| index c7dc415d8b..9804887144 100644 | ||
| --- a/media/libstagefright/colorconversion/ColorConverter.cpp | ||
| +++ b/media/libstagefright/colorconversion/ColorConverter.cpp | ||
| @@ -648,7 +648,8 @@ status_t ColorConverter::convertYUV420Planar16ToY410( | ||
|
|
||
| uint32_t u01, v01, y01, y23, y45, y67, uv0, uv1; | ||
| size_t x = 0; | ||
| - for (; x < src.cropWidth() - 3; x += 4) { | ||
| + // x % 4 is always 0 so x + 3 will never overflow. | ||
| + for (; x + 3 < src.cropWidth(); x += 4) { | ||
| u01 = *((uint32_t*)ptr_u); ptr_u += 2; | ||
| v01 = *((uint32_t*)ptr_v); ptr_v += 2; | ||
|
|
||
| -- | ||
| 2.43.0.rc1.413.gea7ed67945-goog | ||
|
|
32 changes: 32 additions & 0 deletions
32
...diff/preliminary/frameworks/base/99_0224-Add-null-check-for-media-metadata.bulletin.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| From 7e50754a7c91415bbd8ea5e0519fb815b6418305 Mon Sep 17 00:00:00 2001 | ||
| From: Beth Thibodeau <[email protected]> | ||
| Date: Sat, 28 Oct 2023 00:46:24 +0000 | ||
| Subject: [PATCH] Add null check for media metadata | ||
|
|
||
| This check was inadvertently removed in a previous cherry pick and is still necessary. | ||
|
|
||
| Bug: 307983823 | ||
| Test: build | ||
| (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:abc33695709d44d3f23a310601070d496067950a) | ||
| Merged-In: I35e89feaf89322babb89fe0a30430606ebdfcdfc | ||
| Change-Id: I35e89feaf89322babb89fe0a30430606ebdfcdfc | ||
| --- | ||
| .../SystemUI/src/com/android/systemui/media/MediaDataManager.kt | 2 +- | ||
| 1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
|
||
| diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt b/packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt | ||
| index 70af5b647362..fba7ac037ee8 100644 | ||
| --- a/packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt | ||
| +++ b/packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt | ||
| @@ -574,7 +574,7 @@ class MediaDataManager( | ||
| // Song name | ||
| var song: CharSequence? = metadata?.getString(MediaMetadata.METADATA_KEY_DISPLAY_TITLE) | ||
| if (song.isNullOrBlank()) { | ||
| - song = metadata.getString(MediaMetadata.METADATA_KEY_TITLE) | ||
| + song = metadata?.getString(MediaMetadata.METADATA_KEY_TITLE) | ||
| } | ||
| if (song.isNullOrBlank()) { | ||
| song = HybridGroupManager.resolveTitle(notif) | ||
| -- | ||
| 2.43.0.rc1.413.gea7ed67945-goog | ||
|
|
42 changes: 42 additions & 0 deletions
42
...eliminary/frameworks/base/99_0225-Dismiss-keyguard-when-simpin-auth-d-and-.bulletin.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| From 1707468a608a13c3de8cc297ccc7bf717b88acc5 Mon Sep 17 00:00:00 2001 | ||
| From: Aaron Liu <[email protected]> | ||
| Date: Tue, 28 Mar 2023 13:15:04 -0700 | ||
| Subject: [PATCH] Dismiss keyguard when simpin auth'd and... | ||
|
|
||
| security method is none. This is mostly to fix the case where we auth | ||
| sim pin in the set up wizard and it goes straight to keyguard instead of | ||
| the setup wizard activity. | ||
|
|
||
| This works with the prevent bypass keyguard flag because the device | ||
| should be noe secure in this case. | ||
|
|
||
| Fixes: 222446076 | ||
| Test: turn locked sim on, which opens the sim pin screen. Auth the | ||
| screen and observe that keyguard is not shown. | ||
| (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:48fa9bef3451e4a358c941af5b230f99881c5cb6) | ||
| Cherry-picking this CL as a security fix | ||
|
|
||
| Bug: 222446076 | ||
| (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:65ea56f54c059584eb27ec53d486dba8161316ab) | ||
| Merged-In: Id302c41f63028bc6dd58ba686e23d73565de9675 | ||
| Change-Id: Id302c41f63028bc6dd58ba686e23d73565de9675 | ||
| --- | ||
| .../android/keyguard/KeyguardSecurityContainerController.java | 2 +- | ||
| 1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
|
||
| diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java | ||
| index fc9c5dddbee5..9a3a6abc3646 100644 | ||
| --- a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java | ||
| +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java | ||
| @@ -391,7 +391,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard | ||
| case SimPuk: | ||
| // Shortcut for SIM PIN/PUK to go to directly to user's security screen or home | ||
| SecurityMode securityMode = mSecurityModel.getSecurityMode(targetUserId); | ||
| - if (securityMode == SecurityMode.None && mLockPatternUtils.isLockScreenDisabled( | ||
| + if (securityMode == SecurityMode.None || mLockPatternUtils.isLockScreenDisabled( | ||
| KeyguardUpdateMonitor.getCurrentUser())) { | ||
| finish = true; | ||
| eventSubtype = BOUNCER_DISMISS_SIM; | ||
| -- | ||
| 2.43.0.rc1.413.gea7ed67945-goog | ||
|
|
133 changes: 133 additions & 0 deletions
133
...se/99_0226-DO-NOT-MERGE-Ensure-finish-lockscreen-when-usersetup-incomplete.bulletin.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,133 @@ | ||
| From 72f408c288c2ca1999e8c46c4bfade4a54b98b74 Mon Sep 17 00:00:00 2001 | ||
| From: Aaron Liu <[email protected]> | ||
| Date: Fri, 11 Aug 2023 11:02:33 -0700 | ||
| Subject: [PATCH] DO NOT MERGE Ensure finish lockscreen when usersetup | ||
| incomplete | ||
|
|
||
| Ensure that when the usersetup for the user is not complete, we do not | ||
| want to go to lockscreen, even if lockscreen is not disabled. | ||
|
|
||
| Bug: 222446076 | ||
| Test: add Unit test, | ||
| Test: Wipe device, auth sim pin in setup, observe that lockscreen is | ||
| not there. | ||
| (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:da4c8f81d9bc31ce856069bfe911dc6693b97e98) | ||
| Merged-In: I8e33db8eb6e2c917966cab3d6a4f982670473040 | ||
| Change-Id: I8e33db8eb6e2c917966cab3d6a4f982670473040 | ||
| --- | ||
| .../KeyguardSecurityContainerController.java | 21 ++++++++++++++----- | ||
| ...yguardSecurityContainerControllerTest.java | 3 ++- | ||
| 2 files changed, 18 insertions(+), 6 deletions(-) | ||
|
|
||
| diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java | ||
| index 9a3a6abc3646..b2aec6bae864 100644 | ||
| --- a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java | ||
| +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java | ||
| @@ -51,6 +51,7 @@ import com.android.settingslib.utils.ThreadUtils; | ||
| import com.android.systemui.Gefingerpoken; | ||
| import com.android.systemui.shared.system.SysUiStatsLog; | ||
| import com.android.systemui.statusbar.policy.ConfigurationController; | ||
| +import com.android.systemui.statusbar.policy.DeviceProvisionedController; | ||
| import com.android.systemui.statusbar.policy.KeyguardStateController; | ||
| import com.android.systemui.util.ViewController; | ||
|
|
||
| @@ -196,6 +197,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard | ||
| mSecurityViewFlipperController.reloadColors(); | ||
| } | ||
| }; | ||
| + private final DeviceProvisionedController mDeviceProvisionedController; | ||
|
|
||
| private KeyguardSecurityContainerController(KeyguardSecurityContainer view, | ||
| AdminSecondaryLockScreenController.Factory adminSecondaryLockScreenControllerFactory, | ||
| @@ -207,7 +209,9 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard | ||
| KeyguardStateController keyguardStateController, | ||
| SecurityCallback securityCallback, | ||
| KeyguardSecurityViewFlipperController securityViewFlipperController, | ||
| - ConfigurationController configurationController) { | ||
| + ConfigurationController configurationController, | ||
| + DeviceProvisionedController deviceProvisionedController | ||
| + ) { | ||
| super(view); | ||
| mLockPatternUtils = lockPatternUtils; | ||
| mUpdateMonitor = keyguardUpdateMonitor; | ||
| @@ -221,6 +225,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard | ||
| mKeyguardSecurityCallback); | ||
| mConfigurationController = configurationController; | ||
| mLastOrientation = getResources().getConfiguration().orientation; | ||
| + mDeviceProvisionedController = deviceProvisionedController; | ||
| } | ||
|
|
||
| @Override | ||
| @@ -391,8 +396,11 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard | ||
| case SimPuk: | ||
| // Shortcut for SIM PIN/PUK to go to directly to user's security screen or home | ||
| SecurityMode securityMode = mSecurityModel.getSecurityMode(targetUserId); | ||
| - if (securityMode == SecurityMode.None || mLockPatternUtils.isLockScreenDisabled( | ||
| - KeyguardUpdateMonitor.getCurrentUser())) { | ||
| + boolean isLockscreenDisabled = mLockPatternUtils.isLockScreenDisabled( | ||
| + KeyguardUpdateMonitor.getCurrentUser()) | ||
| + || !mDeviceProvisionedController.isUserSetup(targetUserId); | ||
| + | ||
| + if (securityMode == SecurityMode.None && isLockscreenDisabled) { | ||
| finish = true; | ||
| eventSubtype = BOUNCER_DISMISS_SIM; | ||
| uiEvent = BouncerUiEvent.BOUNCER_DISMISS_SIM; | ||
| @@ -552,6 +560,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard | ||
| private final KeyguardStateController mKeyguardStateController; | ||
| private final KeyguardSecurityViewFlipperController mSecurityViewFlipperController; | ||
| private final ConfigurationController mConfigurationController; | ||
| + private final DeviceProvisionedController mDeviceProvisionedController; | ||
|
|
||
| @Inject | ||
| Factory(KeyguardSecurityContainer view, | ||
| @@ -564,7 +573,8 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard | ||
| UiEventLogger uiEventLogger, | ||
| KeyguardStateController keyguardStateController, | ||
| KeyguardSecurityViewFlipperController securityViewFlipperController, | ||
| - ConfigurationController configurationController) { | ||
| + ConfigurationController configurationController, | ||
| + DeviceProvisionedController deviceProvisionedController) { | ||
| mView = view; | ||
| mAdminSecondaryLockScreenControllerFactory = adminSecondaryLockScreenControllerFactory; | ||
| mLockPatternUtils = lockPatternUtils; | ||
| @@ -575,6 +585,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard | ||
| mKeyguardStateController = keyguardStateController; | ||
| mSecurityViewFlipperController = securityViewFlipperController; | ||
| mConfigurationController = configurationController; | ||
| + mDeviceProvisionedController = deviceProvisionedController; | ||
| } | ||
|
|
||
| public KeyguardSecurityContainerController create( | ||
| @@ -583,7 +594,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard | ||
| mAdminSecondaryLockScreenControllerFactory, mLockPatternUtils, | ||
| mKeyguardUpdateMonitor, mKeyguardSecurityModel, mMetricsLogger, mUiEventLogger, | ||
| mKeyguardStateController, securityCallback, mSecurityViewFlipperController, | ||
| - mConfigurationController); | ||
| + mConfigurationController, mDeviceProvisionedController); | ||
| } | ||
|
|
||
| } | ||
| diff --git a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.java b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.java | ||
| index 917a6f38df0a..70825ef77765 100644 | ||
| --- a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.java | ||
| +++ b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.java | ||
| @@ -47,6 +47,7 @@ import com.android.keyguard.KeyguardSecurityModel.SecurityMode; | ||
| import com.android.systemui.R; | ||
| import com.android.systemui.SysuiTestCase; | ||
| import com.android.systemui.statusbar.policy.ConfigurationController; | ||
| +import com.android.systemui.statusbar.policy.DeviceProvisionedController; | ||
| import com.android.systemui.statusbar.policy.KeyguardStateController; | ||
|
|
||
| import org.junit.Before; | ||
| @@ -135,7 +136,7 @@ public class KeyguardSecurityContainerControllerTest extends SysuiTestCase { | ||
| mView, mAdminSecondaryLockScreenControllerFactory, mLockPatternUtils, | ||
| mKeyguardUpdateMonitor, mKeyguardSecurityModel, mMetricsLogger, mUiEventLogger, | ||
| mKeyguardStateController, mKeyguardSecurityViewFlipperController, | ||
| - mConfigurationController) | ||
| + mConfigurationController, mock(DeviceProvisionedController.class)) | ||
| .create(mSecurityCallback); | ||
| } | ||
|
|
||
| -- | ||
| 2.43.0.rc1.413.gea7ed67945-goog | ||
|
|
34 changes: 34 additions & 0 deletions
34
...eliminary/frameworks/base/99_0227-Add-placeholder-when-media-control-title-is-blank.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| From d1d574e6ff8fb3e28c9ac6f20462e7f82adcf67b Mon Sep 17 00:00:00 2001 | ||
| From: Beth Thibodeau <[email protected]> | ||
| Date: Tue, 30 May 2023 18:45:47 -0500 | ||
| Subject: [PATCH] Add placeholder when media control title is blank | ||
|
|
||
| When an app posts a media control with no available title, show a | ||
| placeholder string with the app name instead | ||
|
|
||
| Bug: 274775190 | ||
| Test: atest MediaDataManagerTest | ||
| (cherry picked from commit 070eff919c85fd83501e380a92e30caf082e9ffc) | ||
| (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0ad65345e93a97edba24349c052f8e001e96ec14) | ||
| Merged-In: Ie406c180af48653595e8e222a15b4dda27de2e0e | ||
| Change-Id: Ie406c180af48653595e8e222a15b4dda27de2e0e | ||
| --- | ||
| .../SystemUI/src/com/android/systemui/media/MediaDataManager.kt | 2 +- | ||
| 1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
|
||
| diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt b/packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt | ||
| index 096314d1c51a..699a79cbfbad 100644 | ||
| --- a/packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt | ||
| +++ b/packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt | ||
| @@ -579,7 +579,7 @@ class MediaDataManager( | ||
| // Song name | ||
| var song: CharSequence? = metadata?.getString(MediaMetadata.METADATA_KEY_DISPLAY_TITLE) | ||
| if (song.isNullOrBlank()) { | ||
| - song = metadata?.getString(MediaMetadata.METADATA_KEY_TITLE) | ||
| + song = metadata.getString(MediaMetadata.METADATA_KEY_TITLE) | ||
| } | ||
| if (song.isNullOrBlank()) { | ||
| song = HybridGroupManager.resolveTitle(notif) | ||
| -- | ||
| 2.17.1 | ||
|
|
Oops, something went wrong.