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

Merge "IMS: Intialize static association map before initializing native service" into tm-dev am: fb2c1de5b7

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18185202

Change-Id: Id577a9e84998e8d80077a5492abf2754bbacc187
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Prabir Pradhan
2022-05-05 13:26:53 +00:00
committed by Automerger Merge Worker
parent e10ae3cd31 fb2c1de5b7
commit 16845bff63
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/input/InputManagerService.java
View File

@@ -391,11 +391,14 @@ public class InputManagerService extends IInputManager.Stub
@VisibleForTesting @VisibleForTesting
InputManagerService(Injector injector) { InputManagerService(Injector injector) {
// The static association map is accessed by both java and native code, so it must be
// initialized before initializing the native service.
mStaticAssociations = loadStaticInputPortAssociations();
mContext = injector.getContext(); mContext = injector.getContext();
mHandler = new InputManagerHandler(injector.getLooper()); mHandler = new InputManagerHandler(injector.getLooper());
mNative = injector.getNativeService(this); mNative = injector.getNativeService(this);
mStaticAssociations = loadStaticInputPortAssociations();
mUseDevInputEventForAudioJack = mUseDevInputEventForAudioJack =
mContext.getResources().getBoolean(R.bool.config_useDevInputEventForAudioJack); mContext.getResources().getBoolean(R.bool.config_useDevInputEventForAudioJack);
Slog.i(TAG, "Initializing input manager, mUseDevInputEventForAudioJack=" Slog.i(TAG, "Initializing input manager, mUseDevInputEventForAudioJack="