Merge "Rename bindService to bindServiceAsUser to follow convention."

2013-01-16 23:26:30 +00:00
parent d05efe727b 27b89e6658
commit d4fe37bee7
18 changed files with 47 additions and 35 deletions
--- a/services/java/com/android/server/InputMethodManagerService.java
+++ b/services/java/com/android/server/InputMethodManagerService.java
@@ -888,7 +888,8 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
            Slog.e(TAG, "--- bind failed: service = " + service + ", conn = " + conn);
            return false;
        }
-        return mContext.bindService(service, conn, flags, mSettings.getCurrentUserId());
+        return mContext.bindServiceAsUser(service, conn, flags,
+                new UserHandle(mSettings.getCurrentUserId()));
    }

    @Override