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

Commit 17ed9519 authored by Wenyi Wang's avatar Wenyi Wang Committed by Android (Google) Code Review
Browse files

Merge "Fix usage of getContext() on pre-M SDKs (1/2)" into ub-contactsdialer-b-dev

parents 79627467 9342fbbb

src/com/android/contacts/common/interactions/ImportExportDialogFragment.java

+5 −0
Original line number Diff line number Diff line
@@ -90,6 +90,11 @@ public class ImportExportDialogFragment extends DialogFragment 
        mExportMode = exportMode;

    }



    @Override

    public Context getContext() {

        return getActivity();

    }



    @Override

    public void onAttach(Activity activity) {

        super.onAttach(activity);

src/com/android/contacts/common/preference/DisplayOptionsPreferenceFragment.java

+6 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.contacts.common.preference;



import android.content.Context;

import android.content.Intent;

import android.content.pm.PackageInfo;

import android.content.pm.PackageManager;
@@ -68,5 +69,10 @@ public class DisplayOptionsPreferenceFragment extends PreferenceFragment { 
                getString(R.string.pref_open_source_licenses_key));

        licensePreference.setIntent(new Intent(getActivity(), LicenseActivity.class));

    }



    @Override

    public Context getContext() {

        return getActivity();

    }

}