CodeCow/PCAPdroid
1
0
Fork 0
mirror of https://github.com/emanuele-f/PCAPdroid.git synced 2026-07-03 21:21:12 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fix ANR on first root capture start

Browse Source
This commit is contained in:
emanuele-f 2022-06-15 17:19:41 +02:00
parent c2bfdd9e94
commit 6922b1aedb
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/com/emanuelef/remote_capture/CaptureService.java
View File

@ -418,12 +418,6 @@ public class CaptureService extends VpnService implements Runnable {
Utils.showToast(this, R.string.vpn_setup_failed);
return abortStart();
}
} else {
// Root capture
if(checkCallingOrSelfPermission(Utils.INTERACT_ACROSS_USERS) != PackageManager.PERMISSION_GRANTED) {
boolean success = Utils.rootGrantPermission(this, Utils.INTERACT_ACROSS_USERS);
Utils.showToast(this, success ? R.string.permission_granted : R.string.permission_grant_fail, "INTERACT_ACROSS_USERS");
}
}
mWhitelist = PCAPdroid.getInstance().getMalwareWhitelist();
@ -874,6 +868,12 @@ public class CaptureService extends VpnService implements Runnable {
@Override
public void run() {
if(mSettings.root_capture) {
// Check for INTERACT_ACROSS_USERS, required to query apps of other users/work profiles
if(checkCallingOrSelfPermission(Utils.INTERACT_ACROSS_USERS) != PackageManager.PERMISSION_GRANTED) {
boolean success = Utils.rootGrantPermission(this, Utils.INTERACT_ACROSS_USERS);
mHandler.post(() -> Utils.showToast(this, success ? R.string.permission_granted : R.string.permission_grant_fail, "INTERACT_ACROSS_USERS"));
}
runPacketLoop(-1, this, Build.VERSION.SDK_INT);
} else {
if(mParcelFileDescriptor != null) {