Upgrade Android Studio

app-core/src/main/java/com/topjohnwu/magisk/Const.java

@@ -4,8 +4,6 @@ import android.os.Environment;
 import android.os.Process;
 
 import java.io.File;
-import java.util.Arrays;
-import java.util.List;
 
 public class Const {
 

app-core/src/main/java/com/topjohnwu/magisk/container/BaseModule.java

@@ -5,10 +5,10 @@ import android.database.Cursor;
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import java.util.List;
-
 import androidx.annotation.NonNull;
 
+import java.util.List;
+
 public abstract class BaseModule implements Comparable<BaseModule>, Parcelable {
 
     private String mId, mName, mVersion, mAuthor, mDescription;

app-core/src/main/java/com/topjohnwu/magisk/container/Policy.java

@@ -4,10 +4,10 @@ import android.content.ContentValues;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 
-import com.topjohnwu.magisk.utils.Utils;
-
 import androidx.annotation.NonNull;
 
+import com.topjohnwu.magisk.utils.Utils;
+
 
 public class Policy implements Comparable<Policy>{
     public static final int INTERACTIVE = 0;

app-core/src/main/java/com/topjohnwu/magisk/container/ValueSortedMap.java

@@ -1,5 +1,7 @@
 package com.topjohnwu.magisk.container;
 
+import androidx.annotation.NonNull;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -7,8 +9,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import androidx.annotation.NonNull;
-
 public class ValueSortedMap<K, V extends Comparable<? super V>> extends HashMap<K, V> {
 
     private List<V> sorted = new ArrayList<>();

app-core/src/main/java/com/topjohnwu/magisk/tasks/MagiskInstaller.java

@@ -4,6 +4,9 @@ import android.net.Uri;
 import android.os.Build;
 import android.text.TextUtils;
 
+import androidx.annotation.MainThread;
+import androidx.annotation.WorkerThread;
+
 import com.topjohnwu.magisk.App;
 import com.topjohnwu.magisk.Config;
 import com.topjohnwu.magisk.Const;
@@ -37,9 +40,6 @@ import java.util.List;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
-import androidx.annotation.MainThread;
-import androidx.annotation.WorkerThread;
-
 public abstract class MagiskInstaller {
 
     private List<String> console, logs;

app-core/src/main/java/com/topjohnwu/magisk/utils/LocaleManager.java

@@ -6,6 +6,8 @@ import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.os.Build;
 
+import androidx.annotation.StringRes;
+
 import com.topjohnwu.magisk.App;
 import com.topjohnwu.magisk.Config;
 import com.topjohnwu.superuser.Shell;
@@ -17,8 +19,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 
-import androidx.annotation.StringRes;
-
 public class LocaleManager {
     public static Locale locale = Locale.getDefault();
     public final static Locale defaultLocale = Locale.getDefault();

app-core/src/main/java/com/topjohnwu/magisk/utils/RootUtils.java

@@ -2,6 +2,8 @@ package com.topjohnwu.magisk.utils;
 
 import android.content.Context;
 
+import androidx.annotation.NonNull;
+
 import com.topjohnwu.magisk.Config;
 import com.topjohnwu.magisk.Const;
 import com.topjohnwu.magisk.core.R;
@@ -11,8 +13,6 @@ import com.topjohnwu.superuser.io.SuFile;
 
 import java.io.InputStream;
 
-import androidx.annotation.NonNull;
-
 public class RootUtils extends Shell.Initializer {
 
     public static void rmAndLaunch(String rm, String launch) {

app-core/src/main/java/com/topjohnwu/magisk/utils/Topic.java

@@ -1,5 +1,7 @@
 package com.topjohnwu.magisk.utils;
 
+import androidx.annotation.IntDef;
+
 import com.topjohnwu.superuser.internal.UiThreadHandler;
 
 import java.lang.annotation.Retention;
@@ -7,8 +9,6 @@ import java.lang.annotation.RetentionPolicy;
 import java.util.HashSet;
 import java.util.Set;
 
-import androidx.annotation.IntDef;
-
 public class Topic {
 
     public static final int MAGISK_HIDE_DONE = 0;