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

Commit 5dfe5617 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5333170 from 05ad6df9 to qt-release 

Change-Id: I8aa3df1998b1e076e21468240d3a01179f9a90ca
parents 0439389d 05ad6df9

packages/CarSystemUI/res/layout/car_navigation_bar.xml

+2 −2
Original line number Diff line number Diff line
@@ -81,9 +81,9 @@ 
        <com.android.systemui.statusbar.car.CarFacetButton

            android:id="@+id/phone_nav"

            style="@style/NavigationBarButton"

            systemui:componentNames="com.android.car.dialer/.TelecomActivity"

            systemui:icon="@drawable/car_ic_phone"

            systemui:intent="intent:#Intent;component=com.android.car.dialer/.TelecomActivity;launchFlags=0x14000000;end"

            systemui:intent="intent:#Intent;action=android.intent.action.MAIN;category=android.intent.category.LAUNCHER;package=com.android.car.dialer;launchFlags=0x10000000;end"

            systemui:packages="com.android.car.dialer"

            systemui:selectedIcon="@drawable/car_ic_phone_selected"

            systemui:useMoreIcon="false"

        />

services/core/java/com/android/server/pm/PackageInstallerSession.java

+2 −2
Original line number Diff line number Diff line
@@ -1897,7 +1897,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
    }



    @Override

    public void addChildSessionId(int childSessionId) {

    public void addChildSessionId(int childSessionId) throws RemoteException {

        final PackageInstallerSession childSession = mSessionProvider.getSession(childSessionId);

        if (childSession == null) {

            throw new RemoteException("Unable to add child.",
@@ -1912,7 +1912,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
                    new PackageManagerException("Child session " + childSessionId

                            + " and parent session " + this.sessionId + " do not have consistent"

                            + " staging session settings."),

                    false, true).rethrowAsRuntimeException();

                    false, true);

        }

        synchronized (mLock) {

            assertCallerIsOwnerOrRootLocked();

services/core/java/com/android/server/pm/StagingManager.java

+6 −1
Original line number Diff line number Diff line
@@ -419,7 +419,12 @@ public class StagingManager { 
                if (apkChildSession == null) {

                    return false;

                }

                try {

                    apkParentSession.addChildSessionId(apkChildSession.sessionId);

                } catch (RemoteException e) {

                    Slog.e(TAG, "Failed to add a child session for installing the APK files", e);

                    return false;

                }

            }

            return commitApkSession(apkParentSession, session.sessionId);

        }