version:1.5.0707
bugfixes:allwinner接口优化至manager
This commit is contained in:
@@ -18,7 +18,6 @@ import android.content.pm.PackageInfo;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.content.pm.ResolveInfo;
|
||||
import android.content.pm.UserInfo;
|
||||
import android.cubemdm.cubemdmmanager.CubeMdmManager;
|
||||
import android.graphics.Bitmap;
|
||||
import android.net.ConnectivityManager;
|
||||
import android.net.NetworkInfo;
|
||||
@@ -60,6 +59,7 @@ import com.aoleyun.sn.comm.JGYActions;
|
||||
import com.aoleyun.sn.comm.PackageNames;
|
||||
import com.aoleyun.sn.disklrucache.CacheHelper;
|
||||
import com.aoleyun.sn.gson.GsonUtils;
|
||||
import com.aoleyun.sn.manager.AllwinnerCubeMdmManager;
|
||||
import com.aoleyun.sn.network.NetInterfaceManager;
|
||||
import com.aoleyun.sn.network.UrlAddress;
|
||||
import com.aoleyun.sn.receiver.BootReceiver;
|
||||
@@ -870,10 +870,7 @@ public class JgyUtils {
|
||||
if (blackList != null) {
|
||||
List<String> installedBlackApps = blackList.stream().filter(s -> ApkUtils.isAvailable(mContext, s)).collect(Collectors.toList());
|
||||
Log.e(TAG, "setAppNetwork: installedBlackApps = " + installedBlackApps);
|
||||
if (JgyUtils.isAllWinnerDevice()) {
|
||||
CubeMdmManager cubeMdmManager = (CubeMdmManager) mContext.getSystemService("cube_mdm");
|
||||
cubeMdmManager.setBlackNetApp(installedBlackApps);
|
||||
}
|
||||
AllwinnerCubeMdmManager.getInstance().setBlackNetApp(installedBlackApps);
|
||||
}
|
||||
|
||||
mMMKV.encode(CommonConfig.AOLE_ACTION_NETWORK_ALLOW, whiteList);
|
||||
@@ -1478,22 +1475,21 @@ public class JgyUtils {
|
||||
}
|
||||
ApkUtils.addShortcut(mContext);
|
||||
HashSet<String> pkgSet = new HashSet<>(defaultPackages);
|
||||
if (BuildConfig.DEBUG) {
|
||||
pkgSet.add("com.reqable.android");
|
||||
}
|
||||
pkgSet.addAll(pkgs);
|
||||
pkgSet.addAll(getWhitePkgList());
|
||||
pkgSet.removeIf(TextUtils::isEmpty);
|
||||
|
||||
if (JgyUtils.isAllWinnerDevice()) {
|
||||
CubeMdmManager cubeMdmManager = (CubeMdmManager) mContext.getSystemService("cube_mdm");
|
||||
cubeMdmManager.setInstallPackageWhiteList(new ArrayList<>(pkgSet));
|
||||
Log.e(TAG, "setInstallPackageWhiteList: " + pkgSet);
|
||||
} else {
|
||||
String aole_app_forbid = String.join(",", pkgSet);
|
||||
Log.e(TAG, "writeAppPackageList: " + aole_app_forbid);
|
||||
boolean b = Settings.System.putString(crv, CommonConfig.AOLE_ACTION_APP_FORBID, aole_app_forbid);
|
||||
setAppRestriction(2);
|
||||
addAppInstallWhiteList(new ArrayList<>(pkgSet));
|
||||
Log.e("writeAppPackageList: ", "aole_app_forbid: " + b + " " + Settings.System.getString(crv, CommonConfig.AOLE_ACTION_APP_FORBID));
|
||||
}
|
||||
AllwinnerCubeMdmManager.getInstance().setInstallPackageWhiteList(new ArrayList<>(pkgSet));
|
||||
|
||||
String aole_app_forbid = String.join(",", pkgSet);
|
||||
Log.e(TAG, "writeAppPackageList: " + aole_app_forbid);
|
||||
boolean b = Settings.System.putString(crv, CommonConfig.AOLE_ACTION_APP_FORBID, aole_app_forbid);
|
||||
setAppRestriction(2);
|
||||
addAppInstallWhiteList(new ArrayList<>(pkgSet));
|
||||
Log.e("writeAppPackageList: ", "aole_app_forbid: " + b + " " + Settings.System.getString(crv, CommonConfig.AOLE_ACTION_APP_FORBID));
|
||||
}
|
||||
|
||||
public void writeAppPackageList() {
|
||||
@@ -1503,19 +1499,17 @@ public class JgyUtils {
|
||||
return;
|
||||
}
|
||||
HashSet<String> pkgSet = new HashSet<>(defaultPackages);
|
||||
if (BuildConfig.DEBUG) {
|
||||
pkgSet.add("com.reqable.android");
|
||||
}
|
||||
pkgSet.addAll(getWhitePkgList());
|
||||
pkgSet.removeIf(TextUtils::isEmpty);
|
||||
|
||||
if (JgyUtils.isAllWinnerDevice()) {
|
||||
CubeMdmManager cubeMdmManager = (CubeMdmManager) mContext.getSystemService("cube_mdm");
|
||||
cubeMdmManager.setInstallPackageWhiteList(new ArrayList<>(pkgSet));
|
||||
Log.e(TAG, "setInstallPackageWhiteList: " + pkgSet);
|
||||
AllwinnerCubeMdmManager.getInstance().setInstallPackageWhiteList(new ArrayList<>(pkgSet));
|
||||
|
||||
} else {
|
||||
String aole_app_forbid = String.join(",", pkgSet);
|
||||
Log.e(TAG, "writeAppPackageList: " + aole_app_forbid);
|
||||
Settings.System.putString(crv, CommonConfig.AOLE_ACTION_APP_FORBID, aole_app_forbid);
|
||||
}
|
||||
String aole_app_forbid = String.join(",", pkgSet);
|
||||
Log.e(TAG, "writeAppPackageList: " + aole_app_forbid);
|
||||
Settings.System.putString(crv, CommonConfig.AOLE_ACTION_APP_FORBID, aole_app_forbid);
|
||||
}
|
||||
|
||||
public void checkForceDownload() {
|
||||
@@ -2099,12 +2093,8 @@ public class JgyUtils {
|
||||
if (Settings.Global.getInt(crv, Settings.Global.ADB_ENABLED, 0) != state) {
|
||||
Settings.Global.putInt(crv, Settings.Global.ADB_ENABLED, state);
|
||||
}
|
||||
if (JgyUtils.isAllWinnerDevice()) {
|
||||
CubeMdmManager cubeMdmManager = (CubeMdmManager) mContext.getSystemService("cube_mdm");
|
||||
cubeMdmManager.setDeveloperEnable(state == 1);
|
||||
Log.e(TAG, "setDeveloperEnable: " + (state == 1));
|
||||
}
|
||||
// }
|
||||
AllwinnerCubeMdmManager.getInstance().setDeveloperEnable(state == 1);
|
||||
}
|
||||
|
||||
private String chromium_pkg = "org.chromium.browser";
|
||||
@@ -2784,9 +2774,7 @@ public class JgyUtils {
|
||||
Log.e(TAG, "cubeMdmManager setDefaultLauncher: " + pkg + " is not installed");
|
||||
return;
|
||||
}
|
||||
CubeMdmManager cubeMdmManager = (CubeMdmManager) mContext.getSystemService("cube_mdm");
|
||||
cubeMdmManager.setDefaultLauncher(pkg);
|
||||
Log.e(TAG, "cubeMdmManager setDefaultLauncher: " + pkg);
|
||||
AllwinnerCubeMdmManager.getInstance().setDefaultLauncher(pkg);
|
||||
}
|
||||
|
||||
// ApkUtils.openPackage(mContext, pkg);
|
||||
@@ -3391,7 +3379,7 @@ public class JgyUtils {
|
||||
if (C2Tag.equals(BuildConfig.platform)) {
|
||||
Log.e("ITools", "addAppInstallWhiteList: " + packageNameList);
|
||||
try {
|
||||
if (mITools!=null) {
|
||||
if (mITools != null) {
|
||||
mITools.addAppInstallWhiteList(packageNameList);
|
||||
}
|
||||
} catch (RemoteException e) {
|
||||
@@ -3673,11 +3661,9 @@ public class JgyUtils {
|
||||
Log.e(TAG, "cubeMdmManager setDefaultInputMethod: " + pkg + " is not installed");
|
||||
return;
|
||||
}
|
||||
CubeMdmManager cubeMdmManager = (CubeMdmManager) mContext.getSystemService("cube_mdm");
|
||||
String componentName = JgyUtils.getInstance().getInputMethComponentName(pkg);
|
||||
Log.e(TAG, "setDefaultInputMethod: " + componentName);
|
||||
cubeMdmManager.setDefaultInputMethod(componentName);
|
||||
Log.e(TAG, "cubeMdmManager setDefaultInputMethod: " + componentName);
|
||||
AllwinnerCubeMdmManager.getInstance().setDefaultInputMethod(componentName);
|
||||
}
|
||||
|
||||
public String getInputMethComponentName(String pkg) {
|
||||
@@ -3707,10 +3693,8 @@ public class JgyUtils {
|
||||
Log.e(TAG, "cubeMdmManager setAllwinnerDefaulBrowser: " + pkg + " is not installed");
|
||||
return;
|
||||
}
|
||||
CubeMdmManager cubeMdmManager = (CubeMdmManager) mContext.getSystemService("cube_mdm");
|
||||
Log.e(TAG, "setAllwinnerDefaulBrowser: " + pkg);
|
||||
cubeMdmManager.setDefaultInputMethod(pkg);
|
||||
Log.e(TAG, "cubeMdmManager setAllwinnerDefaulBrowser: " + pkg);
|
||||
AllwinnerCubeMdmManager.getInstance().setDefaultInputMethod(pkg);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user