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

Fix work profile issue

Browse Source 
Test: manual
Bug: 281332256
Change-Id: I5f47aacc84e5abe739ecc3bbad474957334e7c91
This commit is contained in:
Becca Hughes
2023-05-08 17:43:20 +00:00
parent 2971c13923
commit ad13689915
10 changed files with 91 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/applications/credentials/DefaultCombinedPreferenceController.java
View File

@@ -24,6 +24,7 @@ import android.content.pm.ResolveInfo;
import android.content.pm.ServiceInfo;
import android.credentials.CredentialManager;
import android.credentials.CredentialProviderInfo;
import android.os.UserHandle;
import android.provider.Settings;
import android.service.autofill.AutofillService;
import android.service.autofill.AutofillServiceInfo;
@@ -75,13 +76,13 @@ public class DefaultCombinedPreferenceController extends DefaultAppPreferenceCon
return null;
}
final AutofillSettingIntentProvider intentProvider =
new AutofillSettingIntentProvider(mContext, mUserId, info.getKey());
new AutofillSettingIntentProvider(mContext, getUser(), info.getKey());
return intentProvider.getIntent();
}
@Override
protected DefaultAppInfo getDefaultAppInfo() {
List<CombinedProviderInfo> providers = getAllProviders(mUserId);
List<CombinedProviderInfo> providers = getAllProviders(getUser());
CombinedProviderInfo topProvider = CombinedProviderInfo.getTopProvider(providers);
if (topProvider != null) {
ServiceInfo brandingService = topProvider.getBrandingService();
@@ -89,7 +90,7 @@ public class DefaultCombinedPreferenceController extends DefaultAppPreferenceCon
return new DefaultAppInfo(
mContext,
mPackageManager,
mUserId,
getUser(),
topProvider.getApplicationInfo(),
topProvider.getSettingsSubtitle(),
true);
@@ -97,7 +98,7 @@ public class DefaultCombinedPreferenceController extends DefaultAppPreferenceCon
return new DefaultAppInfo(
mContext,
mPackageManager,
mUserId,
getUser(),
brandingService,
topProvider.getSettingsSubtitle(),
true);
@@ -178,4 +179,8 @@ public class DefaultCombinedPreferenceController extends DefaultAppPreferenceCon
return null;
}
}
protected int getUser() {
return UserHandle.myUserId();
}
}