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

am a490bddc: Merge changes I4513afbd,I20e2194c into jb-mr1-dev

Browse Source 
* commit 'a490bddc8bf0812973dee34ead5c04c87e7ecb15':
  Make getMediaStorageDirectory() user-aware.
  Lockdown should only augment connected networks.
This commit is contained in:
Jeff Sharkey
2012-09-20 06:19:30 -07:00
committed by Android Git Automerger
parent a917eb5cc3 a490bddc8b
commit ea59a8367e
2 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/java/com/android/server/net/LockdownVpnTracker.java
View File

@@ -268,9 +268,11 @@ public class LockdownVpnTracker {
}
public NetworkInfo augmentNetworkInfo(NetworkInfo info) {
final NetworkInfo vpnInfo = mVpn.getNetworkInfo();
info = new NetworkInfo(info);
info.setDetailedState(vpnInfo.getDetailedState(), vpnInfo.getReason(), null);
if (info.isConnected()) {
final NetworkInfo vpnInfo = mVpn.getNetworkInfo();
info = new NetworkInfo(info);
info.setDetailedState(vpnInfo.getDetailedState(), vpnInfo.getReason(), null);
}
return info;
}