[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [orbot/master] Merge branch 'master' of https://github.com/guardianproject/orbot
commit 732c1538a62131cba2713401ae205fcc6257dea9
Merge: b1049ca6 09ded59c
Author: n8fr8 <nathan@xxxxxxxxxxxxxxxxxxxx>
Date: Fri Apr 24 17:05:07 2020 -0400
Merge branch 'master' of https://github.com/guardianproject/orbot
.../torproject/android/service/OrbotService.java | 30 ++++++++--------------
1 file changed, 10 insertions(+), 20 deletions(-)
diff --cc orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
index a5731fae,90d07456..8762a7e5
--- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
+++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
@@@ -25,11 -25,8 +25,9 @@@ import android.content.IntentFilter
import android.content.SharedPreferences;
import android.content.pm.PackageManager;
import android.database.Cursor;
- import android.net.ConnectivityManager;
- import android.net.NetworkInfo;
import android.net.Uri;
import android.os.Build;
+import android.os.Debug;
import android.os.IBinder;
import android.os.RemoteException;
import android.provider.BaseColumns;
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits