From 357eb2c2f84dd8e0b354c574d7eb801300e623e0 Mon Sep 17 00:00:00 2001 From: Kweku Adams Date: Tue, 3 Jan 2023 16:42:09 +0000 Subject: [PATCH] Remove unnecessary null check. The StorageController is initialized in JobSchedulerService's constructor and is never null, so the null check is unnecessary. Bug: 141645789 Test: atest CtsJobSchedulerTestCases Change-Id: I97d204cffc435cbe6c3146e7e7691ef8aaf63513 --- .../java/com/android/server/job/JobSchedulerService.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java b/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java index c7a2997d8fcc4..8794e20ca5e7b 100644 --- a/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java +++ b/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java @@ -4297,14 +4297,13 @@ public class JobSchedulerService extends com.android.server.SystemService int getStorageSeq() { synchronized (mLock) { - return mStorageController != null ? mStorageController.getTracker().getSeq() : -1; + return mStorageController.getTracker().getSeq(); } } boolean getStorageNotLow() { synchronized (mLock) { - return mStorageController != null - ? mStorageController.getTracker().isStorageNotLow() : false; + return mStorageController.getTracker().isStorageNotLow(); } }