Skip to content

Fix ANR when handling package add/remove broadcasts #678

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

Merged
kasnder merged 1 commit into from
Jul 23, 2026
+90 −79
Merged

Fix ANR when handling package add/remove broadcasts #678

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
169 changes: 90 additions & 79 deletions app/src/main/java/eu/faircode/netguard/ServiceSinkhole.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2796,67 +2796,83 @@ private void checkConnectivity(Network network, NetworkInfo ni, NetworkCapabilit

private BroadcastReceiver packageChangedReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
public void onReceive(final Context context, final Intent intent) {
Log.i(TAG, "Received " + intent);
Util.logExtras(intent);

try {
if (Intent.ACTION_PACKAGE_ADDED.equals(intent.getAction())) {
// Application added
Rule.clearCache(context);

if (!intent.getBooleanExtra(Intent.EXTRA_REPLACING, false)) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
int uid = intent.getIntExtra(Intent.EXTRA_UID, -1);
if (uid > -1) {
// Set tracker defaults based on blocking mode
TrackerBlocklist b = TrackerBlocklist.getInstance(context);
if (b.ensureDefaults(uid, BlockingMode.isStrictMode(context)))
b.saveSettings(context);

// Show install notification
if (prefs.getBoolean("installed", true))
notifyNewApplication(uid, this);
}
// Handle off the main thread: Rule.clearCache() synchronizes on the
// application context, a lock the command thread can hold for several
// seconds while building rules via slow PackageManager IPC. Doing this
// work on the main thread blocks input dispatching and causes an ANR.
final BroadcastReceiver.PendingResult result = goAsync();
executor.submit(new Runnable() {
@Override
public void run() {
try {
handlePackageChanged(context, intent);
} catch (Throwable ex) {
Log.e(TAG, ex.toString() + "\n" + Log.getStackTraceString(ex));
} finally {
result.finish();
}
}
});
}
};

reload("package added", context, false);

} else if (Intent.ACTION_PACKAGE_REMOVED.equals(intent.getAction())) {
// Application removed
Rule.clearCache(context);

if (intent.getBooleanExtra(Intent.EXTRA_DATA_REMOVED, false)) {
// Remove settings
String packageName = intent.getData().getSchemeSpecificPart();
Log.i(TAG, "Deleting settings package=" + packageName);
context.getSharedPreferences("apply", Context.MODE_PRIVATE).edit().remove(packageName).apply();
BlockingMode.clearAutoExcludedApp(context, packageName);
context.getSharedPreferences("tracker_protect", Context.MODE_PRIVATE).edit().remove(packageName).apply();
context.getSharedPreferences("notify", Context.MODE_PRIVATE).edit().remove(packageName).apply();

int uid = intent.getIntExtra(Intent.EXTRA_UID, 0);
if (uid > 0) {
DatabaseHelper dh = DatabaseHelper.getInstance(context);
dh.clearLog(uid);
dh.clearAccess(uid, false);
uidToApp.remove(uid);
uidToPackage.remove(uid);

NotificationManagerCompat.from(context).cancel(uid); // installed notification
NotificationManagerCompat.from(context).cancel(uid + 10000); // access notification
}
}
private void handlePackageChanged(Context context, Intent intent) {
if (Intent.ACTION_PACKAGE_ADDED.equals(intent.getAction())) {
// Application added
Rule.clearCache(context);

if (!intent.getBooleanExtra(Intent.EXTRA_REPLACING, false)) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
int uid = intent.getIntExtra(Intent.EXTRA_UID, -1);
if (uid > -1) {
// Set tracker defaults based on blocking mode
TrackerBlocklist b = TrackerBlocklist.getInstance(context);
if (b.ensureDefaults(uid, BlockingMode.isStrictMode(context)))
b.saveSettings(context);

// Show install notification
if (prefs.getBoolean("installed", true))
notifyNewApplication(uid, true);
}
}

reload("package deleted", context, false);
reload("package added", context, false);

} else if (Intent.ACTION_PACKAGE_REMOVED.equals(intent.getAction())) {
// Application removed
Rule.clearCache(context);

if (intent.getBooleanExtra(Intent.EXTRA_DATA_REMOVED, false)) {
// Remove settings
String packageName = intent.getData().getSchemeSpecificPart();
Log.i(TAG, "Deleting settings package=" + packageName);
context.getSharedPreferences("apply", Context.MODE_PRIVATE).edit().remove(packageName).apply();
BlockingMode.clearAutoExcludedApp(context, packageName);
context.getSharedPreferences("tracker_protect", Context.MODE_PRIVATE).edit().remove(packageName).apply();
context.getSharedPreferences("notify", Context.MODE_PRIVATE).edit().remove(packageName).apply();

int uid = intent.getIntExtra(Intent.EXTRA_UID, 0);
if (uid > 0) {
DatabaseHelper dh = DatabaseHelper.getInstance(context);
dh.clearLog(uid);
dh.clearAccess(uid, false);
uidToApp.remove(uid);
uidToPackage.remove(uid);

NotificationManagerCompat.from(context).cancel(uid); // installed notification
NotificationManagerCompat.from(context).cancel(uid + 10000); // access notification
}
} catch (Throwable ex) {
Log.e(TAG, ex.toString() + "\n" + Log.getStackTraceString(ex));
}

reload("package deleted", context, false);
}
};
}

public void notifyNewApplication(int uid, BroadcastReceiver br) {
public void notifyNewApplication(int uid, boolean checkTrackerLibraries) {
if (uid < 0 || !Util.hasInternet(uid, this))
return;
if (uid == Process.myUid())
Expand Down Expand Up @@ -2908,8 +2924,8 @@ public void notifyNewApplication(int uid, BroadcastReceiver br) {
NotificationManagerCompat.from(this).notify(uid, builder.build());

// Check tracker libraries in app
if (br != null)
checkTrackers(packageName, uid, name, br, builder);
if (checkTrackerLibraries)
checkTrackers(packageName, uid, name, builder);
}

} catch (PackageManager.NameNotFoundException ex) {
Expand All @@ -2920,33 +2936,28 @@ public void notifyNewApplication(int uid, BroadcastReceiver br) {
}
}

private void checkTrackers(String packageName, int uid, String appName, BroadcastReceiver br,
// Callers must invoke this off the main thread (e.g. the package receiver's
// executor or the command handler thread), as it performs blocking work.
private void checkTrackers(String packageName, int uid, String appName,
NotificationCompat.Builder builder) {
BroadcastReceiver.PendingResult result = br.goAsync();
new Thread() {
public void run() {
try {
Context c = getApplicationContext();
TrackerAnalysisManager manager = TrackerAnalysisManager.getInstance(c);

// Check cache first
String cachedResult = manager.getCachedResult(packageName);
if (cachedResult != null && !manager.isCacheStale(packageName)) {
// Use cached result
int trackerCount = TrackerAnalysisManager.countTrackers(cachedResult);
builder.setContentText(getString(R.string.msg_installed_tracker_libraries_found, trackerCount));
NotificationManagerCompat.from(c).notify(uid, builder.build());
} else {
// Schedule analysis for later; the worker updates this notification when done.
manager.startAnalysis(packageName, uid, appName);
}
} catch (Exception e) {
e.printStackTrace();
}
result.setResultCode(RESULT_OK);
result.finish();
try {
Context c = getApplicationContext();
TrackerAnalysisManager manager = TrackerAnalysisManager.getInstance(c);

// Check cache first
String cachedResult = manager.getCachedResult(packageName);
if (cachedResult != null && !manager.isCacheStale(packageName)) {
// Use cached result
int trackerCount = TrackerAnalysisManager.countTrackers(cachedResult);
builder.setContentText(getString(R.string.msg_installed_tracker_libraries_found, trackerCount));
NotificationManagerCompat.from(c).notify(uid, builder.build());
} else {
// Schedule analysis for later; the worker updates this notification when done.
manager.startAnalysis(packageName, uid, appName);
}
}.start();
} catch (Exception e) {
e.printStackTrace();
}
}

@Override
Expand Down Expand Up @@ -3306,7 +3317,7 @@ private void set(Intent intent) {
ServiceSinkhole.reload("notification", ServiceSinkhole.this, false);

// Update notification
notifyNewApplication(uid, null);
notifyNewApplication(uid, false);

// Update UI
Intent ruleset = new Intent(ActivityMain.ACTION_RULES_CHANGED);
Expand Down