diff options
author | 2025-01-30 05:33:50 +0000 | |
---|---|---|
committer | 2025-02-04 00:32:09 +0000 | |
commit | 9d3785d535cda8ad56f2341514943c7190f8bbcc (patch) | |
tree | 3685fc14a59fa22fcb62be3494e15dbbe33534b8 | |
parent | 57088b37d95d4c23aca8193bdcc419918cd7993a (diff) |
Remove a null check
Remove a null check in code that was recently added in ag/30576396.
This null check is not necessary anymore since the unit tests have been
updated.
Bug: 381002369
Flag: EXEMPT remove unnecessary check
Test: atest DocumentsUIGoogleTests:com.android.documentsui
Change-Id: I29d0f484988b99081084323711e938aab61b2662
-rw-r--r-- | src/com/android/documentsui/MenuManager.java | 5 | ||||
-rw-r--r-- | src/com/android/documentsui/base/Menus.java | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/com/android/documentsui/MenuManager.java b/src/com/android/documentsui/MenuManager.java index 1d53a9c32..126a777da 100644 --- a/src/com/android/documentsui/MenuManager.java +++ b/src/com/android/documentsui/MenuManager.java @@ -234,10 +234,7 @@ public abstract class MenuManager { Menus.setEnabledAndVisible(inspect, selectionDetails.size() == 1); - final MenuItem compress = menu.findItem(R.id.dir_menu_compress); - if (compress != null) { - updateCompress(compress, selectionDetails); - } + updateCompress(menu.findItem(R.id.dir_menu_compress), selectionDetails); } /** diff --git a/src/com/android/documentsui/base/Menus.java b/src/com/android/documentsui/base/Menus.java index eba240c83..6ceea3269 100644 --- a/src/com/android/documentsui/base/Menus.java +++ b/src/com/android/documentsui/base/Menus.java @@ -19,6 +19,8 @@ package com.android.documentsui.base; import android.view.Menu; import android.view.MenuItem; +import androidx.annotation.NonNull; + public final class Menus { private Menus() {} @@ -41,7 +43,7 @@ public final class Menus { } /** Set enabled/disabled state of a menuItem, and updates its visibility. */ - public static void setEnabledAndVisible(MenuItem item, boolean enabled) { + public static void setEnabledAndVisible(@NonNull MenuItem item, boolean enabled) { item.setEnabled(enabled); item.setVisible(enabled); } |