joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Make tetherChangePermission to be secured for AppOps permission"

Browse source
This commit is contained in:
Erik Kline 2017-04-20 04:28:52 +00:00 • committed by Gerrit Code Review
commit fd01e5ee14
1 changed files with 44 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

24
services/core/java/com/android/server/ConnectivityService.java
View file

@ -2949,8 +2949,8 @@ public class ConnectivityService extends IConnectivityManager.Stub
// javadoc from interface
@Override
public int tether(String iface) {
ConnectivityManager.enforceTetherChangePermission(mContext);
public int tether(String iface, String callerPkg) {
ConnectivityManager.enforceTetherChangePermission(mContext, callerPkg);
if (isTetheringSupported()) {
final int status = mTethering.tether(iface);
return status;
@ -2961,8 +2961,8 @@ public class ConnectivityService extends IConnectivityManager.Stub
// javadoc from interface
@Override
public int untether(String iface) {
ConnectivityManager.enforceTetherChangePermission(mContext);
public int untether(String iface, String callerPkg) {
ConnectivityManager.enforceTetherChangePermission(mContext, callerPkg);
if (isTetheringSupported()) {
final int status = mTethering.untether(iface);
@ -3016,8 +3016,8 @@ public class ConnectivityService extends IConnectivityManager.Stub
}
@Override
public int setUsbTethering(boolean enable) {
ConnectivityManager.enforceTetherChangePermission(mContext);
public int setUsbTethering(boolean enable, String callerPkg) {
ConnectivityManager.enforceTetherChangePermission(mContext, callerPkg);
if (isTetheringSupported()) {
return mTethering.setUsbTethering(enable);
} else {
@ -3076,8 +3076,9 @@ public class ConnectivityService extends IConnectivityManager.Stub
}
@Override
public void startTethering(int type, ResultReceiver receiver, boolean showProvisioningUi) {
ConnectivityManager.enforceTetherChangePermission(mContext);
public void startTethering(int type, ResultReceiver receiver, boolean showProvisioningUi,
String callerPkg) {
ConnectivityManager.enforceTetherChangePermission(mContext, callerPkg);
if (!isTetheringSupported()) {
receiver.send(ConnectivityManager.TETHER_ERROR_UNSUPPORTED, null);
return;
@ -3086,8 +3087,8 @@ public class ConnectivityService extends IConnectivityManager.Stub
}
@Override
public void stopTethering(int type) {
ConnectivityManager.enforceTetherChangePermission(mContext);
public void stopTethering(int type, String callerPkg) {
ConnectivityManager.enforceTetherChangePermission(mContext, callerPkg);
mTethering.stopTethering(type);
}
@ -5465,8 +5466,9 @@ public class ConnectivityService extends IConnectivityManager.Stub
if (!mUserManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_TETHERING)) {
// Untether
String pkgName = mContext.getOpPackageName();
for (String tether : getTetheredIfaces()) {
untether(tether);
untether(tether, pkgName);
}
}