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

Commit a428d82f authored by Yurii Zubrytskyi's avatar Yurii Zubrytskyi Committed by Android (Google) Code Review
Browse files

Merge "Use the correct time functions for tracking service startup"

parents db80595a 284c1715

services/core/java/com/android/server/om/IdmapDaemon.java

+4 −8
Original line number Diff line number Diff line
@@ -274,20 +274,16 @@ class IdmapDaemon { 
            }

        }



        final long endMillis = SystemClock.elapsedRealtime() + SERVICE_CONNECT_TIMEOUT_MS;

        while (SystemClock.elapsedRealtime() <= endMillis) {

        final long endMillis = SystemClock.uptimeMillis() + SERVICE_CONNECT_TIMEOUT_MS;

        do {

            final IBinder binder = ServiceManager.getService(IDMAP_SERVICE);

            if (binder != null) {

                binder.linkToDeath(

                        () -> Slog.w(TAG, String.format("service '%s' died", IDMAP_SERVICE)), 0);

                return binder;

            }



            try {

                Thread.sleep(SERVICE_CONNECT_INTERVAL_SLEEP_MS);

            } catch (InterruptedException ignored) {

            }

        }

            SystemClock.sleep(SERVICE_CONNECT_INTERVAL_SLEEP_MS);

        } while (SystemClock.uptimeMillis() <= endMillis);



        throw new TimeoutException(

            String.format("Failed to connect to '%s' in %d milliseconds", IDMAP_SERVICE,