mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-07-01 09:02:05 +00:00
0c4db149e1
This revokes the permissions to all user installed apps on update. Likely an expected quirk of being on 20.0 without the permission. 19.1 upgrades and new 20.0 installs should be fine. TODO: update 19.1 with the SpecialRuntimePermAppUtils too Signed-off-by: Tad <tad@spotco.us>
55 lines
2.7 KiB
Diff
55 lines
2.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Dmitry Muhomor <muhomor.dmitry@gmail.com>
|
|
Date: Tue, 30 Aug 2022 12:27:52 +0300
|
|
Subject: [PATCH] don't crash INTERNET-unaware apps that try to access
|
|
NsdManager
|
|
|
|
---
|
|
.../src/android/net/nsd/NsdManager.java | 33 ++++++++++++++++---
|
|
1 file changed, 29 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/framework-t/src/android/net/nsd/NsdManager.java b/framework-t/src/android/net/nsd/NsdManager.java
|
|
index f19bf4a6f..ac0a9f6ab 100644
|
|
--- a/framework-t/src/android/net/nsd/NsdManager.java
|
|
+++ b/framework-t/src/android/net/nsd/NsdManager.java
|
|
@@ -498,10 +498,35 @@ public final class NsdManager {
|
|
t.start();
|
|
mHandler = new ServiceHandler(t.getLooper());
|
|
|
|
- try {
|
|
- mService = service.connect(new NsdCallbackImpl(mHandler));
|
|
- } catch (RemoteException e) {
|
|
- throw new RuntimeException("Failed to connect to NsdService");
|
|
+ if (android.content.pm.SpecialRuntimePermAppUtils.isInternetCompatEnabled()) {
|
|
+ // INsdManager#connect() enforces INTERNET permission
|
|
+ mService = new INsdServiceConnector() {
|
|
+ final NsdCallbackImpl callback = new NsdCallbackImpl(mHandler);
|
|
+
|
|
+ @Override public void registerService(int listenerKey, NsdServiceInfo serviceInfo) {
|
|
+ callback.onRegisterServiceFailed(listenerKey, FAILURE_INTERNAL_ERROR);
|
|
+ }
|
|
+ @Override public void unregisterService(int listenerKey) {
|
|
+ callback.onUnregisterServiceFailed(listenerKey, FAILURE_INTERNAL_ERROR);
|
|
+ }
|
|
+ @Override public void discoverServices(int listenerKey, NsdServiceInfo serviceInfo) {
|
|
+ callback.onDiscoverServicesFailed(listenerKey, FAILURE_INTERNAL_ERROR);
|
|
+ }
|
|
+ @Override public void stopDiscovery(int listenerKey) {
|
|
+ callback.onStopDiscoveryFailed(listenerKey, FAILURE_INTERNAL_ERROR);
|
|
+ }
|
|
+ @Override public void resolveService(int listenerKey, NsdServiceInfo serviceInfo) {
|
|
+ callback.onResolveServiceFailed(listenerKey, FAILURE_INTERNAL_ERROR);
|
|
+ }
|
|
+ @Override public void startDaemon() {}
|
|
+ @Override public android.os.IBinder asBinder() { return null; }
|
|
+ };
|
|
+ } else {
|
|
+ try {
|
|
+ mService = service.connect(new NsdCallbackImpl(mHandler));
|
|
+ } catch (RemoteException e) {
|
|
+ throw new RuntimeException("Failed to connect to NsdService");
|
|
+ }
|
|
}
|
|
|
|
// Only proactively start the daemon if the target SDK < S, otherwise the internal service
|