Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix reboot loop due to NPE

Browse Source 
Bug: 2962059
Change-Id: I73d5fa5ef0f29dc139c843b34f58f189c94dfe4b
This commit is contained in:
Irfan Sheriff
2010-08-30 20:37:17 -07:00
parent 224744cc72
commit ef6c1431fa
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/net/LinkProperties.java
View File

@@ -48,11 +48,13 @@ public class LinkProperties implements Parcelable {
// copy constructor instead of clone
public LinkProperties(LinkProperties source) {
mIface = source.getInterface();
mAddresses = source.getAddresses();
mDnses = source.getDnses();
mGateway = source.getGateway();
mHttpProxy = new ProxyProperties(source.getHttpProxy());
if (source != null) {
mIface = source.getInterface();
mAddresses = source.getAddresses();
mDnses = source.getDnses();
mGateway = source.getGateway();
mHttpProxy = new ProxyProperties(source.getHttpProxy());
}
}
public void setInterface(NetworkInterface iface) {

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

@@ -38,9 +38,11 @@ public class ProxyProperties implements Parcelable {
// copy constructor instead of clone
public ProxyProperties(ProxyProperties source) {
mProxy = source.getAddress();
mPort = source.getPort();
mExclusionList = new String(source.getExclusionList());
if (source != null) {
mProxy = source.getAddress();
mPort = source.getPort();
mExclusionList = new String(source.getExclusionList());
}
}
public InetAddress getAddress() {