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

Commit 66c4dc07 authored by Hall Liu's avatar Hall Liu Committed by android-build-merger
Browse files

Merge "Stop silently dropping a NullPointerException" 

am: d99ca078

Change-Id: I11e76cf1174057e2178f52faeae8e225062d1488
parents 40f44f5d d99ca078

telephony/java/android/telephony/TelephonyManager.java

+1 −2
Original line number Diff line number Diff line
@@ -8245,9 +8245,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;

    }