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

Merge changes I4513afbd,I20e2194c into jb-mr1-dev

Browse Source 
* changes:
  Make getMediaStorageDirectory() user-aware.
  Lockdown should only augment connected networks.
This commit is contained in:
Jeff Sharkey
2012-09-19 11:22:14 -07:00
committed by Android (Google) Code Review
parent 549be8bead 3fe5bf6d69
commit a490bddc8b
2 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
core/java/android/os/Environment.java
View File

@@ -32,6 +32,7 @@ public class Environment {
private static final String ENV_EXTERNAL_STORAGE = "EXTERNAL_STORAGE"; private static final String ENV_EXTERNAL_STORAGE = "EXTERNAL_STORAGE";
private static final String ENV_EMULATED_STORAGE_TARGET = "EMULATED_STORAGE_TARGET"; private static final String ENV_EMULATED_STORAGE_TARGET = "EMULATED_STORAGE_TARGET";
private static final String ENV_MEDIA_STORAGE = "MEDIA_STORAGE";
/** {@hide} */ /** {@hide} */
public static String DIRECTORY_ANDROID = "Android"; public static String DIRECTORY_ANDROID = "Android";
@@ -88,21 +89,30 @@ public class Environment {
private final File mExternalStorageAndroidData; private final File mExternalStorageAndroidData;
private final File mExternalStorageAndroidMedia; private final File mExternalStorageAndroidMedia;
private final File mExternalStorageAndroidObb; private final File mExternalStorageAndroidObb;
private final File mMediaStorage;
public UserEnvironment(int userId) { public UserEnvironment(int userId) {
// See storage config details at http://source.android.com/tech/storage/ // See storage config details at http://source.android.com/tech/storage/
String rawExternalStorage = System.getenv(ENV_EXTERNAL_STORAGE); String rawExternalStorage = System.getenv(ENV_EXTERNAL_STORAGE);
String rawEmulatedStorageTarget = System.getenv(ENV_EMULATED_STORAGE_TARGET); String rawEmulatedStorageTarget = System.getenv(ENV_EMULATED_STORAGE_TARGET);
String rawMediaStorage = System.getenv(ENV_MEDIA_STORAGE);
if (TextUtils.isEmpty(rawMediaStorage)) {
rawMediaStorage = "/data/media";
}
if (!TextUtils.isEmpty(rawEmulatedStorageTarget)) { if (!TextUtils.isEmpty(rawEmulatedStorageTarget)) {
// Device has emulated storage; external storage paths should have // Device has emulated storage; external storage paths should have
// userId burned into them. // userId burned into them.
final String rawUserId = Integer.toString(userId);
final File emulatedBase = new File(rawEmulatedStorageTarget); final File emulatedBase = new File(rawEmulatedStorageTarget);
final File mediaBase = new File(rawMediaStorage);
// /storage/emulated/0 // /storage/emulated/0
mExternalStorage = buildPath(emulatedBase, Integer.toString(userId)); mExternalStorage = buildPath(emulatedBase, rawUserId);
// /storage/emulated/obb // /storage/emulated/obb
mExternalStorageAndroidObb = buildPath(emulatedBase, "obb"); mExternalStorageAndroidObb = buildPath(emulatedBase, "obb");
// /data/media/0
mMediaStorage = buildPath(mediaBase, rawUserId);
} else { } else {
// Device has physical external storage; use plain paths. // Device has physical external storage; use plain paths.
@@ -115,6 +125,8 @@ public class Environment {
mExternalStorage = new File(rawExternalStorage); mExternalStorage = new File(rawExternalStorage);
// /storage/sdcard0/Android/obb // /storage/sdcard0/Android/obb
mExternalStorageAndroidObb = buildPath(mExternalStorage, DIRECTORY_ANDROID, "obb"); mExternalStorageAndroidObb = buildPath(mExternalStorage, DIRECTORY_ANDROID, "obb");
// /data/media
mMediaStorage = new File(rawMediaStorage);
} }
mExternalStorageAndroidData = buildPath(mExternalStorage, DIRECTORY_ANDROID, "data"); mExternalStorageAndroidData = buildPath(mExternalStorage, DIRECTORY_ANDROID, "data");
@@ -152,6 +164,10 @@ public class Environment {
public File getExternalStorageAppCacheDirectory(String packageName) { public File getExternalStorageAppCacheDirectory(String packageName) {
return new File(new File(mExternalStorageAndroidData, packageName), "cache"); return new File(new File(mExternalStorageAndroidData, packageName), "cache");
} }
public File getMediaStorageDirectory() {
return mMediaStorage;
}
} }
/** /**
@@ -198,7 +214,8 @@ public class Environment {
* @hide * @hide
*/ */
public static File getMediaStorageDirectory() { public static File getMediaStorageDirectory() {
return MEDIA_STORAGE_DIRECTORY; throwIfSystem();
return sCurrentUser.getMediaStorageDirectory();
} }
/** /**
@@ -231,10 +248,6 @@ public class Environment {
private static final File SECURE_DATA_DIRECTORY private static final File SECURE_DATA_DIRECTORY
= getDirectory("ANDROID_SECURE_DATA", "/data/secure"); = getDirectory("ANDROID_SECURE_DATA", "/data/secure");
/** @hide */
private static final File MEDIA_STORAGE_DIRECTORY
= getDirectory("MEDIA_STORAGE", "/data/media");
private static final File DOWNLOAD_CACHE_DIRECTORY = getDirectory("DOWNLOAD_CACHE", "/cache"); private static final File DOWNLOAD_CACHE_DIRECTORY = getDirectory("DOWNLOAD_CACHE", "/cache");
/** /**

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

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