Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 5810 into donut

Browse Source 
* changes:
  Fix bug 1930055 of NullPointerException.
This commit is contained in:
Android (Google) Code Review
2009-06-30 15:16:38 -07:00
parent 85d650c899 107821369b
commit daa5a21562
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -667,7 +667,10 @@ public class TelephonyManager {
} catch (RemoteException ex) { } catch (RemoteException ex) {
// the phone process is restarting. // the phone process is restarting.
return CALL_STATE_IDLE; return CALL_STATE_IDLE;
} } catch (NullPointerException ex) {
// the phone process is restarting.
return CALL_STATE_IDLE;
}
} }
/** Data connection activity: No traffic. */ /** Data connection activity: No traffic. */
@@ -701,7 +704,10 @@ public class TelephonyManager {
} catch (RemoteException ex) { } catch (RemoteException ex) {
// the phone process is restarting. // the phone process is restarting.
return DATA_ACTIVITY_NONE; return DATA_ACTIVITY_NONE;
} } catch (NullPointerException ex) {
// the phone process is restarting.
return DATA_ACTIVITY_NONE;
}
} }
/** Data connection state: Disconnected. IP traffic not available. */ /** Data connection state: Disconnected. IP traffic not available. */