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

Commit 8c8c4d1d authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Make change and version bump to r_aml_300900600 for mainline module file:... 

Make change and version bump to r_aml_300900600 for mainline module file: packages/Tethering/apex/manifest.json

Change-Id: Idac701bf872c3e7d5b854c6a19ca0da5d01d6699
parents f55e3808 22894fed

apex/extservices/apex_manifest.json

+1 −1
Original line number Diff line number Diff line 
{

  "name": "com.android.extservices",

  "version": 300900500

  "version": 300900600

}

apex/permission/apex_manifest.json

+1 −1
Original line number Diff line number Diff line 
{

  "name": "com.android.permission",

  "version": 300900500

  "version": 300900600

}

apex/statsd/apex_manifest.json

+1 −1
Original line number Diff line number Diff line 
{

  "name": "com.android.os.statsd",

  "version": 300900500

  "version": 300900600

}

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/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;

    }