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

Commit dfd0363a authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by The Android Open Source Project
Browse files

am 5633034f: Merge change 4115 into donut 

Merge commit '5633034f'

* commit '5633034f':
  * component can be null after destory?
parents a238b468 5633034f

core/java/android/app/ActivityThread.java

+4 −3
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.content.pm.InstrumentationInfo; 
import android.content.pm.PackageManager;

import android.content.pm.ProviderInfo;

import android.content.pm.ServiceInfo;

import android.content.pm.PackageParser.Component;

import android.content.res.AssetManager;

import android.content.res.Configuration;

import android.content.res.Resources;
@@ -3286,10 +3287,10 @@ public final class ActivityThread { 
                throw e;

            } catch (Exception e) {

                if (!mInstrumentation.onException(r.activity, e)) {

                    ComponentName component = r.intent.getComponent();

                    String name = component == null ? "[Unknown]" : component.toShortString();

                    throw new RuntimeException(

                            "Unable to destroy activity "

                            + r.intent.getComponent().toShortString()

                            + ": " + e.toString(), e);

                            "Unable to destroy activity " + name + ": " + e.toString(), e);

                }

            }

        }