Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4760885 authored by Brad Ebinger's avatar Brad Ebinger Committed by Android (Google) Code Review
Browse files

Merge "Cleanup flag for end_session_improvements" into main

parents 1f7d8edb 193f52ad

flags/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ aconfig_declarations { 
        "telecom_bluetoothdevicemanager_flags.aconfig",

        "telecom_non_critical_security_flags.aconfig",

        "telecom_headless_system_user_mode.aconfig",

        "telecom_session_flags.aconfig",

        "telecom_metrics_flags.aconfig",

        "telecom_voip_flags.aconfig",

    ],

flags/telecom_session_flags.aconfig

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
package: "com.android.server.telecom.flags"

container: "system"



# OWNER=breadley TARGET=25Q1

flag {

  name: "end_session_improvements"

  namespace: "telecom"

  description: "Ensure that ending a session doesnt cause a stack overflow"

  bug: "370349160"

  metadata {

    purpose: PURPOSE_BUGFIX

  }

}
 
 No newline at end of file

tests/src/com/android/server/telecom/tests/SessionManagerTest.java

+1 −5
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ import android.telecom.Log; 
import android.telecom.Logging.Session;

import android.telecom.Logging.SessionManager;



import com.android.server.telecom.flags.Flags;



import androidx.test.filters.SmallTest;



import org.junit.After;
@@ -421,8 +419,6 @@ public class SessionManagerTest extends TelecomTestCase { 
    @SmallTest 

    @Test

    public void testManySubsessionCleanupStress() {

        // This test will mostly likely fail with recursion due to stack overflow

        if (!Flags.endSessionImprovements()) return;

        Log.setIsExtendedLoggingEnabled(false);

        mTestSessionManager.mCurrentThreadId = () -> TEST_PARENT_THREAD_ID;

        mTestSessionManager.startSession(TEST_PARENT_NAME, null);