PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix NPE when opening app detail page for work profile app

Browse Source 
Change-Id: I7a4e5e427801c688d4d16dfe64785b12cc97f445
Fix: 34156709
Test: RunSettingsRoboTests
This commit is contained in:
Fan Zhang
2017-01-10 09:53:48 -08:00
parent c4372f1a48
commit 6fbdb5df55
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/applications/InstalledAppDetails.java
View File

@@ -324,7 +324,12 @@ public class InstalledAppDetails extends AppInfoBase
? R.xml.installed_app_details_ia ? R.xml.installed_app_details_ia
: R.xml.installed_app_details); : R.xml.installed_app_details);
addDynamicPrefs(); 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()) { if (Utils.isBandwidthControlEnabled()) {
INetworkStatsService statsService = INetworkStatsService.Stub.asInterface( INetworkStatsService statsService = INetworkStatsService.Stub.asInterface(
ServiceManager.getService(Context.NETWORK_STATS_SERVICE)); ServiceManager.getService(Context.NETWORK_STATS_SERVICE));
@@ -964,12 +969,6 @@ public class InstalledAppDetails extends AppInfoBase
} }
addAppInstallerInfoPref(screen); 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) { private void addAppInstallerInfoPref(PreferenceScreen screen) {