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

Fix search index for a financed device

Browse Source 
Now with two preference controllers, one for enterprise device and one
for financed device, the search index issue (querying "Financed device
info" in Settings does not show a search result) is fixed. The financed
preference controller is used when the device is a financed device.
Otherwise, the enterprise preference controller is used.

Bug: 183551684
Test: Used a test device that is registered via ZT
Test: m RunSettingsRoboTests ROBOTEST_FILTER=EnterprisePrivacyPreferenceControllerTest
Test: m RunSettingsRoboTests ROBOTEST_FILTER=FinancedPrivacyPreferenceControllerTest
Test: m RunSettingsRoboTests ROBOTEST_FILTER=PrivacyPreferenceControllerHelperTest

Change-Id: I051144ec9004f86456285078ebb1c72266f80a55
This commit is contained in:
Salud Lemus
2021-04-12 15:50:59 -07:00
parent 3b77220873
commit 9068481299
8 changed files with 399 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java
View File

@@ -13,61 +13,47 @@
*/
package com.android.settings.enterprise;
import static android.app.admin.DevicePolicyManager.DEVICE_OWNER_TYPE_FINANCED;
import android.app.admin.DevicePolicyManager;
import android.content.Context;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.AbstractPreferenceController;
import java.util.Objects;
public class EnterprisePrivacyPreferenceController extends AbstractPreferenceController implements
PreferenceControllerMixin {
private static final String KEY_ENTERPRISE_PRIVACY = "enterprise_privacy";
private final EnterprisePrivacyFeatureProvider mFeatureProvider;
private final PrivacyPreferenceControllerHelper mPrivacyPreferenceControllerHelper;
public EnterprisePrivacyPreferenceController(Context context) {
super(context);
mFeatureProvider = FeatureFactory.getFactory(context)
.getEnterprisePrivacyFeatureProvider(context);
this(Objects.requireNonNull(context), new PrivacyPreferenceControllerHelper(context));
}
@VisibleForTesting
EnterprisePrivacyPreferenceController(
Context context, PrivacyPreferenceControllerHelper privacyPreferenceControllerHelper) {
super(Objects.requireNonNull(context));
mPrivacyPreferenceControllerHelper = Objects.requireNonNull(
privacyPreferenceControllerHelper);
}
@Override
public void updateState(Preference preference) {
if (preference == null) {
return;
}
if (isFinancedDevice()) {
preference.setTitle(R.string.financed_privacy_settings);
}
final String organizationName = mFeatureProvider.getDeviceOwnerOrganizationName();
if (organizationName == null) {
preference.setSummary(R.string.enterprise_privacy_settings_summary_generic);
} else {
preference.setSummary(mContext.getResources().getString(
R.string.enterprise_privacy_settings_summary_with_name, organizationName));
}
mPrivacyPreferenceControllerHelper.updateState(preference);
}
@Override
public boolean isAvailable() {
return mFeatureProvider.hasDeviceOwner();
return mPrivacyPreferenceControllerHelper.hasDeviceOwner()
&& !mPrivacyPreferenceControllerHelper.isFinancedDevice();
}
@Override
public String getPreferenceKey() {
return KEY_ENTERPRISE_PRIVACY;
}
private boolean isFinancedDevice() {
final DevicePolicyManager dpm = mContext.getSystemService(DevicePolicyManager.class);
return dpm.isDeviceManaged() && dpm.getDeviceOwnerType(
dpm.getDeviceOwnerComponentOnAnyUser()) == DEVICE_OWNER_TYPE_FINANCED;
}
}