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

Commit 83bbbfaa authored by Nathan Harold's avatar Nathan Harold Committed by Automerger Merge Worker
Browse files

Merge "Fix Location Check for Barring and RegFail" into rvc-dev am: 2ecebea3... 

Merge "Fix Location Check for Barring and RegFail" into rvc-dev am: 2ecebea3 am: 66934fc3 am: 362a5673

Change-Id: I59dfd6f27645a9856d7e26fee5596c195d2608ed
parents 566578b0 362a5673

services/core/java/com/android/server/TelephonyRegistry.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -1083,7 +1083,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
                        if (VDBG) log("listen: call onBarringInfoChanged=" + barringInfo);

                        if (VDBG) log("listen: call onBarringInfoChanged=" + barringInfo);

                        try {

                        try {

                            r.callback.onBarringInfoChanged(

                            r.callback.onBarringInfoChanged(

                                    checkFineLocationAccess(r, Build.VERSION_CODES.R)

                                    checkFineLocationAccess(r, Build.VERSION_CODES.BASE)

                                            ? barringInfo : biNoLocation);

                                            ? barringInfo : biNoLocation);

                        } catch (RemoteException ex) {

                        } catch (RemoteException ex) {

                            remove(r.binder);

                            remove(r.binder);
@@ -2277,7 +2277,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
                            && idMatch(r.subId, subId, phoneId)) {

                            && idMatch(r.subId, subId, phoneId)) {

                        try {

                        try {

                            r.callback.onRegistrationFailed(

                            r.callback.onRegistrationFailed(

                                    checkFineLocationAccess(r, Build.VERSION_CODES.R)

                                    checkFineLocationAccess(r, Build.VERSION_CODES.BASE)

                                            ? cellIdentity : noLocationCi,

                                            ? cellIdentity : noLocationCi,

                                    chosenPlmn, domain, causeCode,

                                    chosenPlmn, domain, causeCode,

                                    additionalCauseCode);

                                    additionalCauseCode);
@@ -2324,7 +2324,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
                                        + barringInfo + " r=" + r);

                                        + barringInfo + " r=" + r);

                            }

                            }

                            r.callback.onBarringInfoChanged(

                            r.callback.onBarringInfoChanged(

                                    checkFineLocationAccess(r, Build.VERSION_CODES.R)

                                    checkFineLocationAccess(r, Build.VERSION_CODES.BASE)

                                        ? barringInfo : biNoLocation);

                                        ? barringInfo : biNoLocation);

                        } catch (RemoteException ex) {

                        } catch (RemoteException ex) {

                            mRemoveList.add(r.binder);

                            mRemoveList.add(r.binder);