joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Add more consistent null checks" into main

Browse source
This commit is contained in:
Treehugger Robot 2024-07-09 21:37:51 +00:00 • committed by Gerrit Code Review
commit 2a3d34413c
3 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Tethering/common/TetheringLib/src/android/net/TetheringManager.java
View file

@ -1379,6 +1379,9 @@ public class TetheringManager {
@RequiresPermission(Manifest.permission.ACCESS_NETWORK_STATE)
public void registerTetheringEventCallback(@NonNull Executor executor,
@NonNull TetheringEventCallback callback) {
Objects.requireNonNull(executor);
Objects.requireNonNull(callback);
final String callerPkg = mContext.getOpPackageName();
Log.i(TAG, "registerTetheringEventCallback caller:" + callerPkg);
@ -1533,6 +1536,8 @@ public class TetheringManager {
Manifest.permission.ACCESS_NETWORK_STATE
})
public void unregisterTetheringEventCallback(@NonNull final TetheringEventCallback callback) {
Objects.requireNonNull(callback);
final String callerPkg = mContext.getOpPackageName();
Log.i(TAG, "unregisterTetheringEventCallback caller:" + callerPkg);

6
Tethering/src/com/android/networkstack/tethering/Tethering.java
View file

@ -2397,9 +2397,6 @@ public class Tethering {
hasCallingPermission(NETWORK_SETTINGS)
|| hasCallingPermission(PERMISSION_MAINLINE_NETWORK_STACK)
|| hasCallingPermission(NETWORK_STACK);
if (callback == null) {
throw new NullPointerException();
}
mHandler.post(() -> {
mTetheringEventCallbacks.register(callback, new CallbackCookie(hasListPermission));
final TetheringCallbackStartedParcel parcel = new TetheringCallbackStartedParcel();
@ -2437,9 +2434,6 @@ public class Tethering {
/** Unregister tethering event callback */
void unregisterTetheringEventCallback(ITetheringEventCallback callback) {
if (callback == null) {
throw new NullPointerException();
}
mHandler.post(() -> {
mTetheringEventCallbacks.unregister(callback);
});

4
Tethering/src/com/android/networkstack/tethering/TetheringService.java
View file

@ -164,6 +164,8 @@ public class TetheringService extends Service {
@Override
public void registerTetheringEventCallback(ITetheringEventCallback callback,
String callerPkg) {
// Silently ignore call if the callback is null. This can only happen via reflection.
if (callback == null) return;
try {
if (!hasTetherAccessPermission()) {
callback.onCallbackStopped(TETHER_ERROR_NO_ACCESS_TETHERING_PERMISSION);
@ -176,6 +178,8 @@ public class TetheringService extends Service {
@Override
public void unregisterTetheringEventCallback(ITetheringEventCallback callback,
String callerPkg) {
// Silently ignore call if the callback is null. This can only happen via reflection.
if (callback == null) return;
try {
if (!hasTetherAccessPermission()) {
callback.onCallbackStopped(TETHER_ERROR_NO_ACCESS_TETHERING_PERMISSION);