Merge branch 'epic18-standalone_trackers_tor' into 'main'

epic18: Manage VPN services for Tor or Tracker control

See merge request e/os/advanced-privacy!149

3 files changed, 0 insertions, 96 deletions

diff --git a/permissionse/libs/hidden-apis-stub/src/main/java/android/os/ServiceManager.java b/permissionse/libs/hidden-apis-stub/src/main/java/android/os/ServiceManager.java
deleted file mode 100644
index 4696b79..0000000
--- a/permissionse/libs/hidden-apis-stub/src/main/java/android/os/ServiceManager.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2022 E FOUNDATION
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package android.os;
-
-public class ServiceManager {
-    public static IBinder getService(String name) {
-        return null;
-    }
-}
diff --git a/permissionse/libs/hidden-apis-stub/src/main/java/android/os/UserHandle.java b/permissionse/libs/hidden-apis-stub/src/main/java/android/os/UserHandle.java
deleted file mode 100644
index df56daf..0000000
--- a/permissionse/libs/hidden-apis-stub/src/main/java/android/os/UserHandle.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2022 E FOUNDATION
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package android.os;
-
-public class UserHandle {
-    public static /*@UserIdInt*/ int myUserId() {
-        return 0;
-    }
-}
diff --git a/permissionse/libs/hidden-apis-stub/src/main/java/android/os/UserManager.java b/permissionse/libs/hidden-apis-stub/src/main/java/android/os/UserManager.java
deleted file mode 100644
index be6797e..0000000
--- a/permissionse/libs/hidden-apis-stub/src/main/java/android/os/UserManager.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2022 MURENA SAS
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package android.os;
-
-import android.annotation.TargetApi;
-import android.content.pm.UserInfo;
-
-import androidx.annotation.DeprecatedSinceApi;
-import androidx.annotation.RequiresPermission;
-import java.util.List;
-
-public class UserManager {
-
-    @TargetApi(29)
-    @DeprecatedSinceApi(
-            api = 34,
-            message = "Check availability in SDK34"
-    )
-    @RequiresPermission("android.permission.MANAGE_USERS")
-    public List<UserInfo> getProfiles(int userHandle) {
-        return null;
-    }
-
-    @TargetApi(29)
-    @DeprecatedSinceApi(
-            api = 34,
-            message = "Check availability in SDK34"
-    )
-    @RequiresPermission("android.permission.MANAGE_USERS")
-    public boolean isManagedProfile(int userId) {
-        return false;
-    }
-}