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

Commit 1d03ab69 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11386701 from ac635e24 to 24Q2-release 

Change-Id: I0272ec88b32b444044013e86a9cac2dde12159bb
parents 2fdc6600 ac635e24

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

+2 −2
Original line number Diff line number Diff line
@@ -886,11 +886,11 @@ public class CallsManager extends Call.ListenerBase 
    }



    private IncomingCallFilterGraph setUpCallFilterGraph(Call incomingCall) {

        TelecomManager telecomManager = mContext.getSystemService(TelecomManager.class);

        incomingCall.setIsUsingCallFiltering(true);

        String carrierPackageName = getCarrierPackageName();

        UserHandle userHandle = incomingCall.getAssociatedUser();

        String defaultDialerPackageName = TelecomManager.from(mContext).

                getDefaultDialerPackage(userHandle);

        String defaultDialerPackageName = telecomManager.getDefaultDialerPackage(userHandle);

        String userChosenPackageName = getRoleManagerAdapter().

                getDefaultCallScreeningApp(userHandle);

        AppLabelProxy appLabelProxy = packageName -> AppLabelProxy.Util.getAppLabel(

src/com/android/server/telecom/components/AppUninstallBroadcastReceiver.java

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ public class AppUninstallBroadcastReceiver extends BroadcastReceiver { 
     * @param packageName The name of the removed package.

     */

    private void handlePackageRemoved(Context context, String packageName) {

        final TelecomManager telecomManager = TelecomManager.from(context);

        final TelecomManager telecomManager = context.getSystemService(TelecomManager.class);

        if (telecomManager != null) {

            telecomManager.clearAccountsForPackage(packageName);

        }

src/com/android/server/telecom/settings/EnableAccountPreferenceFragment.java

+2 −1
Original line number Diff line number Diff line
@@ -72,7 +72,8 @@ public class EnableAccountPreferenceFragment extends PreferenceFragment { 
    @Override

    public void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        mTelecomManager = TelecomManager.from(getActivity());

        Context context = getActivity();

        mTelecomManager = context.getSystemService(TelecomManager.class);

    }

testapps/src/com/android/server/telecom/testapps/CallNotificationReceiver.java

+6 −3
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ public class CallNotificationReceiver extends BroadcastReceiver { 
     * @param videoState The video state requested for the incoming call.

     */

    public static void sendIncomingCallIntent(Context context, Uri handle, int videoState) {

        TelecomManager telecomManager = context.getSystemService(TelecomManager.class);

        PhoneAccountHandle phoneAccount = new PhoneAccountHandle(

                new ComponentName(context, TestConnectionService.class),

                CallServiceNotifier.SIM_SUBSCRIPTION_ID);
@@ -94,10 +95,11 @@ public class CallNotificationReceiver extends BroadcastReceiver { 
            extras.putParcelable(TestConnectionService.EXTRA_HANDLE, handle);

        }



        TelecomManager.from(context).addNewIncomingCall(phoneAccount, extras);

        telecomManager.addNewIncomingCall(phoneAccount, extras);

    }



    public static void sendIncomingRttCallIntent(Context context, Uri handle, int videoState) {

        TelecomManager telecomManager = context.getSystemService(TelecomManager.class);

        PhoneAccountHandle phoneAccount = new PhoneAccountHandle(

                new ComponentName(context, TestConnectionService.class),

                CallServiceNotifier.SIM_SUBSCRIPTION_ID);
@@ -111,11 +113,12 @@ public class CallNotificationReceiver extends BroadcastReceiver { 
        }

        extras.putBoolean(TelecomManager.EXTRA_START_CALL_WITH_RTT, true);



        TelecomManager.from(context).addNewIncomingCall(phoneAccount, extras);

        telecomManager.addNewIncomingCall(phoneAccount, extras);

    }



    public static void addNewUnknownCall(Context context, Uri handle, Bundle extras) {

        Log.i(TAG, "Adding new unknown call with handle " + handle);

        TelecomManager telecomManager = context.getSystemService(TelecomManager.class);

        PhoneAccountHandle phoneAccount = new PhoneAccountHandle(

                new ComponentName(context, TestConnectionService.class),

                CallServiceNotifier.SIM_SUBSCRIPTION_ID);
@@ -129,7 +132,7 @@ public class CallNotificationReceiver extends BroadcastReceiver { 
            extras.putParcelable(TestConnectionService.EXTRA_HANDLE, handle);

        }



        TelecomManager.from(context).addNewUnknownCall(phoneAccount, extras);

        telecomManager.addNewUnknownCall(phoneAccount, extras);

    }



    public static void hangupCalls(Context context) {

testapps/src/com/android/server/telecom/testapps/HandoverActivity.java

+2 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.server.telecom.testapps;



import android.app.Activity;

import android.content.Context;

import android.content.Intent;

import android.os.Bundle;

import android.telecom.Log;
@@ -61,7 +62,7 @@ public class HandoverActivity extends Activity { 
            if (connection != null) {

                connection.setConnectionDisconnected(DisconnectCause.INCOMING_REJECTED);

                connection.destroy();

                TelecomManager tm = TelecomManager.from(this);

                TelecomManager tm = this.getSystemService(TelecomManager.class);

                tm.showInCallScreen(false);

            }

            finish();