diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/net/ConnectivityManager.java | 2 | ||||
| -rw-r--r-- | core/java/android/net/MobileDataStateTracker.java | 8 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 4 |
3 files changed, 8 insertions, 6 deletions
diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index 6ac126e..3a35cb9 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -800,6 +800,8 @@ public class ConnectivityManager { * Ensure that a network route exists to deliver traffic to the specified * host via the specified network interface. An attempt to add a route that * already exists is ignored, but treated as successful. + * <p>This method requires the caller to hold the permission + * {@link android.Manifest.permission#CHANGE_NETWORK_STATE}. * @param networkType the type of the network over which traffic to the specified * host is to be routed * @param hostAddress the IP address of the host to which the route is desired diff --git a/core/java/android/net/MobileDataStateTracker.java b/core/java/android/net/MobileDataStateTracker.java index d9c35c0..3c3d8ec 100644 --- a/core/java/android/net/MobileDataStateTracker.java +++ b/core/java/android/net/MobileDataStateTracker.java @@ -306,18 +306,18 @@ public class MobileDataStateTracker extends BaseNetworkStateTracker { if (VDBG) { Slog.d(TAG, "TelephonyMgr.DataConnectionStateChanged"); if (mNetworkInfo != null) { - Slog.d(TAG, "NetworkInfo = " + mNetworkInfo.toString()); - Slog.d(TAG, "subType = " + String.valueOf(mNetworkInfo.getSubtype())); + Slog.d(TAG, "NetworkInfo = " + mNetworkInfo); + Slog.d(TAG, "subType = " + mNetworkInfo.getSubtype()); Slog.d(TAG, "subType = " + mNetworkInfo.getSubtypeName()); } if (mLinkProperties != null) { - Slog.d(TAG, "LinkProperties = " + mLinkProperties.toString()); + Slog.d(TAG, "LinkProperties = " + mLinkProperties); } else { Slog.d(TAG, "LinkProperties = " ); } if (mLinkCapabilities != null) { - Slog.d(TAG, "LinkCapabilities = " + mLinkCapabilities.toString()); + Slog.d(TAG, "LinkCapabilities = " + mLinkCapabilities); } else { Slog.d(TAG, "LinkCapabilities = " ); } diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 315b119..7ea08af 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -583,7 +583,7 @@ <!-- =============================================================== --> <eat-comment /> - <!-- Used for permissions that provide access to the user voicemail box. --> + <!-- Used for permissions that provide access to device alarms. --> <permission-group android:name="android.permission-group.DEVICE_ALARMS" android:label="@string/permgrouplab_deviceAlarms" android:icon="@drawable/perm_group_device_alarms" @@ -1061,7 +1061,7 @@ <!-- =========================================== --> <eat-comment /> - <!-- Used for permissions that are associated with accessing and modifyign + <!-- Used for permissions that are associated with accessing and modifying telephony state: placing calls, intercepting outgoing calls, reading and modifying the phone state. --> <permission-group android:name="android.permission-group.PHONE_CALLS" |