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

Commit 4837fcd1 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11578433 from e251a909 to 24Q3-release 

Change-Id: I2b827302ea75834894a22fda0c95f12ec6a3bba9
parents 7230fbba e251a909

flags/telecom_remote_connection_service.aconfig

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

container: "system"



flag {

  name: "set_remote_connection_call_id"

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

+3 −1
Original line number Diff line number Diff line
@@ -2428,7 +2428,9 @@ public class InCallController extends CallsManagerListenerBase implements 
        }



        String bluetoothPackage = mDefaultDialerCache.getBTInCallServicePackage();

        if (serviceInfo.packageName != null && serviceInfo.packageName.equals(bluetoothPackage)

        if (mFeatureFlags.separatelyBindToBtIncallService()

                && serviceInfo.packageName != null

                && serviceInfo.packageName.equals(bluetoothPackage)

                && (hasControlInCallPermission || hasAppOpsPermittedManageOngoingCalls)) {

            return IN_CALL_SERVICE_TYPE_BLUETOOTH;

        }

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

+15 −1
Original line number Diff line number Diff line
@@ -95,8 +95,10 @@ import com.android.server.telecom.voip.VoipCallTransactionResult; 
import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.lang.reflect.Method;

import java.util.Arrays;

import java.util.HashSet;

import java.util.List;

import java.util.Locale;

import java.util.Objects;

import java.util.Set;

import java.util.UUID;
@@ -2114,12 +2116,24 @@ public class TelecomServiceImpl { 
                // Look away, a forbidden technique (reflection) is being used to allow us to get

                // all flag configs without having to add them manually to this method.

                Method[] methods = FeatureFlags.class.getMethods();

                int maxLength = Arrays.stream(methods)

                        .map(Method::getName)

                        .map(String::length)

                        .max(Integer::compare)

                        .get();

                String format = "\t%s: %-" + maxLength + "s %s";



                if (methods.length == 0) {

                    pw.println("NONE");

                    return;

                }



                for (Method m : methods) {

                    pw.println(m.getName() + "-> " + m.invoke(mFeatureFlags));

                    String flagEnabled = (Boolean) m.invoke(mFeatureFlags) ? "[✅]": "[❌]";

                    String methodName = m.getName();

                    String camelCaseName = methodName.replaceAll("([a-z])([A-Z]+)", "$1_$2")

                            .toLowerCase(Locale.US);

                    pw.println(String.format(format, flagEnabled, methodName, camelCaseName));

                }

            } catch (Exception e) {

                pw.println("[ERROR]");