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

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

Browse Source
This commit is contained in:
TreeHugger Robot
2020-01-22 19:40:01 +00:00
committed by Android (Google) Code Review
parent a65636ad64 b3b1a5c40a
commit f160cbed83
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/bugreporthandler/BugReportHandlerPicker.java
View File

@@ -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);