Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f160cbed authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix incorrect sub text on Bug report handler settings launched by a work profile app."

parents a65636ad b3b1a5c4

src/com/android/settings/bugreporthandler/BugReportHandlerPicker.java

+3 −2
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.content.Intent; 
import android.content.pm.ApplicationInfo;

import android.content.pm.PackageItemInfo;

import android.content.pm.PackageManager;

import android.content.pm.UserInfo;

import android.os.UserHandle;

import android.util.Log;

import android.util.Pair;
@@ -175,8 +176,8 @@ public class BugReportHandlerPicker extends DefaultAppPickerFragment { 
        if (BugReportHandlerUtil.SHELL_APP_PACKAGE.equals(handlerApp)) {

            return context.getString(R.string.system_default_app_subtext);

        }

        final UserHandle managedProfile = Utils.getManagedProfile(mUserManager);

        if (managedProfile != null && managedProfile.getIdentifier() == handlerUser) {

        final UserInfo userInfo = mUserManager.getUserInfo(handlerUser);

        if (userInfo != null && userInfo.isManagedProfile()) {

            return context.getString(R.string.work_profile_app_subtext);

        }

        return context.getString(R.string.personal_profile_app_subtext);