From 6fbdb5df55ae91ec6f3f962d420282ea8cc48389 Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Tue, 10 Jan 2017 09:53:48 -0800 Subject: [PATCH] Fix NPE when opening app detail page for work profile app Change-Id: I7a4e5e427801c688d4d16dfe64785b12cc97f445 Fix: 34156709 Test: RunSettingsRoboTests --- .../settings/applications/InstalledAppDetails.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java index d689ee46ada..b5f0e768769 100755 --- a/src/com/android/settings/applications/InstalledAppDetails.java +++ b/src/com/android/settings/applications/InstalledAppDetails.java @@ -324,7 +324,12 @@ public class InstalledAppDetails extends AppInfoBase ? R.xml.installed_app_details_ia : R.xml.installed_app_details); addDynamicPrefs(); - + if (mDashboardFeatureProvider.isEnabled()) { + mFooter = new LayoutPreference(getPrefContext(), R.layout.app_action_buttons); + mFooter.setOrder(10000); + mFooter.setKey(KEY_FOOTER); + getPreferenceScreen().addPreference(mFooter); + } if (Utils.isBandwidthControlEnabled()) { INetworkStatsService statsService = INetworkStatsService.Stub.asInterface( ServiceManager.getService(Context.NETWORK_STATS_SERVICE)); @@ -964,12 +969,6 @@ public class InstalledAppDetails extends AppInfoBase } addAppInstallerInfoPref(screen); - if (mDashboardFeatureProvider.isEnabled()) { - mFooter = new LayoutPreference(screen.getContext(), R.layout.app_action_buttons); - mFooter.setOrder(10000); - mFooter.setKey(KEY_FOOTER); - screen.addPreference(mFooter); - } } private void addAppInstallerInfoPref(PreferenceScreen screen) {