From b8c8cfe1c3d246d2e8a73a682a6c6d18f099a362 Mon Sep 17 00:00:00 2001 From: Tavi Date: Tue, 24 Sep 2024 08:49:22 -0400 Subject: [PATCH] Reconcile picks Signed-off-by: Tavi --- .../{402601.patch => 403537.patch} | 4 +- .../{401373-backport.patch => 403538.patch} | 12 ++--- .../{401375-backport.patch => 403539.patch} | 2 +- .../{401376-backport.patch => 403540.patch} | 10 ++--- .../{401377-backport.patch => 403541.patch} | 12 ++--- .../{401380-backport.patch => 403542.patch} | 44 +++++++++---------- Scripts/LineageOS-16.0/Patch.sh | 12 ++--- 7 files changed, 48 insertions(+), 48 deletions(-) rename Patches/LineageOS-16.0/android_frameworks_av/{402601.patch => 403537.patch} (95%) rename Patches/LineageOS-16.0/android_frameworks_base/{401373-backport.patch => 403538.patch} (88%) rename Patches/LineageOS-16.0/android_packages_apps_Settings/{401375-backport.patch => 403539.patch} (94%) rename Patches/LineageOS-16.0/android_packages_apps_Settings/{401376-backport.patch => 403540.patch} (95%) rename Patches/LineageOS-16.0/android_packages_apps_Settings/{401377-backport.patch => 403541.patch} (92%) rename Patches/LineageOS-16.0/android_packages_services_Telecomm/{401380-backport.patch => 403542.patch} (93%) diff --git a/Patches/LineageOS-16.0/android_frameworks_av/402601.patch b/Patches/LineageOS-16.0/android_frameworks_av/403537.patch similarity index 95% rename from Patches/LineageOS-16.0/android_frameworks_av/402601.patch rename to Patches/LineageOS-16.0/android_frameworks_av/403537.patch index 80053086..51b36fc6 100644 --- a/Patches/LineageOS-16.0/android_frameworks_av/402601.patch +++ b/Patches/LineageOS-16.0/android_frameworks_av/403537.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From c47fb676909e2e0896f08880dd542ea89040f791 Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Tue, 27 Aug 2024 16:53:27 +0200 Subject: [PATCH] Fix flag check in JAudioTrack.cpp @@ -12,7 +12,7 @@ Change-Id: Ifd2e98e7bb394c35a8a2f4ebde512046823da043 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/media/libmediaplayer2/JAudioTrack.cpp b/media/libmediaplayer2/JAudioTrack.cpp -index ac0cc5775e..961d7e526e 100644 +index ac0cc5775ec..961d7e526e4 100644 --- a/media/libmediaplayer2/JAudioTrack.cpp +++ b/media/libmediaplayer2/JAudioTrack.cpp @@ -615,26 +615,26 @@ jobject JAudioTrack::createVolumeShaperOperationObj( diff --git a/Patches/LineageOS-16.0/android_frameworks_base/401373-backport.patch b/Patches/LineageOS-16.0/android_frameworks_base/403538.patch similarity index 88% rename from Patches/LineageOS-16.0/android_frameworks_base/401373-backport.patch rename to Patches/LineageOS-16.0/android_frameworks_base/403538.patch index 765700b8..7b1acb6b 100644 --- a/Patches/LineageOS-16.0/android_frameworks_base/401373-backport.patch +++ b/Patches/LineageOS-16.0/android_frameworks_base/403538.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From f92b87e0fa6d86e076aa7138f6c0c0be16e5b901 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 af1c0e8e9178..d0fcc4240fd9 100644 +index af1c0e8e91788..d0fcc4240fd98 100644 --- a/core/java/android/net/Uri.java +++ b/core/java/android/net/Uri.java -@@ -1365,7 +1365,11 @@ public abstract class Uri implements Parcelable, Comparable { +@@ -1365,7 +1365,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 af1c0e8e9178..d0fcc4240fd9 100644 } diff --git a/core/tests/coretests/src/android/net/UriTest.java b/core/tests/coretests/src/android/net/UriTest.java -index ea0347d67ad7..6c9fdd5a83a7 100644 +index ea0347d67ad74..6c9fdd5a83a78 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 ea0347d67ad7..6c9fdd5a83a7 100644 import android.test.suitebuilder.annotation.SmallTest; import junit.framework.TestCase; -@@ -83,6 +84,16 @@ public class UriTest extends TestCase { +@@ -83,6 +84,16 @@ public void testBuildUponOpaqueStringUri() { assertNull(u.getHost()); } diff --git a/Patches/LineageOS-16.0/android_packages_apps_Settings/401375-backport.patch b/Patches/LineageOS-16.0/android_packages_apps_Settings/403539.patch similarity index 94% rename from Patches/LineageOS-16.0/android_packages_apps_Settings/401375-backport.patch rename to Patches/LineageOS-16.0/android_packages_apps_Settings/403539.patch index 7ad75dec..b2e1eb42 100644 --- a/Patches/LineageOS-16.0/android_packages_apps_Settings/401375-backport.patch +++ b/Patches/LineageOS-16.0/android_packages_apps_Settings/403539.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 6fcac8928498d5184ba7e4bdc56315025a085510 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-16.0/android_packages_apps_Settings/401376-backport.patch b/Patches/LineageOS-16.0/android_packages_apps_Settings/403540.patch similarity index 95% rename from Patches/LineageOS-16.0/android_packages_apps_Settings/401376-backport.patch rename to Patches/LineageOS-16.0/android_packages_apps_Settings/403540.patch index 278b2b6d..6cb25973 100644 --- a/Patches/LineageOS-16.0/android_packages_apps_Settings/401376-backport.patch +++ b/Patches/LineageOS-16.0/android_packages_apps_Settings/403540.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 814483f2eee226ee461cea6685325b6f0b04748f 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() @@ -51,7 +51,7 @@ index 78c47edf046..7c88785b337 100644 import com.android.internal.annotations.VisibleForTesting; import com.android.settings.overlay.FeatureFactory; import com.android.settings.search.indexing.IndexData; -@@ -32,24 +33,21 @@ import java.util.Locale; +@@ -32,24 +33,21 @@ */ public class SearchFeatureProviderImpl implements SearchFeatureProvider { @@ -87,7 +87,7 @@ diff --git a/src/com/android/settings/search/SearchResultTrampoline.java b/src/c index 3bbe6bd58a7..70387b021d4 100644 --- a/src/com/android/settings/search/SearchResultTrampoline.java +++ b/src/com/android/settings/search/SearchResultTrampoline.java -@@ -38,7 +38,7 @@ public class SearchResultTrampoline extends Activity { +@@ -38,7 +38,7 @@ protected void onCreate(Bundle savedInstanceState) { // First make sure caller has privilege to launch a search result page. FeatureFactory.getFactory(this) .getSearchFeatureProvider() @@ -100,7 +100,7 @@ diff --git a/tests/robotests/src/com/android/settings/search/SearchFeatureProvid index eeebdee96e3..7945c05a293 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 static org.mockito.Mockito.spy; import android.app.Activity; @@ -108,7 +108,7 @@ index eeebdee96e3..7945c05a293 100644 import android.content.Intent; import android.widget.Toolbar; -@@ -70,21 +69,23 @@ public class SearchFeatureProviderImplTest { +@@ -70,21 +69,23 @@ public void verifyLaunchSearchResultPageCaller_nullCaller_shouldCrash() { @Test(expected = SecurityException.class) public void verifyLaunchSearchResultPageCaller_badCaller_shouldCrash() { diff --git a/Patches/LineageOS-16.0/android_packages_apps_Settings/401377-backport.patch b/Patches/LineageOS-16.0/android_packages_apps_Settings/403541.patch similarity index 92% rename from Patches/LineageOS-16.0/android_packages_apps_Settings/401377-backport.patch rename to Patches/LineageOS-16.0/android_packages_apps_Settings/403541.patch index 78a8e860..1ba1dba1 100644 --- a/Patches/LineageOS-16.0/android_packages_apps_Settings/401377-backport.patch +++ b/Patches/LineageOS-16.0/android_packages_apps_Settings/403541.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From e689177d16d953c283522c777e470da1e873d15d 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 3914fac39b4..ce3d61d4dfa 100644 --- a/src/com/android/settings/accounts/AccountTypePreferenceLoader.java +++ b/src/com/android/settings/accounts/AccountTypePreferenceLoader.java -@@ -37,6 +37,11 @@ import android.support.v7.preference.PreferenceScreen; +@@ -37,6 +37,11 @@ import android.text.TextUtils; import android.util.Log; @@ -31,7 +31,7 @@ index 3914fac39b4..ce3d61d4dfa 100644 import com.android.settings.R; import com.android.settings.core.SubSettingLauncher; import com.android.settings.location.LocationSettings; -@@ -44,6 +49,8 @@ import com.android.settings.utils.LocalClassLoaderContextThemeWrapper; +@@ -44,6 +49,8 @@ import com.android.settingslib.accounts.AuthenticatorHelper; import com.android.settingslib.core.instrumentation.Instrumentable; @@ -40,7 +40,7 @@ index 3914fac39b4..ce3d61d4dfa 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. -@@ -82,6 +89,7 @@ public class AccountTypePreferenceLoader { +@@ -82,6 +89,7 @@ public PreferenceScreen addPreferencesForType(final String accountType, try { desc = mAuthenticatorHelper.getAccountTypeDescription(accountType); if (desc != null && desc.accountPreferencesId != 0) { @@ -48,7 +48,7 @@ index 3914fac39b4..ce3d61d4dfa 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 -@@ -97,6 +105,12 @@ public class AccountTypePreferenceLoader { +@@ -97,6 +105,12 @@ public PreferenceScreen addPreferencesForType(final String accountType, themedCtx.getTheme().setTo(baseTheme); prefs = mFragment.getPreferenceManager().inflateFromResource(themedCtx, desc.accountPreferencesId, parent); @@ -61,7 +61,7 @@ index 3914fac39b4..ce3d61d4dfa 100644 } } catch (PackageManager.NameNotFoundException e) { Log.w(TAG, "Couldn't load preferences.xml file from " + desc.packageName); -@@ -181,6 +195,48 @@ public class AccountTypePreferenceLoader { +@@ -181,6 +195,48 @@ public boolean onPreferenceClick(Preference preference) { } } diff --git a/Patches/LineageOS-16.0/android_packages_services_Telecomm/401380-backport.patch b/Patches/LineageOS-16.0/android_packages_services_Telecomm/403542.patch similarity index 93% rename from Patches/LineageOS-16.0/android_packages_services_Telecomm/401380-backport.patch rename to Patches/LineageOS-16.0/android_packages_services_Telecomm/403542.patch index 503c7917..d26ae1e7 100644 --- a/Patches/LineageOS-16.0/android_packages_services_Telecomm/401380-backport.patch +++ b/Patches/LineageOS-16.0/android_packages_services_Telecomm/403542.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 4923eb8efebb69b7870a032bbea8b4b0c36382ad 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 bc20d1caf..f4ec11187 100644 --- a/src/com/android/server/telecom/Call.java +++ b/src/com/android/server/telecom/Call.java -@@ -306,6 +306,17 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable, +@@ -306,6 +306,17 @@ public void onContactPhotoQueryComplete(Uri handle, CallerInfo callerInfo) { /** The state of the call. */ private int mState; @@ -46,7 +46,7 @@ index bc20d1caf..f4ec11187 100644 /** The handle with which to establish this call. */ private Uri mHandle; -@@ -797,6 +808,19 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable, +@@ -797,6 +808,19 @@ public ConnectionServiceFocusManager.ConnectionServiceFocus getConnectionService return mConnectionService; } @@ -66,7 +66,7 @@ index bc20d1caf..f4ec11187 100644 @VisibleForTesting public int getState() { return mState; -@@ -1638,6 +1662,7 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable, +@@ -1638,6 +1662,7 @@ public void handleCreateConnectionSuccess( CallIdMapper idMapper, ParcelableConnection connection) { Log.v(this, "handleCreateConnectionSuccessful %s", connection); @@ -78,7 +78,7 @@ diff --git a/src/com/android/server/telecom/ConnectionServiceWrapper.java b/src/ index 1b86842af..55ae0b6c8 100644 --- a/src/com/android/server/telecom/ConnectionServiceWrapper.java +++ b/src/com/android/server/telecom/ConnectionServiceWrapper.java -@@ -34,6 +34,7 @@ import android.telecom.ConnectionService; +@@ -34,6 +34,7 @@ import android.telecom.DisconnectCause; import android.telecom.GatewayInfo; import android.telecom.Log; @@ -86,7 +86,7 @@ index 1b86842af..55ae0b6c8 100644 import android.telecom.Logging.Session; import android.telecom.ParcelableConference; import android.telecom.ParcelableConnection; -@@ -57,6 +58,11 @@ import java.util.List; +@@ -57,6 +58,11 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; @@ -98,7 +98,7 @@ index 1b86842af..55ae0b6c8 100644 /** * Wrapper for {@link IConnectionService}s, handles binding to {@link IConnectionService} and keeps -@@ -68,6 +74,12 @@ import java.util.concurrent.ConcurrentHashMap; +@@ -68,6 +74,12 @@ public class ConnectionServiceWrapper extends ServiceBinder implements ConnectionServiceFocusManager.ConnectionServiceFocus { @@ -111,7 +111,7 @@ index 1b86842af..55ae0b6c8 100644 private final class Adapter extends IConnectionServiceAdapter.Stub { @Override -@@ -79,6 +91,12 @@ public class ConnectionServiceWrapper extends ServiceBinder implements +@@ -79,6 +91,12 @@ public void handleCreateConnectionComplete(String callId, ConnectionRequest requ try { synchronized (mLock) { logIncoming("handleCreateConnectionComplete %s", callId); @@ -124,7 +124,7 @@ index 1b86842af..55ae0b6c8 100644 // Check status hints image for cross user access if (connection.getStatusHints() != null) { Icon icon = connection.getStatusHints().getIcon(); -@@ -1027,7 +1045,8 @@ public class ConnectionServiceWrapper extends ServiceBinder implements +@@ -1027,7 +1045,8 @@ public void onConnectionServiceFocusReleased(Session.Info sessionInfo) * @param context The context. * @param userHandle The {@link UserHandle} to use when binding. */ @@ -134,7 +134,7 @@ index 1b86842af..55ae0b6c8 100644 ComponentName componentName, ConnectionServiceRepository connectionServiceRepository, PhoneAccountRegistrar phoneAccountRegistrar, -@@ -1129,6 +1148,26 @@ public class ConnectionServiceWrapper extends ServiceBinder implements +@@ -1129,6 +1148,26 @@ public void onSuccess() { .setRttPipeToInCall(call.getCsToInCallRttPipeForCs()) .build(); @@ -161,7 +161,7 @@ index 1b86842af..55ae0b6c8 100644 try { mServiceInterface.createConnection( call.getConnectionManagerPhoneAccount(), -@@ -1414,7 +1453,8 @@ public class ConnectionServiceWrapper extends ServiceBinder implements +@@ -1414,7 +1453,8 @@ void stopDtmfTone(Call call) { } } @@ -171,7 +171,7 @@ index 1b86842af..55ae0b6c8 100644 if (mCallIdMapper.getCallId(call) == null) { mCallIdMapper.addCall(call); } -@@ -1778,4 +1818,9 @@ public class ConnectionServiceWrapper extends ServiceBinder implements +@@ -1778,4 +1818,9 @@ private void setRemoteServices( private void noRemoteServices(RemoteServiceCallback callback) { setRemoteServices(callback, Collections.EMPTY_LIST, Collections.EMPTY_LIST); } @@ -185,7 +185,7 @@ diff --git a/src/com/android/server/telecom/LogUtils.java b/src/com/android/serv index 02a3b7785..66efb5c92 100644 --- a/src/com/android/server/telecom/LogUtils.java +++ b/src/com/android/server/telecom/LogUtils.java -@@ -86,6 +86,7 @@ public class LogUtils { +@@ -86,6 +86,7 @@ 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"; @@ -197,7 +197,7 @@ diff --git a/tests/src/com/android/server/telecom/tests/BasicCallTests.java b/te index 190604a75..810c01aa3 100644 --- a/tests/src/com/android/server/telecom/tests/BasicCallTests.java +++ b/tests/src/com/android/server/telecom/tests/BasicCallTests.java -@@ -927,6 +927,7 @@ public class BasicCallTests extends TelecomSystemTest { +@@ -927,6 +927,7 @@ public void testOutgoingCallSelectPhoneAccountVideo() throws Exception { call.setTargetPhoneAccount(mPhoneAccountA1.getAccountHandle()); assert(call.isVideoCallingSupported()); assertEquals(VideoProfile.STATE_BIDIRECTIONAL, call.getVideoState()); @@ -205,7 +205,7 @@ index 190604a75..810c01aa3 100644 } /** -@@ -950,6 +951,7 @@ public class BasicCallTests extends TelecomSystemTest { +@@ -950,6 +951,7 @@ public void testOutgoingCallSelectPhoneAccountNoVideo() throws Exception { call.setTargetPhoneAccount(mPhoneAccountA2.getAccountHandle()); assert(!call.isVideoCallingSupported()); assertEquals(VideoProfile.STATE_AUDIO_ONLY, call.getVideoState()); @@ -217,7 +217,7 @@ diff --git a/tests/src/com/android/server/telecom/tests/CallsManagerTest.java b/ index ed2f6b19b..abc300555 100644 --- a/tests/src/com/android/server/telecom/tests/CallsManagerTest.java +++ b/tests/src/com/android/server/telecom/tests/CallsManagerTest.java -@@ -31,6 +31,7 @@ import static org.mockito.Mockito.when; +@@ -31,6 +31,7 @@ import android.content.ComponentName; import android.net.Uri; @@ -225,7 +225,7 @@ index ed2f6b19b..abc300555 100644 import android.os.SystemClock; import android.telecom.Connection; import android.telecom.PhoneAccount; -@@ -44,11 +45,13 @@ import com.android.server.telecom.AsyncRingtonePlayer; +@@ -44,11 +45,13 @@ import com.android.server.telecom.Call; import com.android.server.telecom.CallAudioManager; import com.android.server.telecom.CallState; @@ -247,7 +247,7 @@ index ed2f6b19b..abc300555 100644 private CallsManager mCallsManager; -@@ -190,8 +194,22 @@ public class CallsManagerTest extends TelecomTestCase { +@@ -190,8 +194,22 @@ public void setUp() throws Exception { eq(SIM_1_HANDLE), any())).thenReturn(SIM_1_ACCOUNT); when(mPhoneAccountRegistrar.getPhoneAccount( eq(SIM_2_HANDLE), any())).thenReturn(SIM_2_ACCOUNT); @@ -270,7 +270,7 @@ index ed2f6b19b..abc300555 100644 @MediumTest @Test public void testConstructPossiblePhoneAccounts() throws Exception { -@@ -684,6 +702,33 @@ public class CallsManagerTest extends TelecomTestCase { +@@ -684,6 +702,33 @@ public void testSetActiveCallWhenOngoingCallCanBeHeld() { assertEquals(CallState.ACTIVE, newCall.getState()); } @@ -304,7 +304,7 @@ index ed2f6b19b..abc300555 100644 private Call addSpyCallWithConnectionService(ConnectionServiceWrapper connSvr) { Call call = addSpyCall(); doReturn(connSvr).when(call).getConnectionService(); -@@ -739,4 +784,19 @@ public class CallsManagerTest extends TelecomTestCase { +@@ -739,4 +784,19 @@ private void setupMsimAccounts() { when(mPhoneAccountRegistrar.getSimPhoneAccountsOfCurrentUser()).thenReturn( new ArrayList<>(Arrays.asList(SIM_1_HANDLE, SIM_2_HANDLE))); } @@ -328,7 +328,7 @@ diff --git a/tests/src/com/android/server/telecom/tests/ComponentContextFixture. index 01d312b98..86918a064 100644 --- a/tests/src/com/android/server/telecom/tests/ComponentContextFixture.java +++ b/tests/src/com/android/server/telecom/tests/ComponentContextFixture.java -@@ -499,6 +499,14 @@ public class ComponentContextFixture implements TestFixture { +@@ -499,6 +499,14 @@ public void addConnectionService( mServiceInfoByComponentName.put(componentName, serviceInfo); } @@ -343,7 +343,7 @@ index 01d312b98..86918a064 100644 public void addInCallService( ComponentName componentName, IInCallService service) -@@ -541,6 +549,12 @@ public class ComponentContextFixture implements TestFixture { +@@ -541,6 +549,12 @@ private void addService(String action, ComponentName name, IInterface service) { mComponentNameByService.put(service, name); } diff --git a/Scripts/LineageOS-16.0/Patch.sh b/Scripts/LineageOS-16.0/Patch.sh index 0add3342..bbffb4a6 100644 --- a/Scripts/LineageOS-16.0/Patch.sh +++ b/Scripts/LineageOS-16.0/Patch.sh @@ -204,7 +204,7 @@ applyPatch "$DOS_PATCHES/android_frameworks_av/379788.patch"; #P_asb_2024-01 Fix applyPatch "$DOS_PATCHES/android_frameworks_av/383562.patch"; #P_asb_2024-02 Update mtp packet buffer applyPatch "$DOS_PATCHES/android_frameworks_av/385670.patch"; #P_asb_2024-03 Validate OMX Params for VPx encoders applyPatch "$DOS_PATCHES/android_frameworks_av/385671.patch"; #P_asb_2024-03 Fix out of bounds read and write in onQueueFilled in outQueue -applyPatch "$DOS_PATCHES/android_frameworks_av/402601.patch"; #Q_asb_2024-08 Fix flag check in JAudioTrack.cpp +applyPatch "$DOS_PATCHES/android_frameworks_av/403537.patch"; #P_asb_2024-08 Fix flag check in JAudioTrack.cpp applyPatch "$DOS_PATCHES/android_frameworks_av/399771.patch"; #P_asb_2024-08 StagefrightRecoder: Disabling B-frame support applyPatch "$DOS_PATCHES/android_frameworks_av/0001-HM-No_RLIMIT_AS.patch"; #(GrapheneOS) fi; @@ -338,7 +338,7 @@ applyPatch "$DOS_PATCHES/android_frameworks_base/397594.patch"; #P_asb_2024-07 V applyPatch "$DOS_PATCHES/android_frameworks_base/397595.patch"; #P_asb_2024-07 Fix security vulnerability of non-dynamic permission removal applyPatch "$DOS_PATCHES/android_frameworks_base/399769.patch"; #P_asb_2024-08 Restrict USB poups while setup is in progress applyPatch "$DOS_PATCHES/android_frameworks_base/399770.patch"; #P_asb_2024-08 Hide SAW subwindows -applyPatch "$DOS_PATCHES/android_frameworks_base/401373-backport.patch"; #S_asb_2024-09 Sanitized uri scheme by removing scheme delimiter +applyPatch "$DOS_PATCHES/android_frameworks_base/403538.patch"; #P_asb_2024-09 Sanitized uri scheme by removing scheme delimiter 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) applyPatch "$DOS_PATCHES/android_frameworks_base/0009-SystemUI_No_Permission_Review.patch"; #Allow SystemUI to directly manage Bluetooth/WiFi (GrapheneOS) @@ -541,9 +541,9 @@ applyPatch "$DOS_PATCHES/android_packages_apps_Settings/351915.patch"; #P_asb_20 applyPatch "$DOS_PATCHES/android_packages_apps_Settings/359734.patch"; #P_asb_2023-06 Convert argument to intent in AddAccountSettings. applyPatch "$DOS_PATCHES/android_packages_apps_Settings/366136.patch"; #P_asb_2023-09 Prevent non-system IME from becoming device admin applyPatch "$DOS_PATCHES/android_packages_apps_Settings/370700.patch"; #P_asb_2023-10 Restrict ApnEditor settings -applyPatch "$DOS_PATCHES/android_packages_apps_Settings/401375-backport.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-backport.patch"; #S_asb_2024-09 Ignore fragment attr from ext authenticator resource +applyPatch "$DOS_PATCHES/android_packages_apps_Settings/403539.patch"; #P_asb_2024-09 Limit wifi item edit content's max length to 500 +applyPatch "$DOS_PATCHES/android_packages_apps_Settings/403540.patch"; #P_asb_2024-09 Replace getCallingActivity() with getLaunchedFromPackage() +applyPatch "$DOS_PATCHES/android_packages_apps_Settings/403541.patch"; #P_asb_2024-09 Ignore fragment attr from ext authenticator resource git revert --no-edit c240992b4c86c7f226290807a2f41f2619e7e5e8; #Don't hide OEM unlock 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/0004-Private_DNS.patch"; #More 'Private DNS' options (heavily based off of a CalyxOS patch) #TODO: Needs work @@ -615,7 +615,7 @@ applyPatch "$DOS_PATCHES/android_packages_services_Telecomm/347042.patch"; #P_as applyPatch "$DOS_PATCHES/android_packages_services_Telecomm/356150.patch"; #P_asb_2023-05 enforce stricter rules when registering phoneAccounts applyPatch "$DOS_PATCHES/android_packages_services_Telecomm/364617.patch"; #P_asb_2023-08 Resolve StatusHints image exploit across user. applyPatch "$DOS_PATCHES/android_packages_services_Telecomm/377776.patch"; #P_asb_2023-12 Resolve account image icon profile boundary exploit. -applyPatch "$DOS_PATCHES/android_packages_services_Telecomm/401380-backport.patch"; #S_asb_2024-09 Unbind CS if connection is not created within 15 seconds. #XXX +applyPatch "$DOS_PATCHES/android_packages_services_Telecomm/403542.patch"; #P_asb_2024-09 Unbind CS if connection is not created within 15 seconds. #XXX fi; if enterAndClear "packages/services/Telephony"; then