LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add null check for the taken callback am: c57eb8c6ad

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1802597

Change-Id: I8fe9b5918e2af72d6edd7ae334f6062e32bbfdad
This commit is contained in:
Chiachang Wang
2021-08-20 05:13:41 +00:00
committed by Automerger Merge Worker
parent 945edff9b3 c57eb8c6ad
commit a03cf172bb
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
service-t/src/com/android/server/ethernet/EthernetServiceImpl.java
View File

@@ -35,6 +35,7 @@ import com.android.internal.util.IndentingPrintWriter;
import java.io.FileDescriptor; import java.io.FileDescriptor;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.util.Objects;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
/** /**
@@ -174,6 +175,7 @@ public class EthernetServiceImpl extends IEthernetManager.Stub {
@Override @Override
public void requestTetheredInterface(ITetheredInterfaceCallback callback) { public void requestTetheredInterface(ITetheredInterfaceCallback callback) {
Objects.requireNonNull(callback, "callback must not be null");
NetworkStack.checkNetworkStackPermissionOr(mContext, NetworkStack.checkNetworkStackPermissionOr(mContext,
android.Manifest.permission.NETWORK_SETTINGS); android.Manifest.permission.NETWORK_SETTINGS);
mTracker.requestTetheredInterface(callback); mTracker.requestTetheredInterface(callback);
@@ -181,6 +183,7 @@ public class EthernetServiceImpl extends IEthernetManager.Stub {
@Override @Override
public void releaseTetheredInterface(ITetheredInterfaceCallback callback) { public void releaseTetheredInterface(ITetheredInterfaceCallback callback) {
Objects.requireNonNull(callback, "callback must not be null");
NetworkStack.checkNetworkStackPermissionOr(mContext, NetworkStack.checkNetworkStackPermissionOr(mContext,
android.Manifest.permission.NETWORK_SETTINGS); android.Manifest.permission.NETWORK_SETTINGS);
mTracker.releaseTetheredInterface(callback); mTracker.releaseTetheredInterface(callback);