Revert "Use shell permission to query current user"
This reverts commit 95bc8d70679df34e6f0da86361633f28e33e2317.
Reason for revert: Conflict with revert for b/190622577
Change-Id: I993e8da9737634d0cc815cd75b461699170602cc
diff --git a/service/src/com/android/server/ConnectivityService.java b/service/src/com/android/server/ConnectivityService.java
index 0a0b5cb..15b666a 100644
--- a/service/src/com/android/server/ConnectivityService.java
+++ b/service/src/com/android/server/ConnectivityService.java
@@ -1247,13 +1247,6 @@
public boolean getCellular464XlatEnabled() {
return NetworkProperties.isCellular464XlatEnabled().orElse(true);
}
-
- /**
- * Create a {@link LocationPermissionChecker}.
- */
- public LocationPermissionChecker makeLocationPermissionChecker(Context context) {
- return new LocationPermissionChecker(context);
- }
}
public ConnectivityService(Context context) {
@@ -1321,7 +1314,7 @@
mNetd = netd;
mTelephonyManager = (TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE);
mAppOpsManager = (AppOpsManager) mContext.getSystemService(Context.APP_OPS_SERVICE);
- mLocationPermissionChecker = mDeps.makeLocationPermissionChecker(mContext);
+ mLocationPermissionChecker = new LocationPermissionChecker(mContext);
// To ensure uid state is synchronized with Network Policy, register for
// NetworkPolicyManagerService events must happen prior to NetworkPolicyManagerService