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

Merge \"Don\'t show the Fingerprint suggestion if it is disabled.\" into nyc-mr1-dev

Browse Source 
am: 8dc1a7340b

Change-Id: If6f0c6307b3c617b0c07c5cf9a69899ae893009c
This commit is contained in:
Daniel Nishi
2016-07-12 21:49:33 +00:00
committed by android-build-merger
parent f32c1b77f5 8dc1a7340b
commit d2965dfe3d
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/android/settings/dashboard/SuggestionsChecks.java
View File

@@ -21,6 +21,7 @@ import android.app.IWallpaperManagerCallback;
import android.app.KeyguardManager; import android.app.KeyguardManager;
import android.app.NotificationManager; import android.app.NotificationManager;
import android.app.WallpaperManager; import android.app.WallpaperManager;
import android.app.admin.DevicePolicyManager;
import android.content.Context; import android.content.Context;
import android.hardware.fingerprint.FingerprintManager; import android.hardware.fingerprint.FingerprintManager;
import android.os.Bundle; import android.os.Bundle;
@@ -59,10 +60,11 @@ public class SuggestionsChecks {
} else if (className.equals(WifiCallingSuggestionActivity.class.getName())) { } else if (className.equals(WifiCallingSuggestionActivity.class.getName())) {
return isWifiCallingUnavailableOrEnabled(); return isWifiCallingUnavailableOrEnabled();
} else if (className.equals(FingerprintSuggestionActivity.class.getName())) { } else if (className.equals(FingerprintSuggestionActivity.class.getName())) {
return isNotSingleFingerprintEnrolled(); return isNotSingleFingerprintEnrolled() || !isFingerprintEnabled();
} else if (className.equals(ScreenLockSuggestionActivity.class.getName()) } else if (className.equals(ScreenLockSuggestionActivity.class.getName())) {
|| className.equals(FingerprintEnrollSuggestionActivity.class.getName())) {
return isDeviceSecured(); return isDeviceSecured();
} else if (className.equals(FingerprintEnrollSuggestionActivity.class.getName())) {
return isDeviceSecured() || !isFingerprintEnabled();
} }
return false; return false;
} }
@@ -108,6 +110,14 @@ public class SuggestionsChecks {
return false; return false;
} }
private boolean isFingerprintEnabled() {
DevicePolicyManager dpManager =
(DevicePolicyManager) mContext.getSystemService(Context.DEVICE_POLICY_SERVICE);
final int dpmFlags = dpManager.getKeyguardDisabledFeatures(null, /* admin */
mContext.getUserId());
return (dpmFlags & DevicePolicyManager.KEYGUARD_DISABLE_FINGERPRINT) == 0;
}
private final IWallpaperManagerCallback mCallback = new IWallpaperManagerCallback.Stub() { private final IWallpaperManagerCallback mCallback = new IWallpaperManagerCallback.Stub() {
@Override @Override
public void onWallpaperChanged() throws RemoteException { public void onWallpaperChanged() throws RemoteException {