diff options
| author | 2020-05-30 01:38:20 +0000 | |
|---|---|---|
| committer | 2020-05-30 01:38:20 +0000 | |
| commit | 2ecebea361bcb89c98a75d5b5f4f0adc1c0f45ec (patch) | |
| tree | 4b6eeae6913a29d549e989867760de6e0201ded5 | |
| parent | 6dc1831a359b74f7dcb2b744aebffd766e228336 (diff) | |
| parent | fa408a756f105b536f7255b6fcbc59c926e9713e (diff) | |
Merge "Fix Location Check for Barring and RegFail" into rvc-dev
| -rw-r--r-- | services/core/java/com/android/server/TelephonyRegistry.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/TelephonyRegistry.java b/services/core/java/com/android/server/TelephonyRegistry.java index 1d40e2ee92f4..9080bdb44eaf 100644 --- a/services/core/java/com/android/server/TelephonyRegistry.java +++ b/services/core/java/com/android/server/TelephonyRegistry.java @@ -1083,7 +1083,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { if (VDBG) log("listen: call onBarringInfoChanged=" + barringInfo); try { r.callback.onBarringInfoChanged( - checkFineLocationAccess(r, Build.VERSION_CODES.R) + checkFineLocationAccess(r, Build.VERSION_CODES.BASE) ? barringInfo : biNoLocation); } catch (RemoteException ex) { remove(r.binder); @@ -2277,7 +2277,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { && idMatch(r.subId, subId, phoneId)) { try { r.callback.onRegistrationFailed( - checkFineLocationAccess(r, Build.VERSION_CODES.R) + checkFineLocationAccess(r, Build.VERSION_CODES.BASE) ? cellIdentity : noLocationCi, chosenPlmn, domain, causeCode, additionalCauseCode); @@ -2324,7 +2324,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { + barringInfo + " r=" + r); } r.callback.onBarringInfoChanged( - checkFineLocationAccess(r, Build.VERSION_CODES.R) + checkFineLocationAccess(r, Build.VERSION_CODES.BASE) ? barringInfo : biNoLocation); } catch (RemoteException ex) { mRemoveList.add(r.binder); |