From 258f7c7e1c6c49fbbf6d89f787ca51baf1468691 Mon Sep 17 00:00:00 2001
From: Amith Yamasani <yamasani@google.com>
Date: Tue, 5 Feb 2013 10:56:55 -0800
Subject: [PATCH] Improve error message to figure out which fragment class is
 problematic.

Bug: 8057867
Change-Id: I6ad0bc8c8a6ed9bc8a1cca5debffe15c6de3a1b5
---
 src/com/android/settings/SettingsPreferenceFragment.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index b418826f74e..42c0b404aab 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -233,8 +233,11 @@ public class SettingsPreferenceFragment extends PreferenceFragment implements Di
                     mParentFragment = getFragmentManager().findFragmentById(mParentFragmentId);
                     if (!(mParentFragment instanceof DialogCreatable)) {
                         throw new IllegalArgumentException(
-                                KEY_PARENT_FRAGMENT_ID + " must implement "
-                                        + DialogCreatable.class.getName());
+                                (mParentFragment != null 
+                                        ? mParentFragment.getClass().getName()
+                                        : mParentFragmentId)
+                                + " must implement "
+                                + DialogCreatable.class.getName());
                     }
                 }
                 // This dialog fragment could be created from non-SettingsPreferenceFragment