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

Commit b3e1537e authored by Jay Shrauner's avatar Jay Shrauner
Browse files

Fix NPE in startLoading 

Check for null activity.

Bug:26183802
Change-Id: Ic1bdae3611513f43b5556145ea72aaf22d602a74
parent 524d8716

src/com/android/dialer/list/SearchFragment.java

+5 −3
Original line number Diff line number Diff line
@@ -15,8 +15,6 @@ 
 */

package com.android.dialer.list;



import static android.Manifest.permission.READ_CONTACTS;



import android.animation.Animator;

import android.animation.AnimatorInflater;

import android.animation.AnimatorListenerAdapter;
@@ -358,7 +356,11 @@ public class SearchFragment extends PhoneNumberPickerFragment { 


    @Override

    protected void startLoading() {

        if (PermissionsUtil.hasPermission(getActivity(), READ_CONTACTS)) {

        if (getActivity() == null) {

            return;

        }



        if (PermissionsUtil.hasContactsPermissions(getActivity())) {

            super.startLoading();

        } else if (TextUtils.isEmpty(getQueryString())) {

            // Clear out any existing call shortcuts.