Skip to content

[#645]系统应用判断条件增加FLAG_UPDATED_SYSTEM_APP，并统一使用PackageUtils进行判断 #646

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[#645]系统应用判断条件增加FLAG_UPDATED_SYSTEM_APP，并统一使用PackageUtils进行判断 #646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 1 addition & 23 deletions ...time/android/features/src/main/java/org/hapjs/features/geolocation/util/PackageUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
/*
* Copyright (c) 2021, the hapjs-platform Project Contributors
* Copyright (c) 2021-present, the hapjs-platform Project Contributors
* SPDX-License-Identifier: Apache-2.0
*/

package org.hapjs.features.geolocation.util;

import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.util.Log;
Expand Down Expand Up @@ -81,25 +80,4 @@ public static String getAppVersionName(Context context, String packageName) {
}
return null;
}

public static boolean isSystemApp(Context context, String remotePkg) {
if (context == null) {
return false;
}
PackageManager pm = context.getPackageManager();
if (pm == null) {
return false;
}

ApplicationInfo applicationInfo = null;
try {
applicationInfo = pm.getApplicationInfo(remotePkg, PackageManager.GET_META_DATA);
} catch (PackageManager.NameNotFoundException e) {
Log.e(TAG, "isSystemApp: ", e);
}
return applicationInfo != null
&& (applicationInfo.flags
& (ApplicationInfo.FLAG_SYSTEM | ApplicationInfo.FLAG_UPDATED_SYSTEM_APP))
!= 0;
}
}
18 changes: 3 additions & 15 deletions core/runtime/android/runtime/src/main/java/org/hapjs/analyzer/monitors/CpuMonitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
/*
* Copyright (c) 2022, the hapjs-platform Project Contributors
* Copyright (c) 2022-present, the hapjs-platform Project Contributors
* SPDX-License-Identifier: Apache-2.0
*/

package org.hapjs.analyzer.monitors;

import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo;
import android.os.Build;
import android.os.Process;
import android.text.TextUtils;
import android.util.Log;

import org.hapjs.analyzer.monitors.abs.AbsTimerMonitor;
import org.hapjs.common.utils.FileUtils;
import org.hapjs.common.utils.PackageUtils;
import org.hapjs.runtime.Runtime;

import java.io.BufferedReader;
Expand All @@ -41,18 +40,7 @@ private static boolean canAccessProcStatFile() {

private static boolean isSystemApp() {
Context context = Runtime.getInstance().getContext();
if (context == null) {
return false;
}
try {
PackageInfo packageInfo = context.getPackageManager().getPackageInfo(context.getPackageName(), 0);
return packageInfo != null &&
packageInfo.applicationInfo != null &&
((packageInfo.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0);
} catch (Exception e) {
// ignore
}
return false;
return PackageUtils.isSystemPackage(context, context.getPackageName());
}

public CpuMonitor() {
Expand Down
2 changes: 1 addition & 1 deletion core/runtime/android/runtime/src/main/java/org/hapjs/common/utils/PackageUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ public static boolean isSystemPackage(Context context, String packageName) {
}
try {
PackageInfo pi = context.getPackageManager().getPackageInfo(packageName, 0);
return pi != null && (pi.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0;
return pi != null && (pi.applicationInfo.flags & (ApplicationInfo.FLAG_SYSTEM | ApplicationInfo.FLAG_UPDATED_SYSTEM_APP)) != 0;
} catch (PackageManager.NameNotFoundException e) {
// ignored
}
Expand Down