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

Commit aead35a8 authored by Irfan Sheriff's avatar Irfan Sheriff Committed by Android (Google) Code Review
Browse files

Merge "Fix p2p package paths"

parents e0511bf0 f6d09845

services/java/com/android/server/SystemServer.java

+1 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.content.Intent; 
import android.content.pm.IPackageManager;

import android.content.res.Configuration;

import android.media.AudioService;

import android.net.wifi.p2p.WifiP2pService;

import android.os.Looper;

import android.os.RemoteException;

import android.os.ServiceManager;
@@ -37,7 +38,6 @@ import android.provider.Settings; 
import android.server.BluetoothA2dpService;

import android.server.BluetoothService;

import android.server.search.SearchManagerService;

import android.server.WifiP2pService;

import android.util.DisplayMetrics;

import android.util.EventLog;

import android.util.Slog;

wifi/java/android/net/wifi/WifiStateMachine.java

+1 −1
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ import android.net.NetworkInfo.DetailedState; 
import android.net.NetworkUtils;

import android.net.wifi.WpsResult.Status;

import android.net.wifi.p2p.WifiP2pManager;

import android.net.wifi.p2p.WifiP2pService;

import android.net.wifi.StateChangeResult;

import android.os.Binder;

import android.os.IBinder;
@@ -69,7 +70,6 @@ import android.os.RemoteException; 
import android.os.ServiceManager;

import android.os.SystemProperties;

import android.os.WorkSource;

import android.server.WifiP2pService;

import android.provider.Settings;

import android.util.EventLog;

import android.util.Log;

wifi/java/android/net/wifi/p2p/WifiP2pService.java

+3 −10
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package android.server;

package android.net.wifi.p2p;



import android.app.AlertDialog;

import android.content.BroadcastReceiver;
@@ -31,20 +31,13 @@ import android.net.wifi.WifiNative; 
import android.net.wifi.WifiStateMachine;

import android.net.wifi.WpsConfiguration;

import android.net.wifi.WpsConfiguration.Setup;

import android.net.wifi.p2p.IWifiP2pManager;

import android.net.wifi.p2p.WifiP2pConfig;

import android.net.wifi.p2p.WifiP2pDevice;

import android.net.wifi.p2p.WifiP2pDevice.Status;

import android.net.wifi.p2p.WifiP2pDeviceList;

import android.net.wifi.p2p.WifiP2pGroup;

import android.net.wifi.p2p.WifiP2pManager;

import android.os.Binder;

import android.os.IBinder;

import android.os.Handler;

import android.os.Messenger;

import android.os.HandlerThread;

import android.os.IBinder;

import android.os.Message;

import android.os.Messenger;

import android.util.Slog;

import android.view.LayoutInflater;

import android.view.View;
@@ -55,9 +48,9 @@ import java.io.FileDescriptor; 
import java.io.PrintWriter;

import java.util.Collection;



import com.android.internal.R;

import com.android.internal.util.AsyncChannel;

import com.android.internal.util.Protocol;

import com.android.internal.R;

import com.android.internal.util.State;

import com.android.internal.util.StateMachine;