commit de7af7d67ebec81ddf6af340a0caf6d9eec27a3b
author Jeff Sharkey <jsharkey@google.com> Tue Jun 06 15:48:24 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jun 06 15:48:24 2017 +0000
tree c25568e0b8907787e1e711e4020740a90053a1c6
parent bc19fa42c0df7a13ba1a0932b57f4bdc177b8259
parent 0c4e23a3bf26ed9eed8e1745376396c21654db83

Merge "Annotate @SystemApi with required permissions." into oc-dev am: c1406978a4
am: 0c4e23a3bf

Change-Id: Ib629e25dbf047c110feaf03e4ff744b5c6df9aeb

core/java/android/net/ConnectivityManager.java

diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java
index d2636eb..fcb99b1 100644
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -21,6 +21,7 @@
 import android.annotation.SdkConstant;
 import android.annotation.SdkConstant.SdkConstantType;
 import android.annotation.SystemApi;
+import android.annotation.SystemService;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
@@ -64,9 +65,7 @@
 
 /**
  * Class that answers queries about the state of network connectivity. It also
- * notifies applications when network connectivity changes. Get an instance
- * of this class by calling
- * {@link android.content.Context#getSystemService(String) Context.getSystemService(Context.CONNECTIVITY_SERVICE)}.
+ * notifies applications when network connectivity changes.
  * <p>
  * The primary responsibilities of this class are to:
  * <ol>
@@ -80,6 +79,7 @@
  * traffic</li>
  * </ol>
  */
+@SystemService(Context.CONNECTIVITY_SERVICE)
 public class ConnectivityManager {
     private static final String TAG = "ConnectivityManager";
 
@@ -2110,6 +2110,7 @@
      * @hide
      */
     @SystemApi
+    @RequiresPermission(android.Manifest.permission.TETHER_PRIVILEGED)
     public void startTethering(int type, boolean showProvisioningUi,
             final OnStartTetheringCallback callback, Handler handler) {
         Preconditions.checkNotNull(callback, "OnStartTetheringCallback cannot be null.");
@@ -2146,6 +2147,7 @@
      * @hide
      */
     @SystemApi
+    @RequiresPermission(android.Manifest.permission.TETHER_PRIVILEGED)
     public void stopTethering(int type) {
         try {
             String pkgName = mContext.getOpPackageName();