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

Commit 9f7e3127 authored by Xin Li's avatar Xin Li
Browse files

Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) 

Bug: 166295507
Merged-In: Ic57a78cfbb8ce71719e35bbe8c6b2b142c7eddde
Change-Id: Icf262d4d27c7b958ba66464a824a6c36c661f53d
parents 208870e3 069713fd

Android.bp

+12 −2
Original line number Diff line number Diff line
@@ -23,6 +23,16 @@ java_library { 
    aidl: {

        local_include_dirs: ["src/java"],

    },

    srcs: ["src/java/**/*.java"],

    libs: ["unsupportedappusage"],

    srcs: [

        "src/java/**/*.java",

        ":framework-ims-common-shared-srcs",

    ],



    libs: [

        "unsupportedappusage",

        // TODO b/151667108 add "framework-telephony",

        // TODO link to framework-minus-apex stub and framework-wifi-stubs

    ],



    jarjar_rules: "jarjar-rules-shared.txt",

}

jarjar-rules-shared.txt

0 → 100644
+4 −0
Original line number Diff line number Diff line 
rule android.os.RegistrantList* com.android.ims.RegistrantList@1

rule android.os.Registrant* com.android.ims.Registrant@1

rule com.android.internal.os.SomeArgs* com.android.ims.SomeArgs@1

rule com.android.internal.util.Preconditions* com.android.ims.Preconditions@1

src/java/com/android/ims/ImsCall.java

+4 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.os.Bundle; 
import android.os.Message;

import android.os.Parcel;

import android.telecom.Call;

import com.android.ims.internal.ConferenceParticipant;

import android.telecom.Connection;

import android.telephony.CallQuality;

import android.telephony.ServiceState;
@@ -36,7 +37,6 @@ import android.telephony.ims.ImsSuppServiceNotification; 
import android.text.TextUtils;

import android.util.Log;



import com.android.ims.internal.ConferenceParticipant;

import com.android.ims.internal.ICall;

import com.android.ims.internal.ImsStreamMediaSession;

import com.android.internal.annotations.VisibleForTesting;
@@ -48,6 +48,7 @@ import java.util.Iterator; 
import java.util.List;

import java.util.Map;

import java.util.Map.Entry;

import java.util.Objects;

import java.util.Set;

import java.util.concurrent.atomic.AtomicInteger;
@@ -3671,7 +3672,8 @@ public class ImsCall implements ICall { 
     * @param profile The current {@link ImsCallProfile} for the call.

     */

    private void trackVideoStateHistory(ImsCallProfile profile) {

        mWasVideoCall = mWasVideoCall || profile.isVideoCall();

        mWasVideoCall = mWasVideoCall

                || profile != null ? profile.isVideoCall() : false;

    }



    /**

src/java/com/android/ims/ImsManager.java

+6 −2
Original line number Diff line number Diff line
@@ -28,13 +28,13 @@ import android.os.Message; 
import android.os.Parcel;

import android.os.PersistableBundle;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.SystemProperties;

import android.provider.Settings;

import android.telecom.TelecomManager;

import android.telephony.AccessNetworkConstants;

import android.telephony.CarrierConfigManager;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyFrameworkInitializer;

import android.telephony.TelephonyManager;

import android.telephony.ims.ImsCallProfile;

import android.telephony.ims.ImsCallSession;
@@ -1550,7 +1550,10 @@ public class ImsManager implements IFeatureConnector { 
        boolean isProvisioned = true;

        if (requiresProvisioning) {

            ITelephony telephony = ITelephony.Stub.asInterface(

                    ServiceManager.getService(Context.TELEPHONY_SERVICE));

                    TelephonyFrameworkInitializer

                            .getTelephonyServiceManager()

                            .getTelephonyServiceRegisterer()

                            .get());

            // Only track UT over LTE, since we do not differentiate between UT over LTE and IWLAN

            // currently.

            try {
@@ -2074,6 +2077,7 @@ public class ImsManager implements IFeatureConnector { 


            return call;

        } catch (Throwable t) {

            loge("takeCall caught: ", t);

            throw new ImsException("takeCall()", t, ImsReasonInfo.CODE_UNSPECIFIED);

        }

    }

tests/Android.bp

+1 −2
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ android_test { 
    ],



    test_suites: [

        "mts",

        "device-tests"

    ],

    ]

}