summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSalvador Martinez <dehboxturtle@google.com>2016-08-04 13:37:52 -0700
committergitbuildkicker <android-build@google.com>2016-08-25 09:20:50 -0700
commitc4d27e949190d0dda13807d445544793e58aeb6c (patch)
treefe9c4cccb3739ba9ed0d720e0e3b5a8c4b62696a
parentc372cb67ade0e6b73f00d78abafe6c800f5a9bf2 (diff)
downloadbase-c4d27e949190d0dda13807d445544793e58aeb6c.tar.gz
Added error handling to settings suggestions list
The suggestions list in the summary page of the settings app could sometimes cause a crash due to an uncaught exception. Tis fixed now. Bug: 30656840 Change-Id: If79f53e6a8c17a81653228d613797e94c473d410 (cherry picked from commit 60d92b3b8390e33e069f343d6a425ab07c498d3d)
-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;
}
}