diff options
author | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-30 15:16:38 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-30 15:16:38 -0700 |
commit | daa5a21562cb4b1fda21400bc638be4d6b7f5825 (patch) | |
tree | 970fa32dc4f1c38315f5a1b2b8a788db5f8d4fb8 /telephony | |
parent | 85d650c89998eb108faa2c02dcc32467e23f9555 (diff) | |
parent | 107821369b7af3b739a0b5617fb34ff19f7ca9b5 (diff) | |
download | frameworks_base-daa5a21562cb4b1fda21400bc638be4d6b7f5825.zip frameworks_base-daa5a21562cb4b1fda21400bc638be4d6b7f5825.tar.gz frameworks_base-daa5a21562cb4b1fda21400bc638be4d6b7f5825.tar.bz2 |
Merge change 5810 into donut
* changes:
Fix bug 1930055 of NullPointerException.
Diffstat (limited to 'telephony')
-rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index bf5df88..c9dcd8b 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -667,7 +667,10 @@ 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; + } } /** Data connection activity: No traffic. */ @@ -701,7 +704,10 @@ 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; + } } /** Data connection state: Disconnected. IP traffic not available. */ |