Merge "setting: add check to avoid null pointer" (43c4e3d5) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/applications/ManageApplications.java

+6 −4

Original line number	Original line	Diff line number	Diff line
	@@ -383,10 +383,12 @@ public class ManageApplications extends Fragment implements
	if (mFilter == FILTER_APPS_SDCARD) {		if (mFilter == FILTER_APPS_SDCARD) {
	if (mContainerService != null) {		if (mContainerService != null) {
	try {		try {
			if (Environment.getSecondaryStorageDirectory() != null) {
	final long[] stats = mContainerService.getFileSystemStats(		final long[] stats = mContainerService.getFileSystemStats(
	Environment.getSecondaryStorageDirectory().getPath());		Environment.getSecondaryStorageDirectory().getPath());
	mTotalStorage = stats[0];		mTotalStorage = stats[0];
	mFreeStorage = stats[1];		mFreeStorage = stats[1];
			}
	} catch (RemoteException e) {		} catch (RemoteException e) {
	Log.w(TAG, "Problem in container service", e);		Log.w(TAG, "Problem in container service", e);
	}		}