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

Commit 0b87a637 authored by Stan Chesnutt's avatar Stan Chesnutt Committed by Android Git Automerger
Browse files

am f3b88c7a: Merge "Simplistic fix for initialization race" into klp-dev 

* commit 'f3b88c7a':
  Simplistic fix for initialization race
parents fc25c935 f3b88c7a

services/java/com/android/server/CountryDetectorService.java

+4 −3
Original line number Diff line number Diff line
@@ -97,12 +97,13 @@ public class CountryDetectorService extends ICountryDetector.Stub implements Run 
    }



    @Override

    public Country detectCountry() throws RemoteException {

    public Country detectCountry() {

        if (!mSystemReady) {

            throw new RemoteException();

        }

            return null;   // server not yet active

        } else {

            return mCountryDetector.detectCountry();

        }

    }



    /**

     * Add the ICountryListener into the listener list.