Merge "Fix NPE in onDestroy() when launched without args" (54fef7af) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/app/ResolverActivity.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -901,7 +901,8 @@ public class ResolverActivity extends Activity implements
		if (!isChangingConfigurations() && mPickOptionRequest != null) {
		mPickOptionRequest.cancel();
		}
		if (mMultiProfilePagerAdapter.getActiveListAdapter() != null) {
		if (mMultiProfilePagerAdapter != null
		&& mMultiProfilePagerAdapter.getActiveListAdapter() != null) {
		mMultiProfilePagerAdapter.getActiveListAdapter().onDestroy();
		}
		}