d1e441e4cb
- Adds hosts cache and wildcard support back - Fixes broken hardened malloc enablement patch - Drops FDroidPrivExt, non-functional - Disables captive portal toggle patch, crashes Settings, needs rework - Rebranding work - Attempts to fix no boot animation Signed-off-by: Tad <tad@spotco.us>
44 lines
1.8 KiB
Diff
44 lines
1.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Dmitry Muhomor <muhomor.dmitry@gmail.com>
|
|
Date: Mon, 10 Jan 2022 15:50:33 +0200
|
|
Subject: [PATCH] make DownloadManager.enqueue() a no-op when INTERNET
|
|
permission is revoked
|
|
|
|
---
|
|
core/java/android/app/DownloadManager.java | 8 ++++++++
|
|
1 file changed, 8 insertions(+)
|
|
|
|
diff --git a/core/java/android/app/DownloadManager.java b/core/java/android/app/DownloadManager.java
|
|
index c209660f4197..ed0ba8b4b642 100644
|
|
--- a/core/java/android/app/DownloadManager.java
|
|
+++ b/core/java/android/app/DownloadManager.java
|
|
@@ -16,6 +16,7 @@
|
|
|
|
package android.app;
|
|
|
|
+import android.Manifest;
|
|
import android.annotation.NonNull;
|
|
import android.annotation.Nullable;
|
|
import android.annotation.RequiresPermission;
|
|
@@ -31,6 +32,7 @@ import android.content.ContentResolver;
|
|
import android.content.ContentUris;
|
|
import android.content.ContentValues;
|
|
import android.content.Context;
|
|
+import android.content.pm.PackageManager;
|
|
import android.database.Cursor;
|
|
import android.database.CursorWrapper;
|
|
import android.database.DatabaseUtils;
|
|
@@ -1123,6 +1125,12 @@ public class DownloadManager {
|
|
* calls related to this download.
|
|
*/
|
|
public long enqueue(Request request) {
|
|
+ // don't crash apps that expect INTERNET permission to be always granted
|
|
+ Context ctx = ActivityThread.currentApplication();
|
|
+ if (ctx != null && ctx.checkSelfPermission(Manifest.permission.INTERNET) != PackageManager.PERMISSION_GRANTED) {
|
|
+ // invalid id (DownloadProvider uses SQLite and returns a row id)
|
|
+ return -1;
|
|
+ }
|
|
ContentValues values = request.toContentValues(mPackageName);
|
|
Uri downloadUri = mResolver.insert(Downloads.Impl.CONTENT_URI, values);
|
|
long id = Long.parseLong(downloadUri.getLastPathSegment());
|