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

Commit c6e5a719 authored by Evan Tyra's avatar Evan Tyra Committed by Gerrit Code Review
Browse files

Merge "Catch NPE in getServiceStateForSubscriber"

parents bc763173 9bd937a0

telephony/java/android/telephony/TelephonyManager.java

+5 −0
Original line number Original line Diff line number Diff line
@@ -103,6 +103,7 @@ import java.util.HashMap; 
import java.util.List;

import java.util.List;

import java.util.Locale;

import java.util.Locale;

import java.util.Map;

import java.util.Map;

import java.util.UUID;

import java.util.concurrent.Executor;

import java.util.concurrent.Executor;

import java.util.function.Consumer;

import java.util.function.Consumer;

import java.util.regex.Matcher;

import java.util.regex.Matcher;
@@ -9111,6 +9112,10 @@ public class TelephonyManager { 
            }

            }

        } catch (RemoteException e) {

        } catch (RemoteException e) {

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

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

        } catch (NullPointerException e) {

            AnomalyReporter.reportAnomaly(

                    UUID.fromString("a3ab0b9d-f2aa-4baf-911d-7096c0d4645a"),

                    "getServiceStateForSubscriber " + subId + " NPE");

        }

        }

        return null;

        return null;

    }

    }