launcher3: Improve SimpleBroadcastReceiver.
Unless explicitly annotated, parameters in java are by default nullable. There are a few cases where a null context may be passed to the unregisterReceiverSafely function of SimpleBroadcastReceiver. To mitigate misuses or incorrect contexts being passed for register vs unregister, keep the context as a strong reference in the constructor. Also added NonNull annotations for any public callsites to enforce behavior. Bug: 395019017, 395966395 Flag: NONE - bug fixed Test: manual - presubmit Change-Id: Ie371fa45cadceaf51cf184b446df9123ef27c337
This commit is contained in:
1 parent
4425ab3062
commit
1b26bb4a74
16 files changed
+118
-113
No files matched your search
@@ -109,9 +109,9 @@ public final class WellbeingModel implements SafeCloseable {
|
||||
? Executors.UI_HELPER_EXECUTOR.getLooper()
|
||||
: Executors.getPackageExecutor(mWellbeingProviderPkg).getLooper());
|
||||
mWellbeingAppChangeReceiver =
|
||||
new SimpleBroadcastReceiver(mWorkerHandler, t -> restartObserver());
|
||||
new SimpleBroadcastReceiver(context, mWorkerHandler, t -> restartObserver());
|
||||
mAppAddRemoveReceiver =
|
||||
new SimpleBroadcastReceiver(mWorkerHandler, this::onAppPackageChanged);
|
||||
new SimpleBroadcastReceiver(context, mWorkerHandler, this::onAppPackageChanged);
|
||||
|
||||
|
||||
mContentObserver = new ContentObserver(mWorkerHandler) {
|
||||
@@ -148,8 +148,8 @@ public final class WellbeingModel implements SafeCloseable {
|
||||
public void close() {
|
||||
if (!TextUtils.isEmpty(mWellbeingProviderPkg)) {
|
||||
mWorkerHandler.post(() -> {
|
||||
mWellbeingAppChangeReceiver.unregisterReceiverSafely(mContext);
|
||||
mAppAddRemoveReceiver.unregisterReceiverSafely(mContext);
|
||||
mWellbeingAppChangeReceiver.unregisterReceiverSafely();
|
||||
mAppAddRemoveReceiver.unregisterReceiverSafely();
|
||||
mContext.getContentResolver().unregisterContentObserver(mContentObserver);
|
||||
});
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user