LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a TETHER_PRIVILEGED permission and use it where needed.

Browse Source 
BUG: 26247383
Change-Id: I73f7227d77926faa9081e83eccb83c8ddee33e08
This commit is contained in:
Jeremy Klein
2015-12-28 15:11:58 -08:00
parent 803faa182b
commit 434835af8b
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/net/ConnectivityManager.java
View File

@@ -23,7 +23,6 @@ import android.app.PendingIntent;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.net.NetworkUtils;
import android.os.Binder; import android.os.Binder;
import android.os.Build.VERSION_CODES; import android.os.Build.VERSION_CODES;
import android.os.Handler; import android.os.Handler;
@@ -46,12 +45,12 @@ import com.android.internal.telephony.ITelephony;
import com.android.internal.telephony.PhoneConstants; import com.android.internal.telephony.PhoneConstants;
import com.android.internal.util.Protocol; import com.android.internal.util.Protocol;
import java.net.InetAddress;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.HashMap;
import libcore.net.event.NetworkEventDispatcher; import libcore.net.event.NetworkEventDispatcher;
import java.net.InetAddress;
import java.util.HashMap;
import java.util.concurrent.atomic.AtomicInteger;
/** /**
* Class that answers queries about the state of network connectivity. It also * Class that answers queries about the state of network connectivity. It also
* notifies applications when network connectivity changes. Get an instance * notifies applications when network connectivity changes. Get an instance
@@ -1611,7 +1610,7 @@ public class ConnectivityManager {
// Have a provisioning app - must only let system apps (which check this app) // Have a provisioning app - must only let system apps (which check this app)
// turn on tethering // turn on tethering
context.enforceCallingOrSelfPermission( context.enforceCallingOrSelfPermission(
android.Manifest.permission.CONNECTIVITY_INTERNAL, "ConnectivityService"); android.Manifest.permission.TETHER_PRIVILEGED, "ConnectivityService");
} else { } else {
int uid = Binder.getCallingUid(); int uid = Binder.getCallingUid();
Settings.checkAndNoteWriteSettingsOperation(context, uid, Settings Settings.checkAndNoteWriteSettingsOperation(context, uid, Settings