am 95153de1: am 25d2746b: Merge "Fix IME window flickering during rotation." into mnc-dev

    public Configuration computeNewConfiguration() {

        synchronized (mWindowMap) {

            if (!mDisplayReady) {

                return null;

            }

            Configuration config = computeNewConfigurationLocked();

            if (mWaitingForConfig) {

                mWaitingForConfig = false;

                mLastFinishedFreezeSource = "new-config";

                performLayoutAndPlaceSurfacesLocked();

            }

            return config;

            return computeNewConfigurationLocked();

        }

    }

    Configuration computeNewConfigurationLocked() {

    private Configuration computeNewConfigurationLocked() {

        if (!mDisplayReady) {

            return null;

        }

        Configuration config = new Configuration();

        config.fontScale = 0;

        computeScreenConfigurationLocked(config);