Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7beea85 authored by Prabir Pradhan's avatar Prabir Pradhan Committed by Automerger Merge Worker
Browse files

Merge "IMS: Intialize static association map before initializing native... 

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

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



Change-Id: Ie368cc09c779cd9b19d221afe3c12deb92de352e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6b838781 d96c2c88

services/core/java/com/android/server/input/InputManagerService.java

+4 −1
Original line number Diff line number Diff line
@@ -391,11 +391,14 @@ public class InputManagerService extends IInputManager.Stub 


    @VisibleForTesting

    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();

        mHandler = new InputManagerHandler(injector.getLooper());

        mNative = injector.getNativeService(this);



        mStaticAssociations = loadStaticInputPortAssociations();

        mUseDevInputEventForAudioJack =

                mContext.getResources().getBoolean(R.bool.config_useDevInputEventForAudioJack);

        Slog.i(TAG, "Initializing input manager, mUseDevInputEventForAudioJack="