Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Access IMMS#mSettings only inside the lock"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-02-16 01:29:51 +00:00
committed by Android (Google) Code Review
parent 1fad70afd3 278f2ab11b
commit 019b018cf7
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/core/java/com/android/server/InputMethodManagerService.java
View File

@@ -901,7 +901,8 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
mPackagesToMonitorComponentChange.add(packageName);
}
private boolean isChangingPackagesOfCurrentUser() {
@GuardedBy("mMethodMap")
private boolean isChangingPackagesOfCurrentUserLocked() {
final int userId = getChangingUserId();
final boolean retval = userId == mSettings.getCurrentUserId();
if (DEBUG) {
@@ -914,10 +915,10 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
@Override
public boolean onHandleForceStop(Intent intent, String[] packages, int uid, boolean doit) {
if (!isChangingPackagesOfCurrentUser()) {
return false;
}
synchronized (mMethodMap) {
if (!isChangingPackagesOfCurrentUserLocked()) {
return false;
}
String curInputMethodId = mSettings.getSelectedInputMethod();
final int N = mMethodList.size();
if (curInputMethodId != null) {
@@ -951,10 +952,10 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
@Override
public void onSomePackagesChanged() {
if (!isChangingPackagesOfCurrentUser()) {
return;
}
synchronized (mMethodMap) {
if (!isChangingPackagesOfCurrentUserLocked()) {
return;
}
InputMethodInfo curIm = null;
String curInputMethodId = mSettings.getSelectedInputMethod();
final int N = mMethodList.size();