commit 66d9f2c1c93dfc9858c52acbb88b6fca0c5e2cfc
author Junda Liu <junda@google.com> Mon Mar 28 17:00:25 2016 -0700
committer Junda Liu <junda@google.com> Tue Mar 29 10:10:10 2016 -0700
tree 5171ad5d446c555df76bdf2a283feab51a7bbb1f
parent c3ecad6f0ae5ae9b4148b1f03701e421822f08c4

Catch generic exception to avoid crash.

Some exception can cross binder interface and only catch remoteexception is not enough.

Bug: b/26016518
Change-Id: I442fce72812c41f36479c3488765418604824103

src/com/android/phone/CarrierConfigLoader.java

diff --git a/src/com/android/phone/CarrierConfigLoader.java b/src/com/android/phone/CarrierConfigLoader.java
index 09f12ff..09e6683 100644
--- a/src/com/android/phone/CarrierConfigLoader.java
+++ b/src/com/android/phone/CarrierConfigLoader.java
@@ -219,7 +219,8 @@
                         saveConfigToXml(DEFAULT_CARRIER_CONFIG_PACKAGE, iccid, config);
                         mConfigFromDefaultApp[phoneId] = config;
                         sendMessage(obtainMessage(EVENT_LOADED_FROM_DEFAULT, phoneId, -1));
-                    } catch (RemoteException ex) {
+                    } catch (Exception ex) {
+                        // The bound app could throw exceptions that binder will pass to us.
                         loge("Failed to get carrier config: " + ex.toString());
                     } finally {
                         mContext.unbindService(mServiceConnection[phoneId]);
@@ -290,7 +291,8 @@
                         saveConfigToXml(carrierPackageName, iccid, config);
                         mConfigFromCarrierApp[phoneId] = config;
                         sendMessage(obtainMessage(EVENT_LOADED_FROM_CARRIER, phoneId, -1));
-                    } catch (RemoteException ex) {
+                    } catch (Exception ex) {
+                        // The bound app could throw exceptions that binder will pass to us.
                         loge("Failed to get carrier config: " + ex.toString());
                     } finally {
                         mContext.unbindService(mServiceConnection[phoneId]);