diff --git a/AndroidManifest-common.xml b/AndroidManifest-common.xml index e032b2f..90168ed 100644 --- a/AndroidManifest-common.xml +++ b/AndroidManifest-common.xml @@ -36,6 +36,7 @@ android:permissionGroup="android.permission-group.SYSTEM_TOOLS" android:protectionLevel="dangerous" /> + diff --git a/build.gradle b/build.gradle index 5a4a7df..f8bc9b6 100644 --- a/build.gradle +++ b/build.gradle @@ -65,12 +65,14 @@ android { defaultConfig { minSdkVersion 26 targetSdkVersion 28 + //MTK versionCode 13 versionName "2.2" // //cube // versionCode 36 // versionName "4.5" + ndk { //选择要添加的对应 cpu 类型的 .so 库。 abiFilters 'armeabi', 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64' diff --git a/src/com/aoleyun/os/Launcher.java b/src/com/aoleyun/os/Launcher.java index b2d52b7..99b7771 100644 --- a/src/com/aoleyun/os/Launcher.java +++ b/src/com/aoleyun/os/Launcher.java @@ -1289,7 +1289,9 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns, if (appPasswdBeans != null) { for (AppPasswdBean bean : appPasswdBeans) { Log.e(TAG, "removeRecentTask: " + bean.getApp_package()); - Utils.removeTask(bean.getApp_package()); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { + Utils.removeTask(bean.getApp_package()); + } } } } diff --git a/src/com/aoleyun/os/model/LoaderTask.java b/src/com/aoleyun/os/model/LoaderTask.java index cc0af73..7ea2cbc 100644 --- a/src/com/aoleyun/os/model/LoaderTask.java +++ b/src/com/aoleyun/os/model/LoaderTask.java @@ -316,18 +316,18 @@ public class LoaderTask implements Runnable { final List profiles = mUserManager.getUserProfiles(); String whiteList = Settings.System.getString(crv, JGYActions.ACTION_JGY_SHORTCUTLIST); Log.e("verifyApplications", "whiteList: " + whiteList); + int aihuaUnlock = Settings.Global.getInt(context.getContentResolver(), "Aihua_unlock_state", 0); + Log.e(TAG, "verifyApplications: aihuaUnlock = " + aihuaUnlock); for (UserHandle user : profiles) { final List apps = mLauncherApps.getActivityList(null, user); ArrayList added = new ArrayList(); synchronized (this) { - for (LauncherActivityInfo app : apps) { Log.e("verifyApplications", "AllAPP: " + app.getApplicationInfo().packageName); if (BuildConfig.APPLICATION_ID.equals(app.getApplicationInfo().packageName)) continue; /*系统应用*/ - int aihuaUnlock = Settings.Global.getInt(context.getContentResolver(), "Aihua_unlock_state", 0); - if (JGYUtils.getInstance().getDeviceIsLocked() || aihuaUnlock == 1) { + if (JGYUtils.getInstance().getDeviceIsLocked() && aihuaUnlock != 1) { if ((app.getApplicationFlags() & ApplicationInfo.FLAG_SYSTEM) == 1) { if (!showApp.contains(app.getApplicationInfo().packageName)) { Log.e("verifyApplications", "skip1: " + app.getApplicationInfo().packageName); diff --git a/src/com/aoleyun/os/uiuiutils/Utils.java b/src/com/aoleyun/os/uiuiutils/Utils.java index c35baeb..beda636 100644 --- a/src/com/aoleyun/os/uiuiutils/Utils.java +++ b/src/com/aoleyun/os/uiuiutils/Utils.java @@ -4,6 +4,7 @@ import android.annotation.SuppressLint; import android.app.ActivityManager; import android.app.ActivityManagerNative; import android.app.ActivityTaskManager; +import android.app.IActivityTaskManager; import android.content.Context; import android.content.pm.UserInfo; import android.os.Build; @@ -99,9 +100,10 @@ public class Utils { */ public static List getRecentTasks(int numTasks, int userId) { try { - return ActivityTaskManager.getService().getRecentTasks(numTasks, + IActivityTaskManager iActivityTaskManager = ActivityTaskManager.getService(); + return iActivityTaskManager.getRecentTasks(numTasks, RECENT_IGNORE_UNAVAILABLE, userId).getList(); - } catch (RemoteException e) { + } catch (Exception e) { Log.e(TAG, "Failed to get recent tasks " + e); return new ArrayList<>(); }