Commit c553312f authored by d8ahazard's avatar d8ahazard Committed by topjohnwu

Re-add activity check

Causes false disables otherwise.
parent 3adc7ca2
...@@ -7,6 +7,7 @@ import android.app.PendingIntent; ...@@ -7,6 +7,7 @@ import android.app.PendingIntent;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.pm.ActivityInfo;
import android.content.pm.ApplicationInfo; import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.os.Build; import android.os.Build;
...@@ -61,6 +62,9 @@ public class MonitorService extends AccessibilityService { ...@@ -61,6 +62,9 @@ public class MonitorService extends AccessibilityService {
event.getPackageName().toString(), event.getPackageName().toString(),
event.getClassName().toString() event.getClassName().toString()
); );
ActivityInfo activityInfo = tryGetActivity(componentName);
boolean isActivity = activityInfo != null;
if (isActivity) {
Logger.dh("MonitorService: CurrentActivity: " + event.getPackageName()); Logger.dh("MonitorService: CurrentActivity: " + event.getPackageName());
String mPackage = componentName.getPackageName(); String mPackage = componentName.getPackageName();
...@@ -77,6 +81,15 @@ public class MonitorService extends AccessibilityService { ...@@ -77,6 +81,15 @@ public class MonitorService extends AccessibilityService {
} }
} }
} }
}
private ActivityInfo tryGetActivity(ComponentName componentName) {
try {
return getPackageManager().getActivityInfo(componentName, 0);
} catch (PackageManager.NameNotFoundException e) {
return null;
}
}
private String getAppName(String packageName) { private String getAppName(String packageName) {
PackageManager pkManager = getPackageManager(); PackageManager pkManager = getPackageManager();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment