mirror of
https://github.com/topjohnwu/Magisk.git
synced 2025-12-10 07:12:18 +00:00
Merge remote-tracking branch 'john/master' into development
# Conflicts: # app/build.gradle # app/src/main/java/com/topjohnwu/magisk/App.java # app/src/main/java/com/topjohnwu/magisk/model/adapters/ReposAdapter.java # app/src/main/java/com/topjohnwu/magisk/model/update/UpdateCheckService.java # app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.java # app/src/main/java/com/topjohnwu/magisk/ui/SplashActivity.java # app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashActivity.java # app/src/main/java/com/topjohnwu/magisk/ui/home/MagiskFragment.java # app/src/main/java/com/topjohnwu/magisk/ui/log/LogFragment.java # app/src/main/java/com/topjohnwu/magisk/ui/surequest/SuRequestActivity.java # app/src/main/java/com/topjohnwu/magisk/utils/ValueSortedMap.java # app/src/main/java/com/topjohnwu/magisk/view/dialogs/InstallMethodDialog.java # app/src/main/java/com/topjohnwu/magisk/view/dialogs/MagiskInstallDialog.java # app/src/main/java/com/topjohnwu/magisk/view/dialogs/ManagerInstallDialog.java # build.gradle
This commit is contained in:
@@ -1,5 +1,7 @@
|
||||
package com.topjohnwu.magisk.utils;
|
||||
|
||||
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<>();
|
||||
|
||||
Reference in New Issue
Block a user