Merge change 5810 into donut (daa5a215) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/TelephonyManager.java

+8 −2

Original line number	Diff line number	Diff line
		@@ -667,6 +667,9 @@ public class TelephonyManager {
		} catch (RemoteException ex) {
		// the phone process is restarting.
		return CALL_STATE_IDLE;
		} catch (NullPointerException ex) {
		// the phone process is restarting.
		return CALL_STATE_IDLE;
		}
		}

		@@ -701,6 +704,9 @@ public class TelephonyManager {
		} catch (RemoteException ex) {
		// the phone process is restarting.
		return DATA_ACTIVITY_NONE;
		} catch (NullPointerException ex) {
		// the phone process is restarting.
		return DATA_ACTIVITY_NONE;
		}
		}