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

Commit bfedacc7 authored by Tyler Gunn's avatar Tyler Gunn Committed by Android (Google) Code Review
Browse files

Merge "Remove flag telecom_log_external_wearable_calls." into main

parents 1ecd00f1 3c4dae83

flags/Android.bp

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

        "telecom_anomaly_report_flags.aconfig",

        "telecom_callaudiomodestatemachine_flags.aconfig",

        "telecom_calllog_flags.aconfig",

        "telecom_resolve_hidden_dependencies.aconfig",

        "telecom_bluetoothroutemanager_flags.aconfig",

        "telecom_work_profile_flags.aconfig",

flags/telecom_calllog_flags.aconfig

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

container: "system"



# OWNER=qingzhong TARGET=24Q2

flag {

  name: "telecom_log_external_wearable_calls"

  namespace: "telecom"

  description: "log external call if current device is a wearable one"

  bug: "292600751"

}

src/com/android/server/telecom/CallLogManager.java

+2 −3
Original line number Diff line number Diff line
@@ -235,9 +235,8 @@ public final class CallLogManager extends CallsManagerListenerBase { 
                    == Connection.CAPABILITY_DISCONNECT_FROM_CONFERENCE;

        }

        // An external and non-watch call

        if (call.isExternalCall() && (!mContext.getPackageManager().hasSystemFeature(

                PackageManager.FEATURE_WATCH)

                || !mFeatureFlags.telecomLogExternalWearableCalls())) {

        if (call.isExternalCall() && !mContext.getPackageManager().hasSystemFeature(

                PackageManager.FEATURE_WATCH)) {

            return false;

        }

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

+0 −2
Original line number Diff line number Diff line
@@ -221,7 +221,6 @@ public class CallLogManagerTest extends TelecomTestCase { 


        PackageManager packageManager = mContext.getPackageManager();

        when(packageManager.hasSystemFeature(PackageManager.FEATURE_WATCH)).thenReturn(false);

        when(mFeatureFlags.telecomLogExternalWearableCalls()).thenReturn(false);

        when(mFeatureFlags.telecomResolveHiddenDependencies()).thenReturn(true);

    }
@@ -961,7 +960,6 @@ public class CallLogManagerTest extends TelecomTestCase { 
                .thenReturn(makeFakePhoneAccount(mDefaultAccountHandle, 0 /* capabilities */));

        PackageManager packageManager = mContext.getPackageManager();

        when(packageManager.hasSystemFeature(PackageManager.FEATURE_WATCH)).thenReturn(true);

        when(mFeatureFlags.telecomLogExternalWearableCalls()).thenReturn(true);

        Call fakeMissedCall = makeFakeCall(

                DisconnectCause.REJECTED, // disconnectCauseCode

                false, // isConference