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

Commit 8c068dc9 authored by Marco Loaiza's avatar Marco Loaiza Committed by Android (Google) Code Review
Browse files

Merge "Check for valid last reported deviceId when starting service"

parents dbed72c3 5ffbb10f

core/java/android/app/ActivityThread.java

+5 −1
Original line number Original line Diff line number Diff line
@@ -4558,8 +4558,12 @@ public final class ActivityThread extends ClientTransactionHandler 
            service.attach(context, this, data.info.name, data.token, app,

            service.attach(context, this, data.info.name, data.token, app,

                    ActivityManager.getService());

                    ActivityManager.getService());

            if (!service.isUiContext()) { // WindowProviderService is a UI Context.

            if (!service.isUiContext()) { // WindowProviderService is a UI Context.

                VirtualDeviceManager vdm = context.getSystemService(VirtualDeviceManager.class);

                if (mLastReportedDeviceId == VirtualDeviceManager.DEVICE_ID_DEFAULT

                        || vdm.isValidVirtualDeviceId(mLastReportedDeviceId)) {

                    service.updateDeviceId(mLastReportedDeviceId);

                    service.updateDeviceId(mLastReportedDeviceId);

                }

                }

            }

            service.onCreate();

            service.onCreate();

            mServicesData.put(data.token, data);

            mServicesData.put(data.token, data);

            mServices.put(data.token, service);

            mServices.put(data.token, service);