Merge "[Telephony Mainline] Refactored PermissionManager" (6159a249) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/dataconnection/DataServiceManager.java

+32 −16

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package com.android.internal.telephony.dataconnection;

		import static android.text.format.DateUtils.MINUTE_IN_MILLIS;
		import static android.text.format.DateUtils.SECOND_IN_MILLIS;

		import android.annotation.NonNull;
		import android.app.AppOpsManager;
		@@ -37,14 +38,12 @@ import android.os.PersistableBundle;
		import android.os.RegistrantList;
		import android.os.RemoteException;
		import android.os.UserHandle;
		import android.permission.IPermissionManager;
		import android.permission.PermissionManager;
		import android.telephony.AccessNetworkConstants;
		import android.telephony.AccessNetworkConstants.TransportType;
		import android.telephony.AnomalyReporter;
		import android.telephony.CarrierConfigManager;
		import com.android.telephony.Rlog;
		import android.telephony.SubscriptionManager;
		import android.telephony.TelephonyFrameworkInitializer;
		import android.telephony.data.DataCallResponse;
		import android.telephony.data.DataProfile;
		import android.telephony.data.DataService;
		@@ -56,6 +55,7 @@ import android.text.TextUtils;
		import com.android.internal.telephony.Phone;
		import com.android.internal.telephony.PhoneConfigurationManager;
		import com.android.internal.telephony.util.TelephonyUtils;
		import com.android.telephony.Rlog;

		import java.util.HashSet;
		import java.util.List;
		@@ -63,6 +63,7 @@ import java.util.Map;
		import java.util.Set;
		import java.util.UUID;
		import java.util.concurrent.ConcurrentHashMap;
		import java.util.concurrent.CountDownLatch;

		/**
		* Data service manager manages handling data requests and responses on data services (e.g.
		@@ -79,13 +80,15 @@ public class DataServiceManager extends Handler {

		private static final long REQUEST_UNRESPONDED_TIMEOUT = 10 * MINUTE_IN_MILLIS; // 10 mins

		private static final long CHANGE_PERMISSION_TIMEOUT_MS = 15 * SECOND_IN_MILLIS; // 15 secs

		private final Phone mPhone;

		private final String mTag;

		private final CarrierConfigManager mCarrierConfigManager;
		private final AppOpsManager mAppOps;
		private final IPermissionManager mPermissionManager;
		private final PermissionManager mPermissionManager;

		private final int mTransportType;

		@@ -132,14 +135,23 @@ public class DataServiceManager extends Handler {

		private void grantPermissionsToService(String packageName) {
		final String[] pkgToGrant = {packageName};
		CountDownLatch latch = new CountDownLatch(1);
		try {
		mPermissionManager.grantDefaultPermissionsToEnabledTelephonyDataServices(
		pkgToGrant, UserHandle.myUserId());
		pkgToGrant, UserHandle.of(UserHandle.myUserId()), Runnable::run,
		isSuccess -> {
		if (isSuccess) {
		latch.countDown();
		} else {
		loge("Failed to grant permissions to service.");
		}
		});
		TelephonyUtils.waitUntilReady(latch, CHANGE_PERMISSION_TIMEOUT_MS);
		mAppOps.setMode(AppOpsManager.OPSTR_MANAGE_IPSEC_TUNNELS,
		UserHandle.myUserId(), pkgToGrant[0], AppOpsManager.MODE_ALLOWED);
		} catch (RemoteException e) {
		} catch (RuntimeException e) {
		loge("Binder to package manager died, permission grant for DataService failed.");
		throw TelephonyUtils.rethrowAsRuntimeException(e);
		throw e;
		}
		}

		@@ -154,18 +166,27 @@ public class DataServiceManager extends Handler {
		dataServices.remove(getDataServicePackageName(transportType));
		}

		CountDownLatch latch = new CountDownLatch(1);
		try {
		String[] dataServicesArray = new String[dataServices.size()];
		dataServices.toArray(dataServicesArray);
		mPermissionManager.revokeDefaultPermissionsFromDisabledTelephonyDataServices(
		dataServicesArray, UserHandle.myUserId());
		dataServicesArray, UserHandle.of(UserHandle.myUserId()), Runnable::run,
		isSuccess -> {
		if (isSuccess) {
		latch.countDown();
		} else {
		loge("Failed to revoke permissions from data services.");
		}
		});
		TelephonyUtils.waitUntilReady(latch, CHANGE_PERMISSION_TIMEOUT_MS);
		for (String pkg : dataServices) {
		mAppOps.setMode(AppOpsManager.OPSTR_MANAGE_IPSEC_TUNNELS, UserHandle.myUserId(),
		pkg, AppOpsManager.MODE_ERRORED);
		}
		} catch (RemoteException e) {
		} catch (RuntimeException e) {
		loge("Binder to package manager died; failed to revoke DataService permissions.");
		throw TelephonyUtils.rethrowAsRuntimeException(e);
		throw e;
		}
		}

		@@ -286,11 +307,7 @@ public class DataServiceManager extends Handler {
		// caches the service instance, but we need to explicitly request a new service
		// so it can be mocked out for tests
		mPermissionManager =
		IPermissionManager.Stub.asInterface(
		TelephonyFrameworkInitializer
		.getTelephonyServiceManager()
		.getPermissionManagerServiceRegisterer()
		.get());
		(PermissionManager) phone.getContext().getSystemService(Context.PERMISSION_SERVICE);
		mAppOps = (AppOpsManager) phone.getContext().getSystemService(Context.APP_OPS_SERVICE);

		IntentFilter intentFilter = new IntentFilter();
		@@ -776,5 +793,4 @@ public class DataServiceManager extends Handler {
		private void loge(String s) {
		Rlog.e(mTag, s);
		}

		}

src/java/com/android/internal/telephony/ims/ImsServiceController.java

+19 −7

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@

		package com.android.internal.telephony.ims;

		import android.app.AppGlobals;
		import android.content.ComponentName;
		import android.content.Context;
		import android.content.Intent;
		@@ -27,7 +26,7 @@ import android.os.IBinder;
		import android.os.IInterface;
		import android.os.RemoteException;
		import android.os.UserHandle;
		import android.permission.IPermissionManager;
		import android.permission.PermissionManager;
		import android.telephony.ims.ImsService;
		import android.telephony.ims.aidl.IImsConfig;
		import android.telephony.ims.aidl.IImsMmTelFeature;
		@@ -43,12 +42,14 @@ import com.android.ims.internal.IImsFeatureStatusCallback;
		import com.android.ims.internal.IImsServiceFeatureCallback;
		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.telephony.ExponentialBackoff;
		import com.android.internal.telephony.util.TelephonyUtils;

		import java.io.PrintWriter;
		import java.util.HashSet;
		import java.util.Iterator;
		import java.util.Set;
		import java.util.concurrent.ConcurrentHashMap;
		import java.util.concurrent.CountDownLatch;
		import java.util.stream.Collectors;

		/**
		@@ -197,9 +198,10 @@ public class ImsServiceController {
		private static final String LOG_TAG = "ImsServiceController";
		private static final int REBIND_START_DELAY_MS = 2 * 1000; // 2 seconds
		private static final int REBIND_MAXIMUM_DELAY_MS = 60 * 1000; // 1 minute
		private static final long CHANGE_PERMISSION_TIMEOUT_MS = 15 * 1000; // 15 seconds
		private final ComponentName mComponentName;
		private final HandlerThread mHandlerThread = new HandlerThread("ImsServiceControllerHandler");
		private final IPermissionManager mPermissionManager;
		private final PermissionManager mPermissionManager;
		private ImsServiceControllerCallbacks mCallbacks;
		private ExponentialBackoff mBackoff;

		@@ -334,7 +336,8 @@ public class ImsServiceController {
		2, /* multiplier */
		mHandlerThread.getLooper(),
		mRestartImsServiceRunnable);
		mPermissionManager = AppGlobals.getPermissionManager();
		mPermissionManager =
		(PermissionManager) mContext.getSystemService(Context.PERMISSION_SERVICE);
		}

		@VisibleForTesting
		@@ -648,10 +651,19 @@ public class ImsServiceController {
		String[] pkgToGrant = {mComponentName.getPackageName()};
		try {
		if (mPermissionManager != null) {
		mPermissionManager.grantDefaultPermissionsToEnabledImsServices(pkgToGrant,
		UserHandle.myUserId());
		CountDownLatch latch = new CountDownLatch(1);
		mPermissionManager.grantDefaultPermissionsToEnabledImsServices(
		pkgToGrant, UserHandle.of(UserHandle.myUserId()), Runnable::run,
		isSuccess -> {
		if (isSuccess) {
		latch.countDown();
		} else {
		Log.e(LOG_TAG, "Failed to grant permissions to service.");
		}
		} catch (RemoteException e) {
		});
		TelephonyUtils.waitUntilReady(latch, CHANGE_PERMISSION_TIMEOUT_MS);
		}
		} catch (RuntimeException e) {
		Log.w(LOG_TAG, "Unable to grant permissions, binder died.");
		}
		}

tests/telephonytests/src/com/android/internal/telephony/ContextFixture.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -262,6 +262,7 @@ public class ContextFixture implements TestFixture<Context> {
		return mBatteryStatsManager;
		case Context.DISPLAY_SERVICE:
		case Context.POWER_SERVICE:
		case Context.PERMISSION_SERVICE:
		// PowerManager and DisplayManager are final classes so cannot be mocked,
		// return real services.
		return TestApplication.getAppContext().getSystemService(name);