diff options
| author | Dianne Hackborn <hackbod@google.com> | 2012-05-14 17:31:53 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-14 17:31:53 -0700 |
| commit | a827843f9b46700a187bd3a506498a0f36f474fa (patch) | |
| tree | 94347de65921bfbd45062db0bcb1e801b43509c1 /core/java/android | |
| parent | e48d12b78011ff5ddbb6838a038ea5384190ec92 (diff) | |
| parent | b61a02657b9e577179c934bbb5e199ce919c4642 (diff) | |
| download | frameworks_base-a827843f9b46700a187bd3a506498a0f36f474fa.zip frameworks_base-a827843f9b46700a187bd3a506498a0f36f474fa.tar.gz frameworks_base-a827843f9b46700a187bd3a506498a0f36f474fa.tar.bz2 | |
Merge "Fix issue #6020164: Settings crashed on orientation change..." into jb-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/ActivityThread.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index e2ebeba..5085b1e 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -275,7 +275,7 @@ public final class ActivityThread { } public String toString() { - ComponentName componentName = intent.getComponent(); + ComponentName componentName = intent != null ? intent.getComponent() : null; return "ActivityRecord{" + Integer.toHexString(System.identityHashCode(this)) + " token=" + token + " " + (componentName == null |