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
This commit is contained in:
@@ -51,8 +51,9 @@ import android.os.UserHandle;
|
|||||||
import android.os.UserManager;
|
import android.os.UserManager;
|
||||||
import android.stats.devicepolicy.DevicePolicyEnums;
|
import android.stats.devicepolicy.DevicePolicyEnums;
|
||||||
import android.util.IconDrawableFactory;
|
import android.util.IconDrawableFactory;
|
||||||
import android.util.Log;
|
import android.view.LayoutInflater;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
|
import android.view.ViewGroup;
|
||||||
import android.widget.ImageView;
|
import android.widget.ImageView;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
|
|
||||||
@@ -98,7 +99,6 @@ public class InteractAcrossProfilesDetails extends AppInfoBase
|
|||||||
@Override
|
@Override
|
||||||
public void onCreate(Bundle savedInstanceState) {
|
public void onCreate(Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
|
|
||||||
mContext = getContext();
|
mContext = getContext();
|
||||||
mCrossProfileApps = mContext.getSystemService(CrossProfileApps.class);
|
mCrossProfileApps = mContext.getSystemService(CrossProfileApps.class);
|
||||||
mUserManager = mContext.getSystemService(UserManager.class);
|
mUserManager = mContext.getSystemService(UserManager.class);
|
||||||
@@ -113,6 +113,12 @@ public class InteractAcrossProfilesDetails extends AppInfoBase
|
|||||||
mInstallAppIntent = AppStoreUtil.getAppStoreLink(mContext, mPackageName);
|
mInstallAppIntent = AppStoreUtil.getAppStoreLink(mContext, mPackageName);
|
||||||
|
|
||||||
addPreferencesFromResource(R.xml.interact_across_profiles_permissions_details);
|
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,
|
replaceEnterprisePreferenceScreenTitle(CONNECTED_WORK_AND_PERSONAL_APPS_TITLE,
|
||||||
R.string.interact_across_profiles_title);
|
R.string.interact_across_profiles_title);
|
||||||
@@ -126,7 +132,6 @@ public class InteractAcrossProfilesDetails extends AppInfoBase
|
|||||||
HOW_TO_DISCONNECT_APPS,
|
HOW_TO_DISCONNECT_APPS,
|
||||||
R.string.interact_across_profiles_summary_3);
|
R.string.interact_across_profiles_summary_3);
|
||||||
|
|
||||||
|
|
||||||
mSwitchPref = findPreference(INTERACT_ACROSS_PROFILES_SETTINGS_SWITCH);
|
mSwitchPref = findPreference(INTERACT_ACROSS_PROFILES_SETTINGS_SWITCH);
|
||||||
mSwitchPref.setOnPreferenceClickListener(this);
|
mSwitchPref.setOnPreferenceClickListener(this);
|
||||||
|
|
||||||
@@ -146,6 +151,8 @@ public class InteractAcrossProfilesDetails extends AppInfoBase
|
|||||||
styleActionBar();
|
styleActionBar();
|
||||||
maybeShowExtraSummary();
|
maybeShowExtraSummary();
|
||||||
logPageLaunchMetrics();
|
logPageLaunchMetrics();
|
||||||
|
|
||||||
|
return view;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void maybeShowExtraSummary() {
|
private void maybeShowExtraSummary() {
|
||||||
|
Reference in New Issue
Block a user