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

Bug: 166295507
Merged-In: Ic57a78cfbb8ce71719e35bbe8c6b2b142c7eddde
Change-Id: Icf262d4d27c7b958ba66464a824a6c36c661f53d

5 files changed, 27 insertions, 8 deletions

diff --git a/Android.bp b/Android.bp
index 0accb487..860c7403 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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",
 }
diff --git a/jarjar-rules-shared.txt b/jarjar-rules-shared.txt
new file mode 100644
index 00000000..aa761180
--- /dev/null
+++ b/jarjar-rules-shared.txt
@@ -0,0 +1,4 @@
+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
diff --git a/src/java/com/android/ims/ImsCall.java b/src/java/com/android/ims/ImsCall.java
index 155fbc94..c0cb2863 100755
--- a/src/java/com/android/ims/ImsCall.java
+++ b/src/java/com/android/ims/ImsCall.java
@@ -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;
     }
 
     /**
diff --git a/src/java/com/android/ims/ImsManager.java b/src/java/com/android/ims/ImsManager.java
index 215bd54f..cd52fc65 100644
--- a/src/java/com/android/ims/ImsManager.java
+++ b/src/java/com/android/ims/ImsManager.java
@@ -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);
         }
     }
diff --git a/tests/Android.bp b/tests/Android.bp
index 269dd12f..d3373c59 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -36,7 +36,6 @@ android_test {
     ],
 
     test_suites: [
-        "mts",
         "device-tests"
-    ],
+    ]
 }