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

Commit 55bc95f8 authored by Hall Liu's avatar Hall Liu Committed by android-build-merger
Browse files

Merge "Stop silently dropping a NullPointerException" am: d99ca078 

am: 66c4dc07

Change-Id: I6fb1b41660b61c83a1f6883df823d2840f974de3
parents e64fd38c 66c4dc07

telephony/java/android/telephony/TelephonyManager.java

+1 −2
Original line number Diff line number Diff line
@@ -8393,9 +8393,8 @@ public class TelephonyManager { 
            ITelephony telephony = getITelephony();

            if (telephony != null)

                retVal = telephony.isUserDataEnabled(subId);

        } catch (RemoteException e) {

        } catch (RemoteException | NullPointerException e) {

            Log.e(TAG, "Error calling ITelephony#isUserDataEnabled", e);

        } catch (NullPointerException e) {

        }

        return retVal;

    }