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

Commit b09250e7 authored by Nathan Harold's avatar Nathan Harold
Browse files

[DO NOT MERGE] Check CellInfoCallback Detail for Null 

In cases where the source of the CellInfo fails
but does not generate a Throwable, the detail info
will not be provided and should be null. Inside the
user process, we need to check for null before
dereferencing the detail object. Oops. :-(

Bug: 142706765
Bug: 142421696
Test: manual
Merged-In: I1307d1d7aacef0bbd33bfc73700ee774e12e64c1
Change-Id: I1307d1d7aacef0bbd33bfc73700ee774e12e64c1
(cherry picked from commit fff05206)
parent 0079161f

telephony/java/android/telephony/TelephonyManager.java

+4 −2
Original line number Diff line number Diff line
@@ -5353,7 +5353,8 @@ public class TelephonyManager { 
                        public void onError(int errorCode, android.os.ParcelableException detail) {

                            Binder.withCleanCallingIdentity(() ->

                                    executor.execute(() -> callback.onError(

                                            errorCode, detail.getCause())));

                                            errorCode,

                                            detail == null ? null : detail.getCause())));

                        }

                    }, getOpPackageName());
@@ -5393,7 +5394,8 @@ public class TelephonyManager { 
                        public void onError(int errorCode, android.os.ParcelableException detail) {

                            Binder.withCleanCallingIdentity(() ->

                                    executor.execute(() -> callback.onError(

                                            errorCode, detail.getCause())));

                                            errorCode,

                                            detail == null ? null : detail.getCause())));

                        }

                    }, getOpPackageName(), workSource);

        } catch (RemoteException ex) {