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

Commit 2e73f4c0 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am f46bd06c: Merge "Fix issue #6579824: Email crash observed after updating..." into jb-dev 

* commit 'f46bd06c':
  Fix issue #6579824: Email crash observed after updating...
parents defc3019 f46bd06c

core/java/android/app/ActivityThread.java

+1 −1
Original line number Diff line number Diff line
@@ -4516,7 +4516,7 @@ public final class ActivityThread { 
            boolean noisy, boolean noReleaseNeeded, boolean stable) {

        ContentProvider localProvider = null;

        IContentProvider provider;

        if (holder == null) {

        if (holder == null || holder.provider == null) {

            if (DEBUG_PROVIDER || noisy) {

                Slog.d(TAG, "Loading provider " + info.authority + ": "

                        + info.name);