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

Fix change not picking up work profile

Browse Source 
Test: ondevice
Bug: 281787107
Change-Id: I676384877ce21ae1f1e6972646fc465828013c74
This commit is contained in:
Becca Hughes
2023-05-10 15:21:17 +00:00
parent c0c0edd078
commit 347c165521
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/com/android/settings/applications/credentials/CredentialManagerPreferenceController.java
View File

@@ -122,8 +122,9 @@ public class CredentialManagerPreferenceController extends BasePreferenceControl
mExecutor = ContextCompat.getMainExecutor(mContext); mExecutor = ContextCompat.getMainExecutor(mContext);
mCredentialManager = mCredentialManager =
getCredentialManager(context, preferenceKey.equals("credentials_test")); getCredentialManager(context, preferenceKey.equals("credentials_test"));
mSettingsContentObserver = new SettingContentObserver(mHandler); mSettingsContentObserver =
mSettingsContentObserver.register(context.getContentResolver()); new SettingContentObserver(mHandler, context.getContentResolver());
mSettingsContentObserver.register();
mSettingsPackageMonitor.register(context, context.getMainLooper(), false); mSettingsPackageMonitor.register(context, context.getMainLooper(), false);
} }
@@ -184,6 +185,10 @@ public class CredentialManagerPreferenceController extends BasePreferenceControl
mIsWorkProfile = isWorkProfile; mIsWorkProfile = isWorkProfile;
setDelegate(delegate); setDelegate(delegate);
verifyReceivedIntent(launchIntent); verifyReceivedIntent(launchIntent);
// Recreate the content observers because the user might have changed.
mSettingsContentObserver.unregister();
mSettingsContentObserver.register();
} }
/** /**
@@ -889,17 +894,24 @@ public class CredentialManagerPreferenceController extends BasePreferenceControl
private final Uri mCredentialPrimaryService = private final Uri mCredentialPrimaryService =
Settings.Secure.getUriFor(Settings.Secure.CREDENTIAL_SERVICE_PRIMARY); Settings.Secure.getUriFor(Settings.Secure.CREDENTIAL_SERVICE_PRIMARY);
public SettingContentObserver(Handler handler) { private ContentResolver mContentResolver;
public SettingContentObserver(Handler handler, ContentResolver contentResolver) {
super(handler); super(handler);
mContentResolver = contentResolver;
} }
public void register(ContentResolver contentResolver) { public void register() {
contentResolver.registerContentObserver(mAutofillService, false, this, getUser()); mContentResolver.registerContentObserver(mAutofillService, false, this, getUser());
contentResolver.registerContentObserver(mCredentialService, false, this, getUser()); mContentResolver.registerContentObserver(mCredentialService, false, this, getUser());
contentResolver.registerContentObserver( mContentResolver.registerContentObserver(
mCredentialPrimaryService, false, this, getUser()); mCredentialPrimaryService, false, this, getUser());
} }
public void unregister() {
mContentResolver.unregisterContentObserver(this);
}
@Override @Override
public void onChange(boolean selfChange, Uri uri) { public void onChange(boolean selfChange, Uri uri) {
updateFromExternal(); updateFromExternal();