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

Add tests for some security setting controllers

Browse Source 
Bug: 32953042
Test: robotests
Change-Id: Ieab4e6434bbb80313f6d1b25ff1cdea5713038f0
This commit is contained in:
Fan Zhang
2018-01-05 11:18:44 -08:00
parent 361e55bb4c
commit cf97f0b643
14 changed files with 708 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/Utils.java
View File

@@ -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;
}

2
src/com/android/settings/security/FingerprintProfileStatusPreferenceController.java → src/com/android/settings/fingerprint/FingerprintProfileStatusPreferenceController.java
View File

@@ -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;

4
src/com/android/settings/security/FingerprintStatusPreferenceController.java → src/com/android/settings/fingerprint/FingerprintStatusPreferenceController.java
View File

@@ -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;

3
src/com/android/settings/security/SecuritySettingsV2.java
View File

@@ -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;

2
src/com/android/settings/security/LockScreenPreferenceController.java → src/com/android/settings/security/screenlock/LockScreenPreferenceController.java
View File

@@ -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;