Coupl'a fixes related to broadcast dispatcher

- Throw an exception instead of a log that no one will see
- Use BroadcastDisaptcher#removeListener in NetworkControllerImpl
- Log NetworkControllerImpl#mListening in dumpsys

Bug: 153712245
Test: atest SystemUITests; manual
Change-Id: I3f4338bfe34126b0adc10ca0116c9149ffaa4115
This commit is contained in:
Evan Laird
2020-04-14 16:55:49 -04:00
parent a775f45d85
commit b7f2c697a6
2 changed files with 5 additions and 4 deletions

View File

@@ -25,7 +25,6 @@ import android.os.Looper
import android.os.Message
import android.os.UserHandle
import android.text.TextUtils
import android.util.Log
import android.util.SparseArray
import com.android.internal.annotations.VisibleForTesting
import com.android.systemui.Dumpable
@@ -34,6 +33,7 @@ import com.android.systemui.dagger.qualifiers.Main
import com.android.systemui.dump.DumpManager
import java.io.FileDescriptor
import java.io.PrintWriter
import java.lang.IllegalStateException
import java.util.concurrent.Executor
import javax.inject.Inject
import javax.inject.Singleton
@@ -189,8 +189,8 @@ open class BroadcastDispatcher @Inject constructor (
data.user.identifier
}
if (userId < UserHandle.USER_ALL) {
if (DEBUG) Log.w(TAG, "Register receiver for invalid user: $userId")
return
throw IllegalStateException(
"Attempting to register receiver for invalid user {$userId}")
}
val uBR = receiversByUser.get(userId, createUBRForUser(userId))
receiversByUser.put(userId, uBR)

View File

@@ -367,7 +367,7 @@ public class NetworkControllerImpl extends BroadcastReceiver
mobileSignalController.unregisterListener();
}
mSubscriptionManager.removeOnSubscriptionsChangedListener(mSubscriptionListener);
mContext.unregisterReceiver(this);
mBroadcastDispatcher.unregisterReceiver(this);
}
public int getConnectedWifiLevel() {
@@ -859,6 +859,7 @@ public class NetworkControllerImpl extends BroadcastReceiver
pw.println(" - telephony ------");
pw.print(" hasVoiceCallingFeature()=");
pw.println(hasVoiceCallingFeature());
pw.println(" mListening=" + mListening);
pw.println(" - connectivity ------");
pw.print(" mConnectedTransports=");