Merge "Fix some PackageManagerTests."

This commit is contained in:
Jeff Sharkey
2015-09-17 17:18:40 +00:00
committed by Android (Google) Code Review

View File

@@ -1168,16 +1168,10 @@ public class PackageManagerTests extends AndroidTestCase {
}
boolean checkMediaState(String desired) {
try {
String mPath = Environment.getExternalStorageDirectory().getPath();
String actual = getMs().getVolumeState(mPath);
if (desired.equals(actual)) {
return true;
} else {
return false;
}
} catch (RemoteException e) {
Log.e(TAG, "Exception while checking media state", e);
String actual = Environment.getExternalStorageState();
if (desired.equals(actual)) {
return true;
} else {
return false;
}
}