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

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

Browse Source 
Bug: 147257237
Test: Flash device and check the sub text
Change-Id: I2ea728c82502d3c91fa7262f353da6f98911adce
This commit is contained in:
Paul Chang
2020-01-17 22:18:25 +08:00
parent 4b7bdb0dfb
commit b3b1a5c40a
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.ApplicationInfo;
import android.content.pm.PackageItemInfo; import android.content.pm.PackageItemInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.UserInfo;
import android.os.UserHandle; import android.os.UserHandle;
import android.util.Log; import android.util.Log;
import android.util.Pair; import android.util.Pair;
@@ -169,8 +170,8 @@ public class BugReportHandlerPicker extends DefaultAppPickerFragment {
if (BugReportHandlerUtil.SHELL_APP_PACKAGE.equals(handlerApp)) { if (BugReportHandlerUtil.SHELL_APP_PACKAGE.equals(handlerApp)) {
return context.getString(R.string.system_default_app_subtext); return context.getString(R.string.system_default_app_subtext);
} }
final UserHandle managedProfile = Utils.getManagedProfile(mUserManager); final UserInfo userInfo = mUserManager.getUserInfo(handlerUser);
if (managedProfile != null && managedProfile.getIdentifier() == handlerUser) { if (userInfo != null && userInfo.isManagedProfile()) {
return context.getString(R.string.work_profile_app_subtext); return context.getString(R.string.work_profile_app_subtext);
} }
return context.getString(R.string.personal_profile_app_subtext); return context.getString(R.string.personal_profile_app_subtext);