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

Fix duplicated SettingsEnums.TRUSTED_CREDENTIALS

Browse Source 
The target page have nested fragments, remove the enum from inner
fragment to fix this issue.

Fix: 260055184
Test: Manually with Settings
Change-Id: Iee51df18ab6810147857703678482a62f34228fe
This commit is contained in:
Chaohui Wang
2022-11-22 17:36:05 +08:00
parent f137463ddc
commit 547cdbe3fa
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/TrustedCredentialsFragment.java
View File

@@ -25,7 +25,6 @@ import android.annotation.UiThread;
import android.app.Activity; import android.app.Activity;
import android.app.KeyguardManager; import android.app.KeyguardManager;
import android.app.admin.DevicePolicyManager; import android.app.admin.DevicePolicyManager;
import android.app.settings.SettingsEnums;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
@@ -68,7 +67,7 @@ import com.android.internal.annotations.GuardedBy;
import com.android.internal.app.UnlaunchableAppActivity; import com.android.internal.app.UnlaunchableAppActivity;
import com.android.internal.widget.LockPatternUtils; import com.android.internal.widget.LockPatternUtils;
import com.android.settings.TrustedCredentialsSettings.Tab; import com.android.settings.TrustedCredentialsSettings.Tab;
import com.android.settings.core.InstrumentedFragment; import com.android.settingslib.core.lifecycle.ObservableFragment;
import java.security.cert.CertificateEncodingException; import java.security.cert.CertificateEncodingException;
import java.security.cert.X509Certificate; import java.security.cert.X509Certificate;
@@ -81,7 +80,7 @@ import java.util.function.IntConsumer;
/** /**
* Fragment to display trusted credentials settings for one tab. * Fragment to display trusted credentials settings for one tab.
*/ */
public class TrustedCredentialsFragment extends InstrumentedFragment public class TrustedCredentialsFragment extends ObservableFragment
implements TrustedCredentialsDialogBuilder.DelegateInterface { implements TrustedCredentialsDialogBuilder.DelegateInterface {
public static final String ARG_POSITION = "tab"; public static final String ARG_POSITION = "tab";
@@ -176,11 +175,6 @@ public class TrustedCredentialsFragment extends InstrumentedFragment
return mFragmentView; return mFragmentView;
} }
@Override
public int getMetricsCategory() {
return SettingsEnums.TRUSTED_CREDENTIALS;
}
private void createChildView( private void createChildView(
LayoutInflater inflater, ViewGroup parent, Bundle childState, int i) { LayoutInflater inflater, ViewGroup parent, Bundle childState, int i) {
boolean isWork = mGroupAdapter.getUserInfoByGroup(i).isManagedProfile(); boolean isWork = mGroupAdapter.getUserInfoByGroup(i).isManagedProfile();