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

Commit 19b9c149 authored by Vinit Deshapnde's avatar Vinit Deshapnde Committed by Android (Google) Code Review
Browse files

Merge "Move Wifi/P2p service components under services"

parents 71cd5fd7 ffadfb9f

core/jni/android_net_wifi_WifiNative.cpp

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ static JNINativeMethod gWifiMethods[] = { 


int register_android_net_wifi_WifiNative(JNIEnv* env) {

    return AndroidRuntime::registerNativeMethods(env,

            "android/net/wifi/WifiNative", gWifiMethods, NELEM(gWifiMethods));

            "com/android/server/wifi/WifiNative", gWifiMethods, NELEM(gWifiMethods));

}



}; // namespace android

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

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

import android.content.res.Configuration;

import android.media.AudioService;

import android.net.wifi.p2p.WifiP2pService;

import android.os.Environment;

import android.os.Handler;

import android.os.HandlerThread;
@@ -73,6 +72,7 @@ import com.android.server.search.SearchManagerService; 
import com.android.server.usb.UsbService;

import com.android.server.wallpaper.WallpaperManagerService;

import com.android.server.wifi.WifiService;

import com.android.server.wifi.p2p.WifiP2pService;

import com.android.server.wm.WindowManagerService;



import dalvik.system.VMRuntime;

wifi/java/android/net/wifi/NetworkUpdateResult.java→services/java/com/android/server/wifi/NetworkUpdateResult.java

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

 */



package android.net.wifi;

package com.android.server.wifi;



import static android.net.wifi.WifiConfiguration.INVALID_NETWORK_ID;

wifi/java/android/net/wifi/StateChangeResult.java→services/java/com/android/server/wifi/StateChangeResult.java

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

 */



 package android.net.wifi;

package com.android.server.wifi;



import android.net.wifi.SupplicantState;

import android.net.wifi.WifiSsid;



/**

 * Stores supplicant state change information passed from WifiMonitor to

wifi/java/android/net/wifi/SupplicantStateTracker.java→services/java/com/android/server/wifi/SupplicantStateTracker.java

+4 −2
Original line number Diff line number Diff line
@@ -14,14 +14,16 @@ 
 * limitations under the License.

 */



package android.net.wifi;

package com.android.server.wifi;



import com.android.internal.util.State;

import com.android.internal.util.StateMachine;



import android.net.wifi.StateChangeResult;

import android.content.Context;

import android.content.Intent;

import android.net.wifi.SupplicantState;

import android.net.wifi.WifiConfiguration;

import android.net.wifi.WifiManager;

import android.os.Handler;

import android.os.Message;

import android.os.Parcelable;