Merge "Annotate @SystemApi with required permissions." into oc-dev

am: c1406978a4

Change-Id: I305967cad945a807c3f8234efabaad0ef8b591d1

diff --cc core/java/android/content/Context.java
Simple merge

diff --cc core/java/android/hardware/radio/RadioManager.java
Simple merge

diff --cc core/java/android/net/ConnectivityManager.java
index d2636eb,e64cbcd..fcb99b1
--- 1/core/java/android/net/ConnectivityManager.java
--- 2/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@@ -2110,9 -2105,10 +2110,10 @@@ public class ConnectivityManager 
       * @hide
       */
      @SystemApi
+     @RequiresPermission(android.Manifest.permission.TETHER_PRIVILEGED)
      public void startTethering(int type, boolean showProvisioningUi,
              final OnStartTetheringCallback callback, Handler handler) {
 -        checkNotNull(callback, "OnStartTetheringCallback cannot be null.");
 +        Preconditions.checkNotNull(callback, "OnStartTetheringCallback cannot be null.");
  
          ResultReceiver wrappedCallback = new ResultReceiver(handler) {
              @Override
@@@ -2146,11 -2140,10 +2147,12 @@@
       * @hide
       */
      @SystemApi
+     @RequiresPermission(android.Manifest.permission.TETHER_PRIVILEGED)
      public void stopTethering(int type) {
          try {
 -            mService.stopTethering(type);
 +            String pkgName = mContext.getOpPackageName();
 +            Log.i(TAG, "stopTethering caller:" + pkgName);
 +            mService.stopTethering(type, pkgName);
          } catch (RemoteException e) {
              throw e.rethrowFromSystemServer();
          }

diff --cc core/java/android/net/IpSecManager.java
index 0240cf1,e3cda5e..2f791e1
--- 1/core/java/android/net/IpSecManager.java
--- 2/core/java/android/net/IpSecManager.java
+++ b/core/java/android/net/IpSecManager.java
@@@ -18,7 -18,10 +18,9 @@@ package android.net
  import static com.android.internal.util.Preconditions.checkNotNull;
  
  import android.annotation.NonNull;
+ import android.annotation.SystemService;
+ import android.content.Context;
  import android.os.Binder;
 -import android.os.Bundle;
  import android.os.ParcelFileDescriptor;
  import android.os.RemoteException;
  import android.util.AndroidException;

diff --cc core/java/android/net/nsd/NsdManager.java
index 27ca6e2,2d480a1..1e41eea
--- 1/core/java/android/net/nsd/NsdManager.java
--- 2/core/java/android/net/nsd/NsdManager.java
+++ b/core/java/android/net/nsd/NsdManager.java
@@@ -16,11 -16,8 +16,12 @@@
  
  package android.net.nsd;
  
 +import static com.android.internal.util.Preconditions.checkArgument;
 +import static com.android.internal.util.Preconditions.checkNotNull;
 +import static com.android.internal.util.Preconditions.checkStringNotEmpty;
 +
  import android.annotation.SdkConstant;
+ import android.annotation.SystemService;
  import android.annotation.SdkConstant.SdkConstantType;
  import android.content.Context;
  import android.os.Handler;

diff --cc core/java/android/os/RecoverySystem.java
Simple merge

diff --cc telephony/java/android/telephony/CarrierConfigManager.java
Simple merge

diff --cc telephony/java/android/telephony/TelephonyManager.java
Simple merge

diff --cc wifi/java/android/net/wifi/aware/WifiAwareManager.java
Simple merge