Merge "Grant AppOp fine location to data service dynamically" (240d5ece) · Commits · e / os / android_frameworks_opt_telephony

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

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -149,6 +149,8 @@ public class DataServiceManager extends Handler {
	TelephonyUtils.waitUntilReady(latch, CHANGE_PERMISSION_TIMEOUT_MS);		TelephonyUtils.waitUntilReady(latch, CHANGE_PERMISSION_TIMEOUT_MS);
	mAppOps.setMode(AppOpsManager.OPSTR_MANAGE_IPSEC_TUNNELS,		mAppOps.setMode(AppOpsManager.OPSTR_MANAGE_IPSEC_TUNNELS,
	UserHandle.myUserId(), pkgToGrant[0], AppOpsManager.MODE_ALLOWED);		UserHandle.myUserId(), pkgToGrant[0], AppOpsManager.MODE_ALLOWED);
			mAppOps.setMode(AppOpsManager.OPSTR_FINE_LOCATION,
			UserHandle.myUserId(), pkgToGrant[0], AppOpsManager.MODE_ALLOWED);
	} catch (RuntimeException e) {		} catch (RuntimeException e) {
	loge("Binder to package manager died, permission grant for DataService failed.");		loge("Binder to package manager died, permission grant for DataService failed.");
	throw e;		throw e;
	@@ -183,6 +185,8 @@ public class DataServiceManager extends Handler {
	for (String pkg : dataServices) {		for (String pkg : dataServices) {
	mAppOps.setMode(AppOpsManager.OPSTR_MANAGE_IPSEC_TUNNELS, UserHandle.myUserId(),		mAppOps.setMode(AppOpsManager.OPSTR_MANAGE_IPSEC_TUNNELS, UserHandle.myUserId(),
	pkg, AppOpsManager.MODE_ERRORED);		pkg, AppOpsManager.MODE_ERRORED);
			mAppOps.setMode(AppOpsManager.OPSTR_FINE_LOCATION, UserHandle.myUserId(),
			pkg, AppOpsManager.MODE_ERRORED);
	}		}
	} catch (RuntimeException e) {		} catch (RuntimeException e) {
	loge("Binder to package manager died; failed to revoke DataService permissions.");		loge("Binder to package manager died; failed to revoke DataService permissions.");