Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I5f6e5775574c015f51a7f324680304bc721a7ac8
This commit is contained in:
Nathan Harold
2020-05-30 01:39:09 +00:00
committed by Automerger Merge Worker
parent 28e170a442 2ecebea361
commit 66934fc356
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/TelephonyRegistry.java
View File

@@ -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);