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

Commit 19fbb247 authored by Cutter Coryell's avatar Cutter Coryell Committed by Automerger Merge Worker
Browse files

Merge "EdgeBackGestureHandler: Add null check to fix null pointer exception."... 

Merge "EdgeBackGestureHandler: Add null check to fix null pointer exception." into tm-qpr-dev am: 0abfbb22 am: fd144b68

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



Change-Id: I748cd684013a67e77b2a1d5c9b4df58526e0fbe1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d6cbdb4e fd144b68

packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java

+3 −1
Original line number Diff line number Diff line
@@ -814,8 +814,10 @@ public class EdgeBackGestureHandler extends CurrentUserTracker 
        }

        mLogGesture = false;

        String logPackageName = "";

        Map<String, Integer> vocab = mVocab;

        // Due to privacy, only top 100 most used apps by all users can be logged.

        if (mUseMLModel && mVocab.containsKey(mPackageName) && mVocab.get(mPackageName) < 100) {

        if (mUseMLModel && vocab != null && vocab.containsKey(mPackageName)

                && vocab.get(mPackageName) < 100) {

            logPackageName = mPackageName;

        }

        SysUiStatsLog.write(SysUiStatsLog.BACK_GESTURE_REPORTED_REPORTED, backType,