From d6114b0eda2c026f20a2d2f24de7992935e38ce0 Mon Sep 17 00:00:00 2001
From: Jeremy Klein <jlklein@google.com>
Date: Sat, 12 Mar 2016 16:29:54 -0800
Subject: [PATCH] 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 35e99ea8ef62482b81c0ce043fcd5acc96ad257d)

Change-Id: Ia419ff68ef10f308f9e44be47420e27099ee6070
---
 core/java/android/net/ConnectivityManager.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java
index 43c8c81da2..772a2ccc57 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) {