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

Commit 653f5842 authored by Natiq Ahmed's avatar Natiq Ahmed Committed by Linux Build Service Account
Browse files

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
parent 43f55e59

packages/SystemUI/res/layout/msim_status_bar.xml

+4 −4
Original line number Diff line number Diff line
@@ -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

packages/SystemUI/res/layout/msim_super_status_bar.xml

+4 −4
Original line number Diff line number Diff line
@@ -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" />

packages/SystemUI/res/layout/msim_system_icons.xml

+1 −1
Original line number Diff line number Diff line
@@ -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"

services/core/java/com/android/server/ConnectivityService.java

+1 −1
Original line number Diff line number Diff line
@@ -2174,7 +2174,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
                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);

telecomm/java/android/telecom/Call.java

+1 −1
Original line number Diff line number Diff line
@@ -427,7 +427,7 @@ public final class Call { 
     */

    /** @hide */

    public void deflectCall(String number) {

        mInCallAdapter.deflectCall(mTelecommCallId, number);

        mInCallAdapter.deflectCall(mTelecomCallId, number);

    }



    /**