Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Replace public ctor with manager creation"

Browse Source
This commit is contained in:
Isaac Katzenelson
2023-02-08 00:46:38 +00:00
committed by Android (Google) Code Review
parent bb3a7106f8 2e84da3ffa
commit fb34f55e7d
4 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/system-current.txt
View File

@@ -3274,6 +3274,7 @@ package android.content {
field public static final String SAFETY_CENTER_SERVICE = "safety_center";
field public static final String SEARCH_UI_SERVICE = "search_ui";
field public static final String SECURE_ELEMENT_SERVICE = "secure_element";
field public static final String SHARED_CONNECTIVITY_SERVICE = "shared_connectivity";
field public static final String SMARTSPACE_SERVICE = "smartspace";
field public static final String STATS_MANAGER = "stats";
field public static final String SYSTEM_CONFIG_SERVICE = "system_config";
@@ -9843,7 +9844,6 @@ package android.net.wifi.sharedconnectivity.app {
}
public class SharedConnectivityManager {
ctor public SharedConnectivityManager(@NonNull android.content.Context);
method public boolean connectKnownNetwork(@NonNull android.net.wifi.sharedconnectivity.app.KnownNetwork);
method public boolean connectTetherNetwork(@NonNull android.net.wifi.sharedconnectivity.app.TetherNetwork);
method public boolean disconnectTetherNetwork();

8
core/java/android/app/SystemServiceRegistry.java
View File

@@ -156,6 +156,7 @@ import android.net.vcn.IVcnManagementService;
import android.net.vcn.VcnManager;
import android.net.wifi.WifiFrameworkInitializer;
import android.net.wifi.nl80211.WifiNl80211Manager;
import android.net.wifi.sharedconnectivity.app.SharedConnectivityManager;
import android.nfc.NfcManager;
import android.ondevicepersonalization.OnDevicePersonalizationFrameworkInitializer;
import android.os.BatteryManager;
@@ -1572,6 +1573,13 @@ public final class SystemServiceRegistry {
Context.GRAMMATICAL_INFLECTION_SERVICE)));
}});
registerService(Context.SHARED_CONNECTIVITY_SERVICE, SharedConnectivityManager.class,
new CachedServiceFetcher<SharedConnectivityManager>() {
@Override
public SharedConnectivityManager createService(ContextImpl ctx) {
return new SharedConnectivityManager(ctx);
}
});
sInitializing = true;
try {

12
core/java/android/content/Context.java
View File

@@ -6231,6 +6231,18 @@ public abstract class Context {
*/
public static final String SATELLITE_SERVICE = "satellite";
/**
* Use with {@link #getSystemService(String)} to retrieve a
* {@link android.net.wifi.sharedconnectivity.app.SharedConnectivityManager} for accessing
* shared connectivity services.
*
* @see #getSystemService(String)
* @see android.net.wifi.sharedconnectivity.app.SharedConnectivityManager
* @hide
*/
@SystemApi
public static final String SHARED_CONNECTIVITY_SERVICE = "shared_connectivity";
/**
* Determine whether the given permission is allowed for a particular
* process and user ID running in the system.

4
wifi/java/src/android/net/wifi/sharedconnectivity/app/SharedConnectivityManager.java
View File

@@ -19,7 +19,6 @@ package android.net.wifi.sharedconnectivity.app;
import android.annotation.CallbackExecutor;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.SuppressLint;
import android.annotation.SystemApi;
import android.annotation.TestApi;
import android.content.ComponentName;
@@ -114,8 +113,9 @@ public class SharedConnectivityManager {
*
* Automatically binds to implementation of {@link SharedConnectivityService} specified in
* device overlay.
*
* @hide
*/
@SuppressLint("ManagerConstructor")
public SharedConnectivityManager(@NonNull Context context) {
ServiceConnection serviceConnection = new ServiceConnection() {
@Override