Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "SecuritySettings test" into tm-qpr-dev am: 73e4742941 am: c18579f168

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19672131

Change-Id: I81fdcec2fe19926da3d40d52fa9e92972c0ad676
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Diya Bera
2022-08-31 19:55:26 +00:00
committed by Automerger Merge Worker
parent cb97ad28c7 c18579f168
commit c1288af511
5 changed files with 228 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/security/SecuritySettings.java
View File

@@ -40,7 +40,7 @@ import java.util.List;
public class SecuritySettings extends DashboardFragment {
private static final String TAG = "SecuritySettings";
private static final String SECURITY_CATEGORY = "security_category";
protected static final String SECURITY_CATEGORY = "security_category";
public static final int CHANGE_TRUST_AGENT_SETTINGS = 126;
public static final int UNIFY_LOCK_CONFIRM_PROFILE_REQUEST = 129;
@@ -132,4 +132,9 @@ public class SecuritySettings extends DashboardFragment {
&& !SafetyCenterManagerWrapper.get().isEnabled(context);
}
};
@Override
public Lifecycle getSettingsLifecycle() {
return super.getSettingsLifecycle();
}
}