Fix loading bug when switching filters.

Also auto fix some lint issues.

Bug: 243337537
Test: Manual
Change-Id: I55a393517ae01d6a8c17106a3e7750323838cebb
(cherry picked from commit 67599bce4e)
Merged-In: I55a393517ae01d6a8c17106a3e7750323838cebb

src/com/android/settings/applications/manageapplications/ManageApplications.java

@@ -920,6 +920,7 @@ public class ManageApplications extends InstrumentedFragment
 
     /**
      * Returns a resource ID of title based on what type of app list is
+     *
      * @param intent the intent of the activity that might include a specified title
      * @param args   the args that includes a class name of app list
      */
@@ -1194,11 +1195,11 @@ public class ManageApplications extends InstrumentedFragment
                 } else {
                     rebuild(R.id.sort_order_alpha, true);
                 }
+                return;
             } else if (mManageApplications.mListType == LIST_TYPE_BATTERY_OPTIMIZATION) {
                 logAppBatteryUsage(filterType);
-            } else {
-                rebuild();
             }
+            rebuild();
         }
 
         public void resume(int sort) {
@@ -1333,7 +1334,7 @@ public class ManageApplications extends InstrumentedFragment
         }
 
         private void logAppBatteryUsage(int filterType) {
-            switch(filterType) {
+            switch (filterType) {
                 case FILTER_APPS_BATTERY_UNRESTRICTED:
                     logAction(SettingsEnums.ACTION_BATTERY_OPTIMIZED_APPS_FILTER_UNRESTRICTED);
                     break;
@@ -1558,6 +1559,7 @@ public class ManageApplications extends InstrumentedFragment
 
         /**
          * Check item in the list shall enable or disable.
+         *
          * @param position The item position in the list
          */
         public boolean isEnabled(int position) {