summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/bugreporthandler
diff options
context:
space:
mode:
authorPaul Chang <changpa@google.com>2020-01-17 22:18:25 +0800
committerPaul Chang <changpa@google.com>2020-01-23 01:59:55 +0800
commitb3b1a5c40a76de713b1d4d7163aadfa08a1f8da8 (patch)
treedc4d2c69e8444c5e4832832529a2fc64ffef2dd6 /src/com/android/settings/bugreporthandler
parent4b7bdb0dfb298ca1656920ab8dad98fed5d2b868 (diff)
downloadpackages_apps_Settings-b3b1a5c40a76de713b1d4d7163aadfa08a1f8da8.tar.gz
packages_apps_Settings-b3b1a5c40a76de713b1d4d7163aadfa08a1f8da8.tar.bz2
packages_apps_Settings-b3b1a5c40a76de713b1d4d7163aadfa08a1f8da8.zip
Fix incorrect sub text on Bug report handler settings launched by a work profile app.
Bug: 147257237 Test: Flash device and check the sub text Change-Id: I2ea728c82502d3c91fa7262f353da6f98911adce
Diffstat (limited to 'src/com/android/settings/bugreporthandler')
-rw-r--r--src/com/android/settings/bugreporthandler/BugReportHandlerPicker.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/settings/bugreporthandler/BugReportHandlerPicker.java b/src/com/android/settings/bugreporthandler/BugReportHandlerPicker.java
index e7adf7f2a4..919e29b508 100644
--- a/src/com/android/settings/bugreporthandler/BugReportHandlerPicker.java
+++ b/src/com/android/settings/bugreporthandler/BugReportHandlerPicker.java
@@ -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;
@@ -169,8 +170,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);