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

Commit 59e3d29a authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6659731 from 62b824a3 to rvc-qpr1-release 

Change-Id: I8128e91cee11b72dde355b310adff6c136fd5d27
parents 27c4329d 62b824a3

location/java/android/location/LocationManager.java

+3 −2
Original line number Diff line number Diff line
@@ -1951,7 +1951,8 @@ public class LocationManager { 
        }



        try {

            return mGnssStatusListenerManager.addListener(listener, Runnable::run);

            return mGnssStatusListenerManager.addListener(listener,

                    new HandlerExecutor(new Handler()));

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }
@@ -2086,7 +2087,7 @@ public class LocationManager { 
    @Deprecated

    @RequiresPermission(ACCESS_FINE_LOCATION)

    public boolean addNmeaListener(@NonNull OnNmeaMessageListener listener) {

        return addNmeaListener(Runnable::run, listener);

        return addNmeaListener(listener, null);

    }



    /**

packages/CarSystemUI/res/layout/headsup_container_bottom.xml

+3 −4
Original line number Diff line number Diff line
@@ -29,13 +29,12 @@ 
        android:orientation="horizontal"

        app:layout_constraintGuide_begin="@dimen/headsup_scrim_height"/>



    <!-- Include a FocusParkingView at the beginning or end. The rotary controller "parks" the

         focus here when the user navigates to another window. This is also used to prevent

         wrap-around which is why it must be first or last in Tab order. -->

    <!-- Include a FocusParkingView at the beginning. The rotary controller "parks" the focus here

         when the user navigates to another window. This is also used to prevent wrap-around. -->

    <com.android.car.ui.FocusParkingView

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        app:layout_constraintLeft_toLeftOf="parent"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintTop_toTopOf="parent"/>



    <View

packages/CarSystemUI/src/com/android/systemui/car/navigationbar/NavigationBarViewFactory.java

+3 −4
Original line number Diff line number Diff line
@@ -148,10 +148,9 @@ public class NavigationBarViewFactory { 
        CarNavigationBarView view = (CarNavigationBarView) View.inflate(mContext, barLayout,

                /* root= */ null);



        // Include a FocusParkingView at the end. The rotary controller "parks" the focus here when

        // the user navigates to another window. This is also used to prevent wrap-around which is

        // why it must be first or last in Tab order.

        view.addView(new FocusParkingView(mContext));

        // Include a FocusParkingView at the beginning. The rotary controller "parks" the focus here

        // when the user navigates to another window. This is also used to prevent wrap-around.

        view.addView(new FocusParkingView(mContext), 0);



        mCachedViewMap.put(type, view);

        return mCachedViewMap.get(type);

packages/CarSystemUI/src/com/android/systemui/car/statusbar/DummyNotificationShadeWindowController.java

+4 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.view.WindowManager; 
import com.android.systemui.car.window.SystemUIOverlayWindowController;

import com.android.systemui.colorextraction.SysuiColorExtractor;

import com.android.systemui.dump.DumpManager;

import com.android.systemui.keyguard.KeyguardViewMediator;

import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.statusbar.phone.BiometricUnlockController;

import com.android.systemui.statusbar.phone.DozeParameters;
@@ -49,12 +50,14 @@ public class DummyNotificationShadeWindowController extends NotificationShadeWin 
            DozeParameters dozeParameters,

            StatusBarStateController statusBarStateController,

            ConfigurationController configurationController,

            KeyguardViewMediator keyguardViewMediator,

            KeyguardBypassController keyguardBypassController,

            SysuiColorExtractor colorExtractor,

            DumpManager dumpManager,

            SystemUIOverlayWindowController overlayWindowController) {

        super(context, windowManager, activityManager, dozeParameters, statusBarStateController,

                configurationController, keyguardBypassController, colorExtractor, dumpManager);

                configurationController, keyguardViewMediator, keyguardBypassController,

                colorExtractor, dumpManager);

        mOverlayWindowController = overlayWindowController;

    }

packages/SystemUI/shared/src/com/android/systemui/shared/system/TransactionCompat.java

+5 −0
Original line number Diff line number Diff line
@@ -114,6 +114,11 @@ public class TransactionCompat { 
        t.deferTransactionUntil(surfaceControl, barrier, frameNumber);

    }



    public static void setRelativeLayer(Transaction t, SurfaceControl surfaceControl,

            SurfaceControl relativeTo, int z) {

        t.setRelativeLayer(surfaceControl, relativeTo, z);

    }



    @Deprecated

    public static void setEarlyWakeup(Transaction t) {

    }