Only query for allowed packages in AndroidWakeLockManager

bramble-android/src/main/java/org/briarproject/bramble/system/AndroidWakeLockManagerImpl.java

@@ -2,7 +2,6 @@ package org.briarproject.bramble.system;
 
 import android.app.Application;
 import android.content.Context;
-import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.os.PowerManager;
 
@@ -106,14 +105,21 @@ class AndroidWakeLockManagerImpl implements AndroidWakeLockManager {
 
 	private String getWakeLockTag(Context ctx) {
 		PackageManager pm = ctx.getPackageManager();
-		for (PackageInfo info : pm.getInstalledPackages(0)) {
+		if (isInstalled(pm, "com.huawei.powergenie")) {
-			String name = info.packageName.toLowerCase();
+			return "LocationManagerService";
-			if (name.startsWith("com.huawei.powergenie")) {
+		} else if (isInstalled(pm, "com.evenwell.PowerMonitor")) {
-				return "LocationManagerService";
+			return "AudioIn";
-			} else if (name.startsWith("com.evenwell.powermonitor")) {
-				return "AudioIn";
-			}
 		}
 		return ctx.getPackageName();
 	}
+
+	private boolean isInstalled(PackageManager pm, String packageName) {
+		try {
+			pm.getPackageInfo(packageName, 0);
+			return true;
+		} catch (PackageManager.NameNotFoundException e) {
+			return false;
+		}
+	}
+
 }

briar-android/src/main/AndroidManifest.xml

@@ -453,6 +453,8 @@
 	<queries>
 		<package android:name="info.guardianproject.ripple" />
 		<package android:name="com.huawei.systemmanager" />
+		<package android:name="com.huawei.powergenie" />
+		<package android:name="com.evenwell.PowerMonitor" />
 
 		<intent>
 			<action android:name="android.intent.action.VIEW" />