commit 26934e29c17341b7b92215d5285082f2074023e8
author Danny Lin <danny@kdrag0n.dev> Tue Oct 05 18:42:40 2021 -0700
committer Ayan Mukherjee <mukherjeeayan725@gmail.com> Mon Oct 18 15:16:28 2021 -0400
tree 917addea8a49a650fda7c3d4812da3535c73f2ac
parent f998c82ef8548a57f66547ac3e0d783994cc279d

gmscompat: Add ConnectivityManager hook for baseline compatibility

This is part of GmsCompat's baseline compatibility for unprivileged
Google Play Services.

Change-Id: I3e87706f1f3b87c0af9d00f6ce92144469596f8c

framework/src/android/net/ConnectivityManager.java

diff --git a/framework/src/android/net/ConnectivityManager.java b/framework/src/android/net/ConnectivityManager.java
index 2eb5fb7..2cb7f49 100644
--- a/framework/src/android/net/ConnectivityManager.java
+++ b/framework/src/android/net/ConnectivityManager.java
@@ -36,6 +36,7 @@
 import android.annotation.SystemService;
 import android.app.PendingIntent;
 import android.app.admin.DevicePolicyManager;
+import android.app.compat.gms.GmsCompat;
 import android.compat.annotation.UnsupportedAppUsage;
 import android.content.ComponentName;
 import android.content.Context;
@@ -2605,6 +2606,10 @@
     @RequiresPermission(anyOf = {android.Manifest.permission.TETHER_PRIVILEGED,
             android.Manifest.permission.WRITE_SETTINGS})
     public boolean isTetheringSupported() {
+        if (GmsCompat.isEnabled()) {
+            return false;
+        }
+
         return getTetheringManager().isTetheringSupported();
     }