Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3fa890b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add tests for some security setting controllers"

parents 39e6bc23 cf97f0b6

src/com/android/settings/Utils.java

+1 −1
Original line number Diff line number Diff line
@@ -1222,7 +1222,7 @@ public final class Utils extends com.android.settingslib.Utils { 


    public static FingerprintManager getFingerprintManagerOrNull(Context context) {

        if (context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FINGERPRINT)) {

            return context.getSystemService(FingerprintManager.class);

            return (FingerprintManager) context.getSystemService(Context.FINGERPRINT_SERVICE);

        } else {

            return null;

        }

src/com/android/settings/security/FingerprintProfileStatusPreferenceController.java→src/com/android/settings/fingerprint/FingerprintProfileStatusPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.settings.security;

package com.android.settings.fingerprint;



import android.content.Context;

import android.os.UserHandle;

src/com/android/settings/security/FingerprintStatusPreferenceController.java→src/com/android/settings/fingerprint/FingerprintStatusPreferenceController.java

+1 −3
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.settings.security;

package com.android.settings.fingerprint;



import android.content.Context;

import android.content.Intent;
@@ -28,8 +28,6 @@ import com.android.internal.widget.LockPatternUtils; 
import com.android.settings.R;

import com.android.settings.Utils;

import com.android.settings.core.BasePreferenceController;

import com.android.settings.fingerprint.FingerprintEnrollIntroduction;

import com.android.settings.fingerprint.FingerprintSettings;

import com.android.settings.overlay.FeatureFactory;



import java.util.List;

src/com/android/settings/security/SecuritySettingsV2.java

+3 −0
Original line number Diff line number Diff line
@@ -16,8 +16,11 @@ import com.android.settings.dashboard.DashboardFragment; 
import com.android.settings.dashboard.SummaryLoader;

import com.android.settings.enterprise.EnterprisePrivacyPreferenceController;

import com.android.settings.enterprise.ManageDeviceAdminPreferenceController;

import com.android.settings.fingerprint.FingerprintProfileStatusPreferenceController;

import com.android.settings.fingerprint.FingerprintStatusPreferenceController;

import com.android.settings.location.LocationPreferenceController;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.security.screenlock.LockScreenPreferenceController;

import com.android.settings.security.trustagent.ManageTrustAgentsPreferenceController;

import com.android.settings.security.trustagent.TrustAgentListPreferenceController;

import com.android.settings.widget.PreferenceCategoryController;

src/com/android/settings/security/LockScreenPreferenceController.java→src/com/android/settings/security/screenlock/LockScreenPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.settings.security;

package com.android.settings.security.screenlock;



import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;