Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a79a017 authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by The Android Open Source Project
Browse files

am daa5a215: Merge change 5810 into donut 

Merge commit 'daa5a215'

* commit 'daa5a215':
  Fix bug 1930055 of NullPointerException.
parents 730babbd daa5a215

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;

      }

    }