From 434835af8b4d00ebed210d2d380dd3b0456efd5c Mon Sep 17 00:00:00 2001 From: Jeremy Klein Date: Mon, 28 Dec 2015 15:11:58 -0800 Subject: [PATCH] Add a TETHER_PRIVILEGED permission and use it where needed. BUG: 26247383 Change-Id: I73f7227d77926faa9081e83eccb83c8ddee33e08 --- core/java/android/net/ConnectivityManager.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index 515e9a27ee..cabc6fabc3 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -23,7 +23,6 @@ import android.app.PendingIntent; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; -import android.net.NetworkUtils; import android.os.Binder; import android.os.Build.VERSION_CODES; import android.os.Handler; @@ -46,12 +45,12 @@ import com.android.internal.telephony.ITelephony; import com.android.internal.telephony.PhoneConstants; 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 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 * 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) // turn on tethering context.enforceCallingOrSelfPermission( - android.Manifest.permission.CONNECTIVITY_INTERNAL, "ConnectivityService"); + android.Manifest.permission.TETHER_PRIVILEGED, "ConnectivityService"); } else { int uid = Binder.getCallingUid(); Settings.checkAndNoteWriteSettingsOperation(context, uid, Settings