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

Merge "Add TelephonyRegistry LOCATION checks" into rvc-dev am: b1755b5e16

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11760916

Change-Id: I493ee9af5c11842e572c704ca23e27ba3cca7f77
This commit is contained in:
Nathan Harold
2020-06-15 23:11:15 +00:00
committed by Automerger Merge Worker
parent c64cb085f3 b1755b5e16
commit 03def1e1a9
1 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -310,12 +310,15 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
private List<Map<Integer, PreciseDataConnectionState>> mPreciseDataConnectionStates = private List<Map<Integer, PreciseDataConnectionState>> mPreciseDataConnectionStates =
new ArrayList<Map<Integer, PreciseDataConnectionState>>(); new ArrayList<Map<Integer, PreciseDataConnectionState>>();
// Nothing here yet, but putting it here in case we want to add more in the future. static final int ENFORCE_COARSE_LOCATION_PERMISSION_MASK =
static final int ENFORCE_COARSE_LOCATION_PERMISSION_MASK = 0; PhoneStateListener.LISTEN_REGISTRATION_FAILURE
| PhoneStateListener.LISTEN_BARRING_INFO;
static final int ENFORCE_FINE_LOCATION_PERMISSION_MASK = static final int ENFORCE_FINE_LOCATION_PERMISSION_MASK =
PhoneStateListener.LISTEN_CELL_LOCATION PhoneStateListener.LISTEN_CELL_LOCATION
| PhoneStateListener.LISTEN_CELL_INFO; | PhoneStateListener.LISTEN_CELL_INFO
| PhoneStateListener.LISTEN_REGISTRATION_FAILURE
| PhoneStateListener.LISTEN_BARRING_INFO;
static final int ENFORCE_PHONE_STATE_PERMISSION_MASK = static final int ENFORCE_PHONE_STATE_PERMISSION_MASK =
PhoneStateListener.LISTEN_CALL_FORWARDING_INDICATOR PhoneStateListener.LISTEN_CALL_FORWARDING_INDICATOR