diff options
author | satok <satok@google.com> | 2011-03-14 12:38:34 -0700 |
---|---|---|
committer | satok <satok@google.com> | 2011-03-14 12:38:34 -0700 |
commit | b548a3cfa022451098cc73e25ce79f1776e78715 (patch) | |
tree | 78b48001eca82eb60412d7bbef051e121d528cfb /services/java/com/android/server/InputMethodManagerService.java | |
parent | e21110f8b1e4aa884f7a4e2164ae90dab8d5f3fa (diff) | |
download | frameworks_base-b548a3cfa022451098cc73e25ce79f1776e78715.zip frameworks_base-b548a3cfa022451098cc73e25ce79f1776e78715.tar.gz frameworks_base-b548a3cfa022451098cc73e25ce79f1776e78715.tar.bz2 |
Remove a workaround for the data inconsistency of SystemProperties
Bug: 3473532
Reverting: Ie3f5b484b5574e10a4
Depends on Bug: 3511230
This must be fixed before submitting this CL.
Change-Id: I435a294a818bec5675f0ada00d81c1b3e37d1dce
Diffstat (limited to 'services/java/com/android/server/InputMethodManagerService.java')
-rw-r--r-- | services/java/com/android/server/InputMethodManagerService.java | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/services/java/com/android/server/InputMethodManagerService.java b/services/java/com/android/server/InputMethodManagerService.java index 9c9d406..1455764 100644 --- a/services/java/com/android/server/InputMethodManagerService.java +++ b/services/java/com/android/server/InputMethodManagerService.java @@ -60,7 +60,6 @@ import android.os.RemoteException; 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; @@ -315,7 +314,6 @@ public class InputMethodManagerService extends IInputMethodManager.Stub int mBackDisposition = InputMethodService.BACK_DISPOSITION_DEFAULT; int mImeWindowVis; - long mOldSystemSettingsVersion; AlertDialog.Builder mDialogBuilder; AlertDialog mSwitchingDialog; @@ -490,8 +488,6 @@ public class InputMethodManagerService extends IInputMethodManager.Stub handleMessage(msg); } }); - // Initialize the system settings version to undefined. - mOldSystemSettingsVersion = -1; (new MyPackageMonitor()).register(mContext, true); @@ -1012,15 +1008,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub } } - // 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 @@ -1989,7 +1977,6 @@ public class InputMethodManagerService extends IInputMethodManager.Stub private void setSelectedInputMethodAndSubtypeLocked(InputMethodInfo imi, int subtypeId, boolean setSubtypeOnly) { - mOldSystemSettingsVersion = getSystemSettingsVersion(); // Update the history of InputMethod and Subtype saveCurrentInputMethodAndSubtypeToHistory(); @@ -2239,10 +2226,6 @@ public class InputMethodManagerService extends IInputMethodManager.Stub } } - private static long getSystemSettingsVersion() { - return SystemProperties.getLong(Settings.Secure.SYS_PROP_SETTING_VERSION, 0); - } - /** * @return Return the current subtype of this input method. */ |