LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CW on Master: Disable CaptivePortalTracker, EthernetService

Browse Source 
BUG: 15143878

Change-Id: I6c534a28c1fcd475982ae70e7f3af69f3a219e24
This commit is contained in:
Joe LaPenna
2014-07-04 17:15:54 -07:00
committed by Robert Greenwalt
parent aecbb5c710
commit 0a998b84bc
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/net/EthernetManager.java
View File

@@ -51,6 +51,11 @@ public class EthernetManager {
* @return the Ethernet Configuration, contained in {@link IpConfiguration}. * @return the Ethernet Configuration, contained in {@link IpConfiguration}.
*/ */
public IpConfiguration getConfiguration() { public IpConfiguration getConfiguration() {
if (mService == null) {
return new IpConfiguration(IpAssignment.UNASSIGNED,
ProxySettings.UNASSIGNED,
new LinkProperties());
}
try { try {
return mService.getConfiguration(); return mService.getConfiguration();
} catch (RemoteException e) { } catch (RemoteException e) {
@@ -64,6 +69,9 @@ public class EthernetManager {
* Set Ethernet configuration. * Set Ethernet configuration.
*/ */
public void setConfiguration(IpConfiguration config) { public void setConfiguration(IpConfiguration config) {
if (mService == null) {
return;
}
try { try {
mService.setConfiguration(config); mService.setConfiguration(config);
} catch (RemoteException e) { } catch (RemoteException e) {