Merge "Simplistic fix for initialization race" into klp-dev

    }

    @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.