drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
satok
2011-03-14 22:44:23 -07:00
committed by Android (Google) Code Review
parent 0c6e9521f5 b548a3cfa0
commit b02b8369c6
1 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
services/java/com/android/server/InputMethodManagerService.java
View File

@ -60,7 +60,6 @@ import android.os.RemoteException;
import android.os.ResultReceiver; import android.os.ResultReceiver;
import android.os.ServiceManager; import android.os.ServiceManager;
import android.os.SystemClock; import android.os.SystemClock;
import android.os.SystemProperties;
import android.provider.Settings; import android.provider.Settings;
import android.provider.Settings.Secure; import android.provider.Settings.Secure;
import android.provider.Settings.SettingNotFoundException; import android.provider.Settings.SettingNotFoundException;
@ -315,7 +314,6 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
int mBackDisposition = InputMethodService.BACK_DISPOSITION_DEFAULT; int mBackDisposition = InputMethodService.BACK_DISPOSITION_DEFAULT;
int mImeWindowVis; int mImeWindowVis;
long mOldSystemSettingsVersion;
AlertDialog.Builder mDialogBuilder; AlertDialog.Builder mDialogBuilder;
AlertDialog mSwitchingDialog; AlertDialog mSwitchingDialog;
@ -490,8 +488,6 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
handleMessage(msg); handleMessage(msg);
} }
}); });
// Initialize the system settings version to undefined.
mOldSystemSettingsVersion = -1;
(new MyPackageMonitor()).register(mContext, true); (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() { 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 // We are assuming that whoever is changing DEFAULT_INPUT_METHOD and
// ENABLED_INPUT_METHODS is taking care of keeping them correctly in // ENABLED_INPUT_METHODS is taking care of keeping them correctly in
// sync, so we will never have a DEFAULT_INPUT_METHOD that is not // 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, private void setSelectedInputMethodAndSubtypeLocked(InputMethodInfo imi, int subtypeId,
boolean setSubtypeOnly) { boolean setSubtypeOnly) {
mOldSystemSettingsVersion = getSystemSettingsVersion();
// Update the history of InputMethod and Subtype // Update the history of InputMethod and Subtype
saveCurrentInputMethodAndSubtypeToHistory(); 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. * @return Return the current subtype of this input method.
*/ */