Merge "Catch a resource not found exception" into sc-v2-dev
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index a9999fa..91ad937 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -29,6 +29,7 @@
import android.content.pm.ActivityInfo;
import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.res.Resources;
import android.content.res.Resources.Theme;
import android.graphics.drawable.Icon;
import android.os.AsyncTask;
@@ -471,6 +472,9 @@
return;
} catch (NameNotFoundException e) {
Log.w(LOG_TAG, "Could not find package" + initialTitleResPackageName);
+ } catch (Resources.NotFoundException resourceNotFound) {
+ Log.w(LOG_TAG,
+ "Could not find title resource in " + initialTitleResPackageName);
}
} else {
setTitle(mInitialTitleResId);