summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Salvador Martinez <dehboxturtle@google.com> 2016-08-24 18:17:38 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2016-08-24 18:17:40 +0000
commited004e2958753eb3b09e9858fa870bc28ed73cbc (patch)
tree5a329aa410b9645b72df67f6891c9e220f17e0e5
parent462f29f77f201ba7c595c40f81f5ad4dfc3e6f65 (diff)
parent18bf581c778e28e1678733167473d226b603c210 (diff)
Merge "Added error handling to settings suggestions list" into nyc-dev
-rw-r--r--packages/SettingsLib/src/com/android/settingslib/SuggestionParser.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/SuggestionParser.java b/packages/SettingsLib/src/com/android/settingslib/SuggestionParser.java
index 741b0ea82951..21786c917763 100644
--- a/packages/SettingsLib/src/com/android/settingslib/SuggestionParser.java
+++ b/packages/SettingsLib/src/com/android/settingslib/SuggestionParser.java
@@ -28,7 +28,6 @@ import android.util.Xml;
import android.provider.Settings;
import android.accounts.Account;
import android.accounts.AccountManager;
-import android.content.ContentValues;
import android.content.pm.PackageManager;
import android.content.res.Resources;
import android.view.InflateException;
@@ -176,6 +175,9 @@ public class SuggestionParser {
} catch (PackageManager.NameNotFoundException e) {
Log.w(TAG, "Cannot find resources for " + suggestion.intent.getComponent());
return false;
+ } catch (Resources.NotFoundException e) {
+ Log.w(TAG, "Cannot find resources for " + suggestion.intent.getComponent(), e);
+ return false;
}
}