Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit feb86eae authored by Roshan Pius's avatar Roshan Pius Committed by Android (Google) Code Review
Browse files

Merge changes from topics "user_remove_extra_user", "wifi_net_utils" 

* 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
parents 13c4957c 38b3e3a1

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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();

packages/Tethering/jarjar-rules.txt

+1 −0
Original line number Diff line number Diff line
@@ -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

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

+1 −2
Original line number Diff line number Diff line
@@ -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;

services/core/java/com/android/server/pm/UserManagerService.java

+9 −3
Original line number Diff line number Diff line
@@ -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() {

wifi/jarjar-rules.txt

+1 −0
Original line number Diff line number Diff line 
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