From a458d91293a092b0e36f955a8d4b8a59061b7b3e Mon Sep 17 00:00:00 2001 From: Tavi Date: Sat, 21 Sep 2024 12:01:42 -0400 Subject: [PATCH] 18.1: Reconcile picks no effective change Signed-off-by: Tavi --- .../{401372.patch => 403217.patch} | 4 +- .../{401373.patch => 403218.patch} | 12 ++--- .../{401375.patch => 403219.patch} | 2 +- .../{401376-backport.patch => 403220.patch} | 10 ++-- .../{401377.patch => 403221.patch} | 12 ++--- .../{401378-backport.patch => 403222.patch} | 4 +- .../{401380-backport.patch => 403223.patch} | 50 +++++++++---------- .../{401381.patch => 403224.patch} | 4 +- .../{401382.patch => 403225.patch} | 4 +- Scripts/LineageOS-18.1/Patch.sh | 18 +++---- 10 files changed, 60 insertions(+), 60 deletions(-) rename Patches/LineageOS-18.1/android_frameworks_av/{401372.patch => 403217.patch} (94%) rename Patches/LineageOS-18.1/android_frameworks_base/{401373.patch => 403218.patch} (88%) rename Patches/LineageOS-18.1/android_packages_apps_Settings/{401375.patch => 403219.patch} (94%) rename Patches/LineageOS-18.1/android_packages_apps_Settings/{401376-backport.patch => 403220.patch} (94%) rename Patches/LineageOS-18.1/android_packages_apps_Settings/{401377.patch => 403221.patch} (92%) rename Patches/LineageOS-18.1/android_packages_apps_Settings/{401378-backport.patch => 403222.patch} (94%) rename Patches/LineageOS-18.1/android_packages_services_Telecomm/{401380-backport.patch => 403223.patch} (93%) rename Patches/LineageOS-18.1/android_packages_services_Telecomm/{401381.patch => 403224.patch} (94%) rename Patches/LineageOS-18.1/android_packages_services_Telecomm/{401382.patch => 403225.patch} (92%) diff --git a/Patches/LineageOS-18.1/android_frameworks_av/401372.patch b/Patches/LineageOS-18.1/android_frameworks_av/403217.patch similarity index 94% rename from Patches/LineageOS-18.1/android_frameworks_av/401372.patch rename to Patches/LineageOS-18.1/android_frameworks_av/403217.patch index e1a784f8..2590cb58 100644 --- a/Patches/LineageOS-18.1/android_frameworks_av/401372.patch +++ b/Patches/LineageOS-18.1/android_frameworks_av/403217.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 175ce9900d282d018e2175a4cc1727a35c2d21c6 Mon Sep 17 00:00:00 2001 From: Wonsik Kim Date: Fri, 28 Jun 2024 00:33:51 +0000 Subject: [PATCH] omx: check HDR10+ info param size @@ -15,7 +15,7 @@ Change-Id: I72523e1de61e5f947174272b732e170e1c2964df 1 file changed, 7 insertions(+) diff --git a/media/libstagefright/omx/SoftVideoDecoderOMXComponent.cpp b/media/libstagefright/omx/SoftVideoDecoderOMXComponent.cpp -index 418302389d..4ab5d10609 100644 +index 418302389d1..4ab5d106096 100644 --- a/media/libstagefright/omx/SoftVideoDecoderOMXComponent.cpp +++ b/media/libstagefright/omx/SoftVideoDecoderOMXComponent.cpp @@ -619,6 +619,13 @@ OMX_ERRORTYPE SoftVideoDecoderOMXComponent::getConfig( diff --git a/Patches/LineageOS-18.1/android_frameworks_base/401373.patch b/Patches/LineageOS-18.1/android_frameworks_base/403218.patch similarity index 88% rename from Patches/LineageOS-18.1/android_frameworks_base/401373.patch rename to Patches/LineageOS-18.1/android_frameworks_base/403218.patch index 393501a8..6229518c 100644 --- a/Patches/LineageOS-18.1/android_frameworks_base/401373.patch +++ b/Patches/LineageOS-18.1/android_frameworks_base/403218.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 701cf719f36830fd3c1b02c5585ce3226a30f092 Mon Sep 17 00:00:00 2001 From: Kiran Ramachandra Date: Wed, 5 Jun 2024 21:03:33 +0000 Subject: [PATCH] DO NOT MERGE Ignore - Sanitized uri scheme by removing scheme @@ -19,10 +19,10 @@ Change-Id: I88b1550a5d8b3dc0f6286e28899884025d059645 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/core/java/android/net/Uri.java b/core/java/android/net/Uri.java -index 84fc4f78edc4..4446f09bc874 100644 +index 84fc4f78edc46..4446f09bc8743 100644 --- a/core/java/android/net/Uri.java +++ b/core/java/android/net/Uri.java -@@ -1380,7 +1380,11 @@ public abstract class Uri implements Parcelable, Comparable { +@@ -1380,7 +1380,11 @@ public Builder() {} * @param scheme name or {@code null} if this is a relative Uri */ public Builder scheme(String scheme) { @@ -36,10 +36,10 @@ index 84fc4f78edc4..4446f09bc874 100644 } diff --git a/core/tests/coretests/src/android/net/UriTest.java b/core/tests/coretests/src/android/net/UriTest.java -index 670aefd21d36..17a37831afdb 100644 +index 670aefd21d360..17a37831afdb1 100644 --- a/core/tests/coretests/src/android/net/UriTest.java +++ b/core/tests/coretests/src/android/net/UriTest.java -@@ -18,6 +18,7 @@ package android.net; +@@ -18,6 +18,7 @@ import android.content.ContentUris; import android.os.Parcel; @@ -47,7 +47,7 @@ index 670aefd21d36..17a37831afdb 100644 import androidx.test.filters.SmallTest; -@@ -88,6 +89,16 @@ public class UriTest extends TestCase { +@@ -88,6 +89,16 @@ public void testBuildUponOpaqueStringUri() { assertNull(u.getHost()); } diff --git a/Patches/LineageOS-18.1/android_packages_apps_Settings/401375.patch b/Patches/LineageOS-18.1/android_packages_apps_Settings/403219.patch similarity index 94% rename from Patches/LineageOS-18.1/android_packages_apps_Settings/401375.patch rename to Patches/LineageOS-18.1/android_packages_apps_Settings/403219.patch index bf315031..6c7f1154 100644 --- a/Patches/LineageOS-18.1/android_packages_apps_Settings/401375.patch +++ b/Patches/LineageOS-18.1/android_packages_apps_Settings/403219.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From a593133d22bde6331bcaf258c2b01acea3ba246e Mon Sep 17 00:00:00 2001 From: Chaohui Wang Date: Thu, 2 Nov 2023 11:43:00 +0800 Subject: [PATCH] Limit wifi item edit content's max length to 500 diff --git a/Patches/LineageOS-18.1/android_packages_apps_Settings/401376-backport.patch b/Patches/LineageOS-18.1/android_packages_apps_Settings/403220.patch similarity index 94% rename from Patches/LineageOS-18.1/android_packages_apps_Settings/401376-backport.patch rename to Patches/LineageOS-18.1/android_packages_apps_Settings/403220.patch index 371e1435..ccf19341 100644 --- a/Patches/LineageOS-18.1/android_packages_apps_Settings/401376-backport.patch +++ b/Patches/LineageOS-18.1/android_packages_apps_Settings/403220.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 1e9cb20c9ea8c9e9234080ae8b805f0d5ee5f759 Mon Sep 17 00:00:00 2001 From: Jason Chiu Date: Wed, 31 Jan 2024 16:29:01 +0800 Subject: [PATCH] Replace getCallingActivity() with getLaunchedFromPackage() @@ -54,7 +54,7 @@ index 63bf420c027..423779fbabf 100644 import com.android.settingslib.search.SearchIndexableResources; import com.android.settingslib.search.SearchIndexableResourcesMobile; -@@ -32,22 +33,19 @@ import com.android.settingslib.search.SearchIndexableResourcesMobile; +@@ -32,22 +33,19 @@ */ public class SearchFeatureProviderImpl implements SearchFeatureProvider { @@ -88,7 +88,7 @@ diff --git a/src/com/android/settings/search/SearchResultTrampoline.java b/src/c index e9304739460..c233e86b6fc 100644 --- a/src/com/android/settings/search/SearchResultTrampoline.java +++ b/src/com/android/settings/search/SearchResultTrampoline.java -@@ -39,7 +39,7 @@ public class SearchResultTrampoline extends Activity { +@@ -39,7 +39,7 @@ protected void onCreate(Bundle savedInstanceState) { // First make sure caller has privilege to launch a search result page. FeatureFactory.getFactory(this) .getSearchFeatureProvider() @@ -101,7 +101,7 @@ diff --git a/tests/robotests/src/com/android/settings/search/SearchFeatureProvid index 444a8137889..ebd935d3406 100644 --- a/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java -@@ -21,7 +21,6 @@ import static com.google.common.truth.Truth.assertThat; +@@ -21,7 +21,6 @@ import android.app.Activity; import android.app.settings.SettingsEnums; @@ -109,7 +109,7 @@ index 444a8137889..ebd935d3406 100644 import android.content.Intent; import android.content.pm.ActivityInfo; import android.content.pm.ResolveInfo; -@@ -126,20 +125,22 @@ public class SearchFeatureProviderImplTest { +@@ -126,20 +125,22 @@ public void verifyLaunchSearchResultPageCaller_nullCaller_shouldCrash() { @Test(expected = SecurityException.class) public void verifyLaunchSearchResultPageCaller_badCaller_shouldCrash() { diff --git a/Patches/LineageOS-18.1/android_packages_apps_Settings/401377.patch b/Patches/LineageOS-18.1/android_packages_apps_Settings/403221.patch similarity index 92% rename from Patches/LineageOS-18.1/android_packages_apps_Settings/401377.patch rename to Patches/LineageOS-18.1/android_packages_apps_Settings/403221.patch index da0ef994..9f7ca60d 100644 --- a/Patches/LineageOS-18.1/android_packages_apps_Settings/401377.patch +++ b/Patches/LineageOS-18.1/android_packages_apps_Settings/403221.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 227df78aae8974bcdde516d111189f082824a765 Mon Sep 17 00:00:00 2001 From: Chris Antol Date: Tue, 4 Jun 2024 17:00:46 +0000 Subject: [PATCH] Ignore fragment attr from ext authenticator resource @@ -19,7 +19,7 @@ diff --git a/src/com/android/settings/accounts/AccountTypePreferenceLoader.java index c639d1df2eb..84386a38f08 100644 --- a/src/com/android/settings/accounts/AccountTypePreferenceLoader.java +++ b/src/com/android/settings/accounts/AccountTypePreferenceLoader.java -@@ -32,6 +32,10 @@ import android.os.UserHandle; +@@ -32,6 +32,10 @@ import android.text.TextUtils; import android.util.Log; @@ -30,7 +30,7 @@ index c639d1df2eb..84386a38f08 100644 import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceClickListener; import androidx.preference.PreferenceFragmentCompat; -@@ -45,6 +49,8 @@ import com.android.settings.utils.LocalClassLoaderContextThemeWrapper; +@@ -45,6 +49,8 @@ import com.android.settingslib.accounts.AuthenticatorHelper; import com.android.settingslib.core.instrumentation.Instrumentable; @@ -39,7 +39,7 @@ index c639d1df2eb..84386a38f08 100644 /** * Class to load the preference screen to be added to the settings page for the specific account * type as specified in the account-authenticator. -@@ -83,6 +89,7 @@ public class AccountTypePreferenceLoader { +@@ -83,6 +89,7 @@ public PreferenceScreen addPreferencesForType(final String accountType, try { desc = mAuthenticatorHelper.getAccountTypeDescription(accountType); if (desc != null && desc.accountPreferencesId != 0) { @@ -47,7 +47,7 @@ index c639d1df2eb..84386a38f08 100644 // Load the context of the target package, then apply the // base Settings theme (no references to local resources) // and create a context theme wrapper so that we get the -@@ -98,6 +105,12 @@ public class AccountTypePreferenceLoader { +@@ -98,6 +105,12 @@ public PreferenceScreen addPreferencesForType(final String accountType, themedCtx.getTheme().setTo(baseTheme); prefs = mFragment.getPreferenceManager().inflateFromResource(themedCtx, desc.accountPreferencesId, parent); @@ -60,7 +60,7 @@ index c639d1df2eb..84386a38f08 100644 } } catch (PackageManager.NameNotFoundException e) { Log.w(TAG, "Couldn't load preferences.xml file from " + desc.packageName); -@@ -182,6 +195,48 @@ public class AccountTypePreferenceLoader { +@@ -182,6 +195,48 @@ public boolean onPreferenceClick(Preference preference) { } } diff --git a/Patches/LineageOS-18.1/android_packages_apps_Settings/401378-backport.patch b/Patches/LineageOS-18.1/android_packages_apps_Settings/403222.patch similarity index 94% rename from Patches/LineageOS-18.1/android_packages_apps_Settings/401378-backport.patch rename to Patches/LineageOS-18.1/android_packages_apps_Settings/403222.patch index e90f701f..0652d7ca 100644 --- a/Patches/LineageOS-18.1/android_packages_apps_Settings/401378-backport.patch +++ b/Patches/LineageOS-18.1/android_packages_apps_Settings/403222.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From e406e4d8ec8c977652e2c6be7ca1e400683a475e Mon Sep 17 00:00:00 2001 From: Chris Antol Date: Mon, 25 Mar 2024 23:49:35 +0000 Subject: [PATCH] RESTRICT AUTOMERGE Restrict Settings Homepage prior to @@ -20,7 +20,7 @@ diff --git a/src/com/android/settings/homepage/SettingsHomepageActivity.java b/s index a8426437f57..61567947124 100644 --- a/src/com/android/settings/homepage/SettingsHomepageActivity.java +++ b/src/com/android/settings/homepage/SettingsHomepageActivity.java -@@ -20,6 +20,7 @@ import android.animation.LayoutTransition; +@@ -20,6 +20,7 @@ import android.app.ActivityManager; import android.app.settings.SettingsEnums; import android.os.Bundle; diff --git a/Patches/LineageOS-18.1/android_packages_services_Telecomm/401380-backport.patch b/Patches/LineageOS-18.1/android_packages_services_Telecomm/403223.patch similarity index 93% rename from Patches/LineageOS-18.1/android_packages_services_Telecomm/401380-backport.patch rename to Patches/LineageOS-18.1/android_packages_services_Telecomm/403223.patch index 5da7acc1..492bb529 100644 --- a/Patches/LineageOS-18.1/android_packages_services_Telecomm/401380-backport.patch +++ b/Patches/LineageOS-18.1/android_packages_services_Telecomm/403223.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From d5dd619c2ba08613723d45636e04fc37da0bd716 Mon Sep 17 00:00:00 2001 From: Grant Menke Date: Thu, 25 Apr 2024 10:43:43 -0700 Subject: [PATCH] DO NOT MERGE Unbind CS if connection is not created within 15 @@ -28,7 +28,7 @@ diff --git a/src/com/android/server/telecom/Call.java b/src/com/android/server/t index cd236d2f4..e8c5a47ac 100755 --- a/src/com/android/server/telecom/Call.java +++ b/src/com/android/server/telecom/Call.java -@@ -329,6 +329,17 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable, +@@ -329,6 +329,17 @@ public void onContactPhotoQueryComplete(Uri handle, CallerInfo callerInfo) { /** The state of the call. */ private int mState; @@ -46,7 +46,7 @@ index cd236d2f4..e8c5a47ac 100755 /** The handle with which to establish this call. */ private Uri mHandle; -@@ -958,6 +969,19 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable, +@@ -958,6 +969,19 @@ public ConnectionServiceFocusManager.ConnectionServiceFocus getConnectionService return mConnectionService; } @@ -66,7 +66,7 @@ index cd236d2f4..e8c5a47ac 100755 @VisibleForTesting public int getState() { return mState; -@@ -2043,6 +2067,7 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable, +@@ -2043,6 +2067,7 @@ public void handleCreateConferenceSuccess( CallIdMapper idMapper, ParcelableConference conference) { Log.v(this, "handleCreateConferenceSuccessful %s", conference); @@ -74,7 +74,7 @@ index cd236d2f4..e8c5a47ac 100755 setTargetPhoneAccount(conference.getPhoneAccount()); setHandle(conference.getHandle(), conference.getHandlePresentation()); -@@ -2076,6 +2101,7 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable, +@@ -2076,6 +2101,7 @@ public void handleCreateConnectionSuccess( CallIdMapper idMapper, ParcelableConnection connection) { Log.v(this, "handleCreateConnectionSuccessful %s", connection); @@ -86,7 +86,7 @@ diff --git a/src/com/android/server/telecom/ConnectionServiceWrapper.java b/src/ index 64fdd8833..6ca74fba3 100644 --- a/src/com/android/server/telecom/ConnectionServiceWrapper.java +++ b/src/com/android/server/telecom/ConnectionServiceWrapper.java -@@ -37,6 +37,7 @@ import android.telecom.ConnectionService; +@@ -37,6 +37,7 @@ import android.telecom.DisconnectCause; import android.telecom.GatewayInfo; import android.telecom.Log; @@ -94,7 +94,7 @@ index 64fdd8833..6ca74fba3 100644 import android.telecom.Logging.Session; import android.telecom.ParcelableConference; import android.telecom.ParcelableConnection; -@@ -59,6 +60,11 @@ import java.util.List; +@@ -59,6 +60,11 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; @@ -118,7 +118,7 @@ index 64fdd8833..6ca74fba3 100644 private final class Adapter extends IConnectionServiceAdapter.Stub { @Override -@@ -84,6 +95,12 @@ public class ConnectionServiceWrapper extends ServiceBinder implements +@@ -84,6 +95,12 @@ public void handleCreateConnectionComplete(String callId, ConnectionRequest requ try { synchronized (mLock) { logIncoming("handleCreateConnectionComplete %s", callId); @@ -131,7 +131,7 @@ index 64fdd8833..6ca74fba3 100644 // Check status hints image for cross user access if (connection.getStatusHints() != null) { Icon icon = connection.getStatusHints().getIcon(); -@@ -120,6 +137,12 @@ public class ConnectionServiceWrapper extends ServiceBinder implements +@@ -120,6 +137,12 @@ public void handleCreateConferenceComplete(String callId, ConnectionRequest requ try { synchronized (mLock) { logIncoming("handleCreateConferenceComplete %s", callId); @@ -144,7 +144,7 @@ index 64fdd8833..6ca74fba3 100644 ConnectionServiceWrapper.this .handleCreateConferenceComplete(callId, request, conference); -@@ -1183,7 +1206,8 @@ public class ConnectionServiceWrapper extends ServiceBinder implements +@@ -1183,7 +1206,8 @@ public void setCallDirection(String callId, int direction, Session.Info sessionI * @param context The context. * @param userHandle The {@link UserHandle} to use when binding. */ @@ -154,7 +154,7 @@ index 64fdd8833..6ca74fba3 100644 ComponentName componentName, ConnectionServiceRepository connectionServiceRepository, PhoneAccountRegistrar phoneAccountRegistrar, -@@ -1258,6 +1282,26 @@ public class ConnectionServiceWrapper extends ServiceBinder implements +@@ -1258,6 +1282,26 @@ public void onSuccess() { .setIsAdhocConferenceCall(call.isAdhocConferenceCall()) .build(); @@ -181,7 +181,7 @@ index 64fdd8833..6ca74fba3 100644 try { mServiceInterface.createConference( call.getConnectionManagerPhoneAccount(), -@@ -1347,6 +1391,26 @@ public class ConnectionServiceWrapper extends ServiceBinder implements +@@ -1347,6 +1391,26 @@ public void onSuccess() { .setRttPipeToInCall(call.getCsToInCallRttPipeForCs()) .build(); @@ -208,7 +208,7 @@ index 64fdd8833..6ca74fba3 100644 try { mServiceInterface.createConnection( call.getConnectionManagerPhoneAccount(), -@@ -1727,7 +1791,8 @@ public class ConnectionServiceWrapper extends ServiceBinder implements +@@ -1727,7 +1791,8 @@ void stopDtmfTone(Call call) { } } @@ -218,7 +218,7 @@ index 64fdd8833..6ca74fba3 100644 if (mCallIdMapper.getCallId(call) == null) { mCallIdMapper.addCall(call); } -@@ -2172,4 +2237,9 @@ public class ConnectionServiceWrapper extends ServiceBinder implements +@@ -2172,4 +2237,9 @@ public String toString() { sb.append("]"); return sb.toString(); } @@ -232,7 +232,7 @@ diff --git a/src/com/android/server/telecom/LogUtils.java b/src/com/android/serv index 5bb14e625..1c62a5c71 100644 --- a/src/com/android/server/telecom/LogUtils.java +++ b/src/com/android/server/telecom/LogUtils.java -@@ -124,8 +124,10 @@ public class LogUtils { +@@ -124,8 +124,10 @@ public final static class Events { public static final String STOP_CALL_WAITING_TONE = "STOP_CALL_WAITING_TONE"; public static final String START_CONNECTION = "START_CONNECTION"; public static final String CREATE_CONNECTION_FAILED = "CREATE_CONNECTION_FAILED"; @@ -247,7 +247,7 @@ diff --git a/tests/src/com/android/server/telecom/tests/BasicCallTests.java b/te index 382e0b710..6ac8e1c62 100644 --- a/tests/src/com/android/server/telecom/tests/BasicCallTests.java +++ b/tests/src/com/android/server/telecom/tests/BasicCallTests.java -@@ -963,6 +963,7 @@ public class BasicCallTests extends TelecomSystemTest { +@@ -963,6 +963,7 @@ public void testOutgoingCallSelectPhoneAccountVideo() throws Exception { call.setTargetPhoneAccount(mPhoneAccountA1.getAccountHandle()); assert(call.isVideoCallingSupportedByPhoneAccount()); assertEquals(VideoProfile.STATE_BIDIRECTIONAL, call.getVideoState()); @@ -255,7 +255,7 @@ index 382e0b710..6ac8e1c62 100644 } /** -@@ -986,6 +987,7 @@ public class BasicCallTests extends TelecomSystemTest { +@@ -986,6 +987,7 @@ public void testOutgoingCallSelectPhoneAccountNoVideo() throws Exception { call.setTargetPhoneAccount(mPhoneAccountA2.getAccountHandle()); assert(!call.isVideoCallingSupportedByPhoneAccount()); assertEquals(VideoProfile.STATE_AUDIO_ONLY, call.getVideoState()); @@ -267,7 +267,7 @@ diff --git a/tests/src/com/android/server/telecom/tests/CallsManagerTest.java b/ index d16430298..912b56cf3 100644 --- a/tests/src/com/android/server/telecom/tests/CallsManagerTest.java +++ b/tests/src/com/android/server/telecom/tests/CallsManagerTest.java -@@ -40,11 +40,13 @@ import static org.mockito.Mockito.timeout; +@@ -40,11 +40,13 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -281,7 +281,7 @@ index d16430298..912b56cf3 100644 import android.os.Process; import android.os.SystemClock; import android.os.UserHandle; -@@ -62,6 +64,7 @@ import android.test.suitebuilder.annotation.MediumTest; +@@ -62,6 +64,7 @@ import android.test.suitebuilder.annotation.SmallTest; import android.widget.Toast; @@ -289,7 +289,7 @@ index d16430298..912b56cf3 100644 import com.android.server.telecom.AsyncRingtonePlayer; import com.android.server.telecom.Call; import com.android.server.telecom.CallAudioManager; -@@ -74,6 +77,7 @@ import com.android.server.telecom.CallsManagerListenerBase; +@@ -74,6 +77,7 @@ import com.android.server.telecom.ClockProxy; import com.android.server.telecom.ConnectionServiceFocusManager; import com.android.server.telecom.ConnectionServiceFocusManager.ConnectionServiceFocusManagerFactory; @@ -305,7 +305,7 @@ index d16430298..912b56cf3 100644 private CallsManager mCallsManager; -@@ -274,11 +279,19 @@ public class CallsManagerTest extends TelecomTestCase { +@@ -274,11 +279,19 @@ public void setUp() throws Exception { eq(SIM_2_HANDLE), any())).thenReturn(SIM_2_ACCOUNT); when(mToastFactory.makeText(any(), anyInt(), anyInt())).thenReturn(mToast); when(mToastFactory.makeText(any(), any(), anyInt())).thenReturn(mToast); @@ -325,7 +325,7 @@ index d16430298..912b56cf3 100644 super.tearDown(); } -@@ -1456,6 +1469,32 @@ public class CallsManagerTest extends TelecomTestCase { +@@ -1456,6 +1469,32 @@ public void testCrossUserCallRedirectionEndEarlyForIncapablePhoneAccount() { assertTrue(argumentCaptor.getValue().contains("Unavailable phoneAccountHandle")); } @@ -358,7 +358,7 @@ index d16430298..912b56cf3 100644 private Call addSpyCall() { return addSpyCall(SIM_2_HANDLE, CallState.ACTIVE); } -@@ -1549,4 +1588,19 @@ public class CallsManagerTest extends TelecomTestCase { +@@ -1549,4 +1588,19 @@ private void setupMsimAccounts() { when(mPhoneAccountRegistrar.getSimPhoneAccountsOfCurrentUser()).thenReturn( new ArrayList<>(Arrays.asList(SIM_1_HANDLE, SIM_2_HANDLE))); } @@ -382,7 +382,7 @@ diff --git a/tests/src/com/android/server/telecom/tests/ComponentContextFixture. index af062d77f..0768970b1 100644 --- a/tests/src/com/android/server/telecom/tests/ComponentContextFixture.java +++ b/tests/src/com/android/server/telecom/tests/ComponentContextFixture.java -@@ -589,6 +589,14 @@ public class ComponentContextFixture implements TestFixture { +@@ -589,6 +589,14 @@ public void addConnectionService( mServiceInfoByComponentName.put(componentName, serviceInfo); } @@ -397,7 +397,7 @@ index af062d77f..0768970b1 100644 public void addInCallService( ComponentName componentName, IInCallService service, -@@ -658,6 +666,12 @@ public class ComponentContextFixture implements TestFixture { +@@ -658,6 +666,12 @@ private void addService(String action, ComponentName name, IInterface service) { mComponentNameByService.put(service, name); } diff --git a/Patches/LineageOS-18.1/android_packages_services_Telecomm/401381.patch b/Patches/LineageOS-18.1/android_packages_services_Telecomm/403224.patch similarity index 94% rename from Patches/LineageOS-18.1/android_packages_services_Telecomm/401381.patch rename to Patches/LineageOS-18.1/android_packages_services_Telecomm/403224.patch index 5de77f51..63ee0b90 100644 --- a/Patches/LineageOS-18.1/android_packages_services_Telecomm/401381.patch +++ b/Patches/LineageOS-18.1/android_packages_services_Telecomm/403224.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From bc65c0bcae61a887b46b5d125ac30b065ff65d15 Mon Sep 17 00:00:00 2001 From: Pranav Madapurmath Date: Tue, 11 Jun 2024 15:51:39 +0000 Subject: [PATCH] Unbind CallScreeningService when timeout reached. @@ -30,7 +30,7 @@ diff --git a/src/com/android/server/telecom/CallScreeningServiceHelper.java b/sr index 5e47c1f94..e9ad451c2 100644 --- a/src/com/android/server/telecom/CallScreeningServiceHelper.java +++ b/src/com/android/server/telecom/CallScreeningServiceHelper.java -@@ -191,6 +191,10 @@ public class CallScreeningServiceHelper { +@@ -191,6 +191,10 @@ public void onNullBinding(ComponentName name) { Log.w(TAG, "Cancelling call id process due to timeout"); } mFuture.complete(null); diff --git a/Patches/LineageOS-18.1/android_packages_services_Telecomm/401382.patch b/Patches/LineageOS-18.1/android_packages_services_Telecomm/403225.patch similarity index 92% rename from Patches/LineageOS-18.1/android_packages_services_Telecomm/401382.patch rename to Patches/LineageOS-18.1/android_packages_services_Telecomm/403225.patch index 5727dee1..5205add5 100644 --- a/Patches/LineageOS-18.1/android_packages_services_Telecomm/401382.patch +++ b/Patches/LineageOS-18.1/android_packages_services_Telecomm/403225.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From cd4c2994e16a9a5c911292a6d05ed66f41efd53a Mon Sep 17 00:00:00 2001 From: Pranav Madapurmath Date: Tue, 11 Jun 2024 22:50:08 -0700 Subject: [PATCH] Resolve cross-user image exploit for conference status hints @@ -20,7 +20,7 @@ diff --git a/src/com/android/server/telecom/ConnectionServiceWrapper.java b/src/ index 6ca74fba3..e944209a4 100644 --- a/src/com/android/server/telecom/ConnectionServiceWrapper.java +++ b/src/com/android/server/telecom/ConnectionServiceWrapper.java -@@ -133,10 +133,17 @@ public class ConnectionServiceWrapper extends ServiceBinder implements +@@ -133,10 +133,17 @@ public void handleCreateConferenceComplete(String callId, ConnectionRequest requ ParcelableConference conference, Session.Info sessionInfo) { Log.startSession(sessionInfo, LogUtils.Sessions.CSW_HANDLE_CREATE_CONNECTION_COMPLETE, mPackageAbbreviation); diff --git a/Scripts/LineageOS-18.1/Patch.sh b/Scripts/LineageOS-18.1/Patch.sh index 6542b708..0f194b46 100644 --- a/Scripts/LineageOS-18.1/Patch.sh +++ b/Scripts/LineageOS-18.1/Patch.sh @@ -141,7 +141,7 @@ applyPatch "$DOS_PATCHES/android_frameworks_av/385529.patch"; #R_asb_2024-03 Val applyPatch "$DOS_PATCHES/android_frameworks_av/385530.patch"; #R_asb_2024-03 SoftVideoDecodeOMXComponent: validate OMX params for dynamic HDR applyPatch "$DOS_PATCHES/android_frameworks_av/385531.patch"; #R_asb_2024-03 Fix out of bounds read and write in onQueueFilled in outQueue applyPatch "$DOS_PATCHES/android_frameworks_av/399741.patch"; #R_asb_2024-08 StagefrightRecoder: Disabling B-frame support -applyPatch "$DOS_PATCHES/android_frameworks_av/401372.patch"; #S_asb_2024-09 omx: check HDR10+ info param size +applyPatch "$DOS_PATCHES/android_frameworks_av/403217.patch"; #R_asb_2024-09 omx: check HDR10+ info param size fi; if enterAndClear "frameworks/base"; then @@ -173,7 +173,7 @@ applyPatch "$DOS_PATCHES/android_frameworks_base/397543.patch"; #R_asb_2024-07 F applyPatch "$DOS_PATCHES/android_frameworks_base/399738.patch"; #R_asb_2024-08 Backport preventing BAL bypass via bound service applyPatch "$DOS_PATCHES/android_frameworks_base/399739.patch"; #R_asb_2024-08 Restrict USB poups while setup is in progress applyPatch "$DOS_PATCHES/android_frameworks_base/399740.patch"; #R_asb_2024-08 Hide SAW subwindows -applyPatch "$DOS_PATCHES/android_frameworks_base/401373.patch"; #S_asb_2024-09 Sanitized uri scheme by removing scheme delimiter +applyPatch "$DOS_PATCHES/android_frameworks_base/403218.patch"; #R_asb_2024-09 Sanitized uri scheme by removing scheme delimiter git revert --no-edit 438d9feacfcad73d3ee918541574132928a93644; #Reverts "Allow signature spoofing for microG Companion/Services" in favor of below patch applyPatch "$DOS_PATCHES/android_frameworks_base/0007-Always_Restict_Serial.patch"; #Always restrict access to Build.SERIAL (GrapheneOS) applyPatch "$DOS_PATCHES/android_frameworks_base/0008-Browser_No_Location.patch"; #Don't grant location permission to system browsers (GrapheneOS) @@ -368,10 +368,10 @@ applyPatch "$DOS_PATCHES/android_packages_apps_PermissionController/0002-Special fi; if enterAndClear "packages/apps/Settings"; then -applyPatch "$DOS_PATCHES/android_packages_apps_Settings/401375.patch"; #S_asb_2024-09 Limit wifi item edit content's max length to 500 -applyPatch "$DOS_PATCHES/android_packages_apps_Settings/401376-backport.patch"; #S_asb_2024-09 Replace getCallingActivity() with getLaunchedFromPackage() -applyPatch "$DOS_PATCHES/android_packages_apps_Settings/401377.patch"; #S_asb_2024-09 Ignore fragment attr from ext authenticator resource -applyPatch "$DOS_PATCHES/android_packages_apps_Settings/401378-backport.patch"; #S_asb_2024-09 Restrict Settings Homepage prior to provisioning +applyPatch "$DOS_PATCHES/android_packages_apps_Settings/403219.patch"; #R_asb_2024-09 Limit wifi item edit content's max length to 500 +applyPatch "$DOS_PATCHES/android_packages_apps_Settings/403220.patch"; #R_asb_2024-09 Replace getCallingActivity() with getLaunchedFromPackage() +applyPatch "$DOS_PATCHES/android_packages_apps_Settings/403221.patch"; #R_asb_2024-09 Ignore fragment attr from ext authenticator resource +applyPatch "$DOS_PATCHES/android_packages_apps_Settings/403222.patch"; #R_asb_2024-09 Restrict Settings Homepage prior to provisioning #applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0001-Captive_Portal_Toggle.patch"; #Add option to disable captive portal checks (MSe1969) applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0001-Captive_Portal_Toggle-gos.patch"; #Add option to disable captive portal checks (GrapheneOS) applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0003-Remove_SensorsOff_Tile.patch"; #Remove the Sensors Off development tile (DivestOS) @@ -439,9 +439,9 @@ applyPatch "$DOS_PATCHES/android_packages_providers_TelephonyProvider/312102.pat fi; if enterAndClear "packages/services/Telecomm"; then -applyPatch "$DOS_PATCHES/android_packages_services_Telecomm/401380-backport.patch"; #S_asb_2024-09 Unbind CS if connection is not created within 15 seconds. -applyPatch "$DOS_PATCHES/android_packages_services_Telecomm/401381.patch"; #S_asb_2024-09 Unbind CallScreeningService when timeout reached. -applyPatch "$DOS_PATCHES/android_packages_services_Telecomm/401382.patch"; #S_asb_2024-09 Resolve cross-user image exploit for conference status hints +applyPatch "$DOS_PATCHES/android_packages_services_Telecomm/403223.patch"; #R_asb_2024-09 Unbind CS if connection is not created within 15 seconds. +applyPatch "$DOS_PATCHES/android_packages_services_Telecomm/403224.patch"; #R_asb_2024-09 Unbind CallScreeningService when timeout reached. +applyPatch "$DOS_PATCHES/android_packages_services_Telecomm/403225.patch"; #R_asb_2024-09 Resolve cross-user image exploit for conference status hints fi; if enterAndClear "packages/services/Telephony"; then