Compilation fix for AOSP update

Fixed systemui and device crash on bootup in msim mode

Conflicts:
services/core/java/com/android/server/ConnectivityService.java
Change-Id: Idf836ec01e18f8e64c972e3a54b279618e4d6ed6
diff --git a/packages/SystemUI/res/layout/msim_status_bar.xml b/packages/SystemUI/res/layout/msim_status_bar.xml
index 6022ec6..744a50d 100644
--- a/packages/SystemUI/res/layout/msim_status_bar.xml
+++ b/packages/SystemUI/res/layout/msim_status_bar.xml
@@ -59,7 +59,7 @@
             >
             <!-- The alpha of this area is both controlled from PhoneStatusBarTransitions and
                  PhoneStatusBar (DISABLE_NOTIFICATION_ICONS), so we need two views here. -->
-            <com.android.systemui.statusbar.AlphaOptimizedLinearLayout
+            <com.android.keyguard.AlphaOptimizedLinearLayout
                 android:id="@+id/notification_icon_area_inner"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -76,10 +76,10 @@
                     android:layout_alignParentStart="true"
                     android:gravity="center_vertical"
                     android:orientation="horizontal"/>
-            </com.android.systemui.statusbar.AlphaOptimizedLinearLayout>
+            </com.android.keyguard.AlphaOptimizedLinearLayout>
         </com.android.systemui.statusbar.AlphaOptimizedFrameLayout>
 
-        <com.android.systemui.statusbar.AlphaOptimizedLinearLayout android:id="@+id/system_icon_area"
+        <com.android.keyguard.AlphaOptimizedLinearLayout android:id="@+id/system_icon_area"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:orientation="horizontal"
@@ -96,7 +96,7 @@
                 android:paddingStart="6dip"
                 android:gravity="center_vertical|start"
                 />
-        </com.android.systemui.statusbar.AlphaOptimizedLinearLayout>
+        </com.android.keyguard.AlphaOptimizedLinearLayout>
     </LinearLayout>
 
     <ViewStub
diff --git a/packages/SystemUI/res/layout/msim_super_status_bar.xml b/packages/SystemUI/res/layout/msim_super_status_bar.xml
index c3ec2f3..405ac58 100644
--- a/packages/SystemUI/res/layout/msim_super_status_bar.xml
+++ b/packages/SystemUI/res/layout/msim_super_status_bar.xml
@@ -44,7 +44,7 @@
         </FrameLayout>
     </FrameLayout>
 
-    <com.android.systemui.statusbar.AlphaOptimizedFrameLayout
+    <com.android.systemui.statusbar.BackDropView
             android:id="@+id/backdrop"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -59,9 +59,9 @@
                    android:layout_height="match_parent"
                    android:scaleType="centerCrop"
                    android:visibility="invisible" />
-    </com.android.systemui.statusbar.AlphaOptimizedFrameLayout>
+    </com.android.systemui.statusbar.BackDropView>
 
-    <View android:id="@+id/scrim_behind"
+    <com.android.systemui.statusbar.ScrimView android:id="@+id/scrim_behind"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
@@ -80,7 +80,7 @@
             android:visibility="gone" />
     </com.android.systemui.statusbar.phone.PanelHolder>
 
-    <View android:id="@+id/scrim_in_front"
+    <com.android.systemui.statusbar.ScrimView android:id="@+id/scrim_in_front"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
diff --git a/packages/SystemUI/res/layout/msim_system_icons.xml b/packages/SystemUI/res/layout/msim_system_icons.xml
index 8834a24..735cb2e 100644
--- a/packages/SystemUI/res/layout/msim_system_icons.xml
+++ b/packages/SystemUI/res/layout/msim_system_icons.xml
@@ -20,7 +20,7 @@
     android:layout_height="match_parent"
     android:gravity="center_vertical">
 
-    <com.android.systemui.statusbar.AlphaOptimizedLinearLayout android:id="@+id/statusIcons"
+    <com.android.keyguard.AlphaOptimizedLinearLayout android:id="@+id/statusIcons"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:gravity="center_vertical"
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 1ca49cc..8e35067 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -2174,7 +2174,7 @@
                 bestNetwork.addRequest(nri.request);
                 mNetworkForRequestId.put(nri.request.requestId, bestNetwork);
                 notifyNetworkCallback(bestNetwork, nri);
-                score = bestNetwork.currentScore;
+                score = bestNetwork.getCurrentScore();
                 if (nri.isRequest && nri.request.legacyType != TYPE_NONE) {
                     //To support legacy calls for network request
                     mLegacyTypeTracker.add(nri.request.legacyType, bestNetwork);
diff --git a/telecomm/java/android/telecom/Call.java b/telecomm/java/android/telecom/Call.java
index 86c648b..ecd7396 100644
--- a/telecomm/java/android/telecom/Call.java
+++ b/telecomm/java/android/telecom/Call.java
@@ -427,7 +427,7 @@
      */
     /** @hide */
     public void deflectCall(String number) {
-        mInCallAdapter.deflectCall(mTelecommCallId, number);
+        mInCallAdapter.deflectCall(mTelecomCallId, number);
     }
 
     /**
diff --git a/telecomm/java/android/telecom/RemoteConnection.java b/telecomm/java/android/telecom/RemoteConnection.java
index 4364fa1..9560e8a 100644
--- a/telecomm/java/android/telecom/RemoteConnection.java
+++ b/telecomm/java/android/telecom/RemoteConnection.java
@@ -774,8 +774,8 @@
     /** @hide */
    public void setDisconnectedWithSsNotification(int disconnectCause,
                 String disconnectMessage, int type, int code) {
-        for (Listener l : mListeners) {
-            l.setDisconnectedWithSsNotification(this, disconnectCause,
+        for (Callback c : mCallbacks) {
+            c.setDisconnectedWithSsNotification(this, disconnectCause,
                     disconnectMessage, type, code);
         }
     }
@@ -906,8 +906,8 @@
 
     /** @hide */
     void setPhoneAccountHandle(PhoneAccountHandle pHandle) {
-        for (Listener l : mListeners) {
-            l.setPhoneAccountHandle(this, pHandle);
+        for (Callback c : mCallbacks) {
+            c.setPhoneAccountHandle(this, pHandle);
         }
     }
 
diff --git a/telecomm/java/android/telecom/TelecomManager.java b/telecomm/java/android/telecom/TelecomManager.java
index 4382f1c..c944caf 100644
--- a/telecomm/java/android/telecom/TelecomManager.java
+++ b/telecomm/java/android/telecom/TelecomManager.java
@@ -809,7 +809,7 @@
     public long getActiveSubscription() {
         try {
             if (isServiceConnected()) {
-                return getTelecommService().getActiveSubscription();
+                return getTelecomService().getActiveSubscription();
             }
         } catch (RemoteException e) {
             Log.e(TAG, "RemoteException attempting to get the active subsription.", e);
@@ -824,7 +824,7 @@
     public void switchToOtherActiveSub(long subId) {
         try {
             if (isServiceConnected()) {
-                getTelecommService().switchToOtherActiveSub(subId);
+                getTelecomService().switchToOtherActiveSub(subId);
             }
         } catch (RemoteException e) {
             Log.e(TAG, "RemoteException attempting to switchToOtherActiveSub.", e);