From: Jeremy Klein <jlklein@google.com>
Date: Sun, 13 Mar 2016 00:29:54 +0000 (-0800)
Subject: DO NOT MERGE: Add a null check for the OnStartTetheringCallback.
X-Git-Tag: android-x86-8.1-r1~2121^2~232^2~421^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c8e4cc8e9919260dac5f2f8a76b693e8a29bfcc1;p=android-x86%2Fframeworks-base.git

DO NOT MERGE: Add a null check for the OnStartTetheringCallback.

This avoids a NullPointerException when trying to call the callback
and gives a more readable error message.

(cherry picked from commit 5f277e1667b49976a77c9fa79b9a04d775f3b49e)

Change-Id: Ia419ff68ef10f308f9e44be47420e27099ee6070
---

diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java
index 43c8c81da266..772a2ccc57a5 100644
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -2079,6 +2079,8 @@ public class ConnectivityManager {
     @SystemApi
     public void startTethering(int type, boolean showProvisioningUi,
             final OnStartTetheringCallback callback, Handler handler) {
+        checkNotNull(callback, "OnStartTetheringCallback cannot be null.");
+
         ResultReceiver wrappedCallback = new ResultReceiver(handler) {
             @Override
             protected void onReceiveResult(int resultCode, Bundle resultData) {
@@ -2089,6 +2091,7 @@ public class ConnectivityManager {
                 }
             }
         };
+
         try {
             mService.startTethering(type, wrappedCallback, showProvisioningUi);
         } catch (RemoteException e) {