Merge "Remove a workaround for the data inconsistency of SystemProperties" into honeycomb-mr1

import android.os.ResultReceiver;

import android.os.ServiceManager;

import android.os.SystemClock;

import android.os.SystemProperties;

import android.provider.Settings;

import android.provider.Settings.Secure;

import android.provider.Settings.SettingNotFoundException;

    int mBackDisposition = InputMethodService.BACK_DISPOSITION_DEFAULT;

    int mImeWindowVis;

    long mOldSystemSettingsVersion;

    AlertDialog.Builder mDialogBuilder;

    AlertDialog mSwitchingDialog;

                handleMessage(msg);

            }

        });

        // Initialize the system settings version to undefined.

        mOldSystemSettingsVersion = -1;

        (new MyPackageMonitor()).register(mContext, true);

        }

    }

    // TODO: Investigate and fix why are settings changes getting processed before the settings seq

    // number is updated?

    // TODO: Change this stuff to not rely on modifying settings for normal user interactions.

    void updateFromSettingsLocked() {

        long newSystemSettingsVersion = getSystemSettingsVersion();

        // This is a workaround to avoid a situation that old cached value in Settings.Secure

        // will be handled.

        if (newSystemSettingsVersion == mOldSystemSettingsVersion) return;

        // We are assuming that whoever is changing DEFAULT_INPUT_METHOD and

        // ENABLED_INPUT_METHODS is taking care of keeping them correctly in

        // sync, so we will never have a DEFAULT_INPUT_METHOD that is not

    private void setSelectedInputMethodAndSubtypeLocked(InputMethodInfo imi, int subtypeId,

            boolean setSubtypeOnly) {

        mOldSystemSettingsVersion = getSystemSettingsVersion();

        // Update the history of InputMethod and Subtype

        saveCurrentInputMethodAndSubtypeToHistory();

        }

    }

    private static long getSystemSettingsVersion() {

        return SystemProperties.getLong(Settings.Secure.SYS_PROP_SETTING_VERSION, 0);

    }

    /**

     * @return Return the current subtype of this input method.

     */