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

Commit 4c864521 authored by Danny Baumann's avatar Danny Baumann Committed by Gerrit Code Review
Browse files

Merge "Fix dock intent lookup." into cm-10.2

parents f1a0cfd8 3652c0a4

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

+5 −2
Original line number Diff line number Diff line
@@ -324,6 +324,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    int mDeviceHardwareKeys;

    boolean mHasMenuKeyEnabled;



    int mCurrentUser = 0;



    // The last window we were told about in focusChanged.

    WindowState mFocusedWindow;

    IApplicationToken mFocusedApp;
@@ -5295,8 +5297,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        ActivityInfo ai = null;

        ResolveInfo info = mContext.getPackageManager().resolveActivityAsUser(

                intent,

                PackageManager.MATCH_DEFAULT_ONLY,

                UserHandle.USER_CURRENT);

                PackageManager.MATCH_DEFAULT_ONLY | PackageManager.GET_META_DATA,

                mCurrentUser);

        if (info != null) {

            ai = info.activityInfo;

        }
@@ -5544,6 +5546,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            }

        }

        setLastInputMethodWindowLw(null, null);

        mCurrentUser = newUserId;

    }



    @Override