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

Merge changes from topics "user_remove_extra_user", "wifi_net_utils"

Browse Source 
* changes:
  UserManagerService: Add UserHandle extra to user added/removed broadcast
  wifi-service: Jar-Jar net util library
  WifiManager: Add API to query STA + AP concurrency
This commit is contained in:
Roshan Pius
2020-01-16 13:05:13 +00:00
committed by Android (Google) Code Review
parent 13c4957cb4 38b3e3a104
commit feb86eae2e
6 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -30654,6 +30654,7 @@ package android.net.wifi {
method public boolean isP2pSupported();
method public boolean isPreferredNetworkOffloadSupported();
method @Deprecated public boolean isScanAlwaysAvailable();
method public boolean isStaApConcurrencySupported();
method public boolean isTdlsSupported();
method public boolean isWapiSupported();
method public boolean isWifiEnabled();

1
packages/Tethering/jarjar-rules.txt
View File

@@ -16,3 +16,4 @@ rule com.android.internal.util.TrafficStatsConstants* com.android.networkstack.t
rule android.net.LocalLog* com.android.networkstack.tethering.LocalLog@1
rule android.net.shared.Inet4AddressUtils* com.android.networkstack.tethering.shared.Inet4AddressUtils@1
rule android.net.util.** com.android.networkstack.tethering.util.@1

3
packages/Tethering/src/com/android/server/connectivity/tethering/TetheringInterfaceUtils.java
View File

@@ -21,8 +21,7 @@ import android.net.LinkProperties;
import android.net.NetworkCapabilities;
import android.net.RouteInfo;
import android.net.util.InterfaceSet;
import com.android.net.module.util.NetUtils;
import android.net.util.NetUtils;
import java.net.InetAddress;
import java.net.UnknownHostException;

12
services/core/java/com/android/server/pm/UserManagerService.java
View File

@@ -3395,6 +3395,9 @@ public class UserManagerService extends IUserManager.Stub {
private void dispatchUserAddedIntent(@NonNull UserInfo userInfo) {
Intent addedIntent = new Intent(Intent.ACTION_USER_ADDED);
addedIntent.putExtra(Intent.EXTRA_USER_HANDLE, userInfo.id);
// Also, add the UserHandle for mainline modules which can't use the @hide
// EXTRA_USER_HANDLE.
addedIntent.putExtra(Intent.EXTRA_USER, UserHandle.of(userInfo.id));
mContext.sendBroadcastAsUser(addedIntent, UserHandle.ALL,
android.Manifest.permission.MANAGE_USERS);
MetricsLogger.count(mContext, userInfo.isGuest() ? TRON_GUEST_CREATED
@@ -3678,9 +3681,12 @@ public class UserManagerService extends IUserManager.Stub {
// wiping the user's system directory and removing from the user list
long ident = Binder.clearCallingIdentity();
try {
Intent addedIntent = new Intent(Intent.ACTION_USER_REMOVED);
addedIntent.putExtra(Intent.EXTRA_USER_HANDLE, userId);
mContext.sendOrderedBroadcastAsUser(addedIntent, UserHandle.ALL,
Intent removedIntent = new Intent(Intent.ACTION_USER_REMOVED);
removedIntent.putExtra(Intent.EXTRA_USER_HANDLE, userId);
// Also, add the UserHandle for mainline modules which can't use the @hide
// EXTRA_USER_HANDLE.
removedIntent.putExtra(Intent.EXTRA_USER, UserHandle.of(userId));
mContext.sendOrderedBroadcastAsUser(removedIntent, UserHandle.ALL,
android.Manifest.permission.MANAGE_USERS,
new BroadcastReceiver() {

1
wifi/jarjar-rules.txt
View File

@@ -1,5 +1,6 @@
rule android.net.InterfaceConfigurationParcel* @0
rule android.net.InterfaceConfiguration* com.android.server.x.wifi.net.InterfaceConfiguration@1
rule android.net.util.** com.android.server.x.wifi.net.util.@1
# We don't jar-jar the entire package because, we still use some classes (like
# AsyncChannel in com.android.internal.util) from these packages which are not

9
wifi/java/android/net/wifi/WifiManager.java
View File

@@ -2368,6 +2368,15 @@ public class WifiManager {
return isFeatureSupported(WIFI_FEATURE_AWARE);
}
/**
* Query whether the device supports Station (STA) + Access point (AP) concurrency or not.
*
* @return true if this device supports STA + AP concurrency, false otherwise.
*/
public boolean isStaApConcurrencySupported() {
return isFeatureSupported(WIFI_FEATURE_AP_STA);
}
/**
* @deprecated Please use {@link android.content.pm.PackageManager#hasSystemFeature(String)}
* with {@link android.content.pm.PackageManager#FEATURE_WIFI_RTT} and