summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--wifi/java/android/net/wifi/IWifiManager.aidl36
-rw-r--r--wifi/java/android/net/wifi/WifiManager.java32
-rw-r--r--wifi/tests/src/android/net/wifi/WifiManagerTest.java10
3 files changed, 39 insertions, 39 deletions
diff --git a/wifi/java/android/net/wifi/IWifiManager.aidl b/wifi/java/android/net/wifi/IWifiManager.aidl
index 26a2bdde40fc..551e4df1c816 100644
--- a/wifi/java/android/net/wifi/IWifiManager.aidl
+++ b/wifi/java/android/net/wifi/IWifiManager.aidl
@@ -66,11 +66,11 @@ interface IWifiManager
List<OsuProvider> getMatchingOsuProviders(in ScanResult scanResult);
- int addOrUpdateNetwork(in WifiConfiguration config, String packageName);
+ int addOrUpdateNetwork(in WifiConfiguration config);
- boolean addOrUpdatePasspointConfiguration(in PasspointConfiguration config, String packageName);
+ boolean addOrUpdatePasspointConfiguration(in PasspointConfiguration config);
- boolean removePasspointConfiguration(in String fqdn, String packageName);
+ boolean removePasspointConfiguration(in String fqdn);
List<PasspointConfiguration> getPasspointConfigurations();
@@ -80,21 +80,21 @@ interface IWifiManager
void deauthenticateNetwork(long holdoff, boolean ess);
- boolean removeNetwork(int netId, String packageName);
+ boolean removeNetwork(int netId);
- boolean enableNetwork(int netId, boolean disableOthers, String packageName);
+ boolean enableNetwork(int netId, boolean disableOthers);
- boolean disableNetwork(int netId, String packageName);
+ boolean disableNetwork(int netId);
- void startScan(in ScanSettings requested, in WorkSource ws, String packageName);
+ void startScan(in ScanSettings requested, in WorkSource ws, in String packageName);
List<ScanResult> getScanResults(String callingPackage);
- void disconnect(String packageName);
+ void disconnect();
- void reconnect(String packageName);
+ void reconnect();
- void reassociate(String packageName);
+ void reassociate();
WifiInfo getConnectionInfo(String callingPackage);
@@ -108,7 +108,7 @@ interface IWifiManager
boolean isDualBandSupported();
- boolean saveConfiguration(String packageName);
+ boolean saveConfiguration();
DhcpInfo getDhcpInfo();
@@ -134,9 +134,9 @@ interface IWifiManager
boolean stopSoftAp();
- int startLocalOnlyHotspot(in Messenger messenger, in IBinder binder, String packageName);
+ int startLocalOnlyHotspot(in Messenger messenger, in IBinder binder, in String packageName);
- void stopLocalOnlyHotspot(String packageName);
+ void stopLocalOnlyHotspot();
void startWatchLocalOnlyHotspot(in Messenger messenger, in IBinder binder);
@@ -146,9 +146,9 @@ interface IWifiManager
WifiConfiguration getWifiApConfiguration();
- void setWifiApConfiguration(in WifiConfiguration wifiConfig, String packageName);
+ void setWifiApConfiguration(in WifiConfiguration wifiConfig);
- Messenger getWifiServiceMessenger(String packageName);
+ Messenger getWifiServiceMessenger();
void enableTdls(String remoteIPAddress, boolean enable);
@@ -166,16 +166,16 @@ interface IWifiManager
void setAllowScansWithTraffic(int enabled);
int getAllowScansWithTraffic();
- boolean setEnableAutoJoinWhenAssociated(boolean enabled, String packageName);
+ boolean setEnableAutoJoinWhenAssociated(boolean enabled);
boolean getEnableAutoJoinWhenAssociated();
void enableWifiConnectivityManager(boolean enabled);
WifiConnectionStatistics getConnectionStatistics();
- void disableEphemeralNetwork(String SSID, String packageName);
+ void disableEphemeralNetwork(String SSID);
- void factoryReset(String packageName);
+ void factoryReset();
Network getCurrentNetwork();
diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java
index 95d38c8c7ab5..c2959d5e7ab7 100644
--- a/wifi/java/android/net/wifi/WifiManager.java
+++ b/wifi/java/android/net/wifi/WifiManager.java
@@ -1127,7 +1127,7 @@ public class WifiManager {
*/
private int addOrUpdateNetwork(WifiConfiguration config) {
try {
- return mService.addOrUpdateNetwork(config, mContext.getOpPackageName());
+ return mService.addOrUpdateNetwork(config);
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
@@ -1148,7 +1148,7 @@ public class WifiManager {
*/
public void addOrUpdatePasspointConfiguration(PasspointConfiguration config) {
try {
- if (!mService.addOrUpdatePasspointConfiguration(config, mContext.getOpPackageName())) {
+ if (!mService.addOrUpdatePasspointConfiguration(config)) {
throw new IllegalArgumentException();
}
} catch (RemoteException e) {
@@ -1165,7 +1165,7 @@ public class WifiManager {
*/
public void removePasspointConfiguration(String fqdn) {
try {
- if (!mService.removePasspointConfiguration(fqdn, mContext.getOpPackageName())) {
+ if (!mService.removePasspointConfiguration(fqdn)) {
throw new IllegalArgumentException();
}
} catch (RemoteException e) {
@@ -1251,7 +1251,7 @@ public class WifiManager {
*/
public boolean removeNetwork(int netId) {
try {
- return mService.removeNetwork(netId, mContext.getOpPackageName());
+ return mService.removeNetwork(netId);
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
@@ -1297,7 +1297,7 @@ public class WifiManager {
boolean success;
try {
- success = mService.enableNetwork(netId, attemptConnect, mContext.getOpPackageName());
+ success = mService.enableNetwork(netId, attemptConnect);
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
@@ -1323,7 +1323,7 @@ public class WifiManager {
*/
public boolean disableNetwork(int netId) {
try {
- return mService.disableNetwork(netId, mContext.getOpPackageName());
+ return mService.disableNetwork(netId);
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
@@ -1336,7 +1336,7 @@ public class WifiManager {
*/
public boolean disconnect() {
try {
- mService.disconnect(mContext.getOpPackageName());
+ mService.disconnect();
return true;
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
@@ -1351,7 +1351,7 @@ public class WifiManager {
*/
public boolean reconnect() {
try {
- mService.reconnect(mContext.getOpPackageName());
+ mService.reconnect();
return true;
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
@@ -1366,7 +1366,7 @@ public class WifiManager {
*/
public boolean reassociate() {
try {
- mService.reassociate(mContext.getOpPackageName());
+ mService.reassociate();
return true;
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
@@ -1739,7 +1739,7 @@ public class WifiManager {
@Deprecated
public boolean saveConfiguration() {
try {
- return mService.saveConfiguration(mContext.getOpPackageName());
+ return mService.saveConfiguration();
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
@@ -2060,7 +2060,7 @@ public class WifiManager {
}
mLOHSCallbackProxy = null;
try {
- mService.stopLocalOnlyHotspot(mContext.getOpPackageName());
+ mService.stopLocalOnlyHotspot();
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
@@ -2179,7 +2179,7 @@ public class WifiManager {
@RequiresPermission(android.Manifest.permission.CHANGE_WIFI_STATE)
public boolean setWifiApConfiguration(WifiConfiguration wifiConfig) {
try {
- mService.setWifiApConfiguration(wifiConfig, mContext.getOpPackageName());
+ mService.setWifiApConfiguration(wifiConfig);
return true;
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
@@ -2951,7 +2951,7 @@ public class WifiManager {
public void disableEphemeralNetwork(String SSID) {
if (SSID == null) throw new IllegalArgumentException("SSID cannot be null");
try {
- mService.disableEphemeralNetwork(SSID, mContext.getOpPackageName());
+ mService.disableEphemeralNetwork(SSID);
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
@@ -2990,7 +2990,7 @@ public class WifiManager {
*/
public Messenger getWifiServiceMessenger() {
try {
- return mService.getWifiServiceMessenger(mContext.getOpPackageName());
+ return mService.getWifiServiceMessenger();
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
@@ -3519,7 +3519,7 @@ public class WifiManager {
*/
public void factoryReset() {
try {
- mService.factoryReset(mContext.getOpPackageName());
+ mService.factoryReset();
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
@@ -3546,7 +3546,7 @@ public class WifiManager {
*/
public boolean setEnableAutoJoinWhenAssociated(boolean enabled) {
try {
- return mService.setEnableAutoJoinWhenAssociated(enabled, mContext.getOpPackageName());
+ return mService.setEnableAutoJoinWhenAssociated(enabled);
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
diff --git a/wifi/tests/src/android/net/wifi/WifiManagerTest.java b/wifi/tests/src/android/net/wifi/WifiManagerTest.java
index 1364224c443d..ee6f12b775a8 100644
--- a/wifi/tests/src/android/net/wifi/WifiManagerTest.java
+++ b/wifi/tests/src/android/net/wifi/WifiManagerTest.java
@@ -136,7 +136,7 @@ public class WifiManagerTest {
assertEquals(mApConfig, callback.mRes.getWifiConfiguration());
callback.mRes.close();
- verify(mWifiService).stopLocalOnlyHotspot(TEST_PACKAGE_NAME);
+ verify(mWifiService).stopLocalOnlyHotspot();
}
/**
@@ -156,7 +156,7 @@ public class WifiManagerTest {
assertEquals(mApConfig, res.getWifiConfiguration());
}
- verify(mWifiService).stopLocalOnlyHotspot(TEST_PACKAGE_NAME);
+ verify(mWifiService).stopLocalOnlyHotspot();
}
/**
@@ -547,7 +547,7 @@ public class WifiManagerTest {
anyString())).thenReturn(REQUEST_REGISTERED);
mWifiManager.startLocalOnlyHotspot(callback, mHandler);
mWifiManager.cancelLocalOnlyHotspotRequest();
- verify(mWifiService).stopLocalOnlyHotspot(TEST_PACKAGE_NAME);
+ verify(mWifiService).stopLocalOnlyHotspot();
}
/**
@@ -569,7 +569,7 @@ public class WifiManagerTest {
anyString())).thenReturn(REQUEST_REGISTERED);
mWifiManager.startLocalOnlyHotspot(callback, mHandler);
mWifiManager.cancelLocalOnlyHotspotRequest();
- verify(mWifiService).stopLocalOnlyHotspot(TEST_PACKAGE_NAME);
+ verify(mWifiService).stopLocalOnlyHotspot();
mLooper.dispatchAll();
assertEquals(ERROR_NOT_SET, callback.mFailureReason);
assertFalse(callback.mOnStartedCalled);
@@ -593,7 +593,7 @@ public class WifiManagerTest {
assertFalse(callback.mOnStoppedCalled);
assertEquals(null, callback.mRes);
mWifiManager.cancelLocalOnlyHotspotRequest();
- verify(mWifiService, never()).stopLocalOnlyHotspot(anyString());
+ verify(mWifiService, never()).stopLocalOnlyHotspot();
}
/**
generated by cgit v1.2.3-59-g8ed1b (git 2.39.0) at 2025-12-27 11:21:32 +0000