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

(cherry picked from commit fb63d5a4ef03fa95ae25549bbb50bbd301bb61e4)

Change-Id: Ia5f328c4b25aa6624dc3c8493eb0c7bbab99904c
---
 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 21c5cc5612..be33faef4d 100644
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -2093,6 +2093,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) {
@@ -2103,6 +2105,7 @@ public class ConnectivityManager {
                 }
             }
         };
+
         try {
             mService.startTethering(type, wrappedCallback, showProvisioningUi);
         } catch (RemoteException e) {