Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Guard against getRunningAppProcesses() returning null

Browse Source
This commit is contained in:
Peter Serwylo 2016-10-13 06:22:15 +11:00
parent e2e1d3111c
commit 0e70495046
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/main/java/org/fdroid/fdroid/FDroidApp.java
View File

@ -64,6 +64,7 @@ import java.net.URL;
import java.net.URLStreamHandler; import java.net.URLStreamHandler;
import java.net.URLStreamHandlerFactory; import java.net.URLStreamHandlerFactory;
import java.security.Security; import java.security.Security;
import java.util.List;
import java.util.Locale; import java.util.Locale;
import info.guardianproject.netcipher.NetCipher; import info.guardianproject.netcipher.NetCipher;
@ -313,17 +314,28 @@ public class FDroidApp extends Application {
} }
/** /**
* Asks if the current process is "org.fdroid.fdroid:acra". Note that it is not perfect, because * Asks if the current process is "org.fdroid.fdroid:acra".
* some devices seem to not provide a list of running app processes when asked.
* *
* The `android:process` statement in AndroidManifest.xml causes another process to be created * This is helpful for bailing out of the {@link FDroidApp#onCreate} method early, preventing
* to run {@link org.fdroid.fdroid.acra.CrashReportActivity}. This was causing lots of things * problems that arise from executing the code twice. This happens due to the `android:process`
* to be started/run twice including {@link CleanCacheService} and {@link WifiStateChangeService}. * statement in AndroidManifest.xml causes another process to be created to run
* {@link org.fdroid.fdroid.acra.CrashReportActivity}. This was causing lots of things to be
* started/run twice including {@link CleanCacheService} and {@link WifiStateChangeService}.
*
* Note that it is not perfect, because some devices seem to not provide a list of running app
* processes when asked. In such situations, F-Droid may regress to the behaviour where some
* services may run twice and thus cause weirdness or slowness. However that is probably better
* for end users than experiencing a deterministic crash every time F-Droid is started.
*/ */
private boolean isAcraProcess() { private boolean isAcraProcess() {
int pid = android.os.Process.myPid();
ActivityManager manager = (ActivityManager) this.getSystemService(Context.ACTIVITY_SERVICE); ActivityManager manager = (ActivityManager) this.getSystemService(Context.ACTIVITY_SERVICE);
for (RunningAppProcessInfo processInfo : manager.getRunningAppProcesses()) { List<RunningAppProcessInfo> processes = manager.getRunningAppProcesses();
if (processes == null) {
return false;
}
int pid = android.os.Process.myPid();
for (RunningAppProcessInfo processInfo : processes) {
if (processInfo.pid == pid && "org.fdroid.fdroid:acra".equals(processInfo.processName)) { if (processInfo.pid == pid && "org.fdroid.fdroid:acra".equals(processInfo.processName)) {
return true; return true;
} }