From ca986f9abe82331fe5b9deee15c6fdad579d30b6 Mon Sep 17 00:00:00 2001 From: Sunny Shao Date: Tue, 27 Sep 2022 20:09:14 +0800 Subject: [PATCH] Fix AppInteractAcrossProfilesSettingsActivity crashed problem - Move some header codes to onCreateView Fixes: 233943190 Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.applications.specialaccess Change-Id: Iab8762904d8712602bc76ca5eed2a3fb75085c31 --- .../InteractAcrossProfilesDetails.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesDetails.java b/src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesDetails.java index b59928f21fd..ca3d123d1d5 100644 --- a/src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesDetails.java +++ b/src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesDetails.java @@ -51,8 +51,9 @@ import android.os.UserHandle; import android.os.UserManager; import android.stats.devicepolicy.DevicePolicyEnums; import android.util.IconDrawableFactory; -import android.util.Log; +import android.view.LayoutInflater; import android.view.View; +import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; @@ -98,7 +99,6 @@ public class InteractAcrossProfilesDetails extends AppInfoBase @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - mContext = getContext(); mCrossProfileApps = mContext.getSystemService(CrossProfileApps.class); mUserManager = mContext.getSystemService(UserManager.class); @@ -113,6 +113,12 @@ public class InteractAcrossProfilesDetails extends AppInfoBase mInstallAppIntent = AppStoreUtil.getAppStoreLink(mContext, mPackageName); addPreferencesFromResource(R.xml.interact_across_profiles_permissions_details); + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + final View view = super.onCreateView(inflater, container, savedInstanceState); replaceEnterprisePreferenceScreenTitle(CONNECTED_WORK_AND_PERSONAL_APPS_TITLE, R.string.interact_across_profiles_title); @@ -126,7 +132,6 @@ public class InteractAcrossProfilesDetails extends AppInfoBase HOW_TO_DISCONNECT_APPS, R.string.interact_across_profiles_summary_3); - mSwitchPref = findPreference(INTERACT_ACROSS_PROFILES_SETTINGS_SWITCH); mSwitchPref.setOnPreferenceClickListener(this); @@ -146,6 +151,8 @@ public class InteractAcrossProfilesDetails extends AppInfoBase styleActionBar(); maybeShowExtraSummary(); logPageLaunchMetrics(); + + return view; } private void maybeShowExtraSummary() {