Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update #22

Open
wants to merge 2 commits into
base: 11.0
Choose a base branch
from
Open

update #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05d55c9
Partial revert of ed15eee545584a75ba4825a2f8650f4db470ad4a
4j17h Mar 6, 2021
0f3eb3b
FingerprintService: Prevent cleanup of unused fingerprints
codeworkx Oct 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions core/res/res/values/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4385,4 +4385,7 @@

<!-- Component names of the services which will keep critical code path warm -->
<string-array name="config_keep_warming_services" translatable="false" />

<!-- Whether to cleanup fingerprints upon connection to the daemon and when user switches -->
<bool name="config_cleanupUnusedFingerprints">true</bool>
</resources>
3 changes: 3 additions & 0 deletions core/res/res/values/symbols.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4051,4 +4051,7 @@
<java-symbol type="array" name="config_notificationMsgPkgsAllowedAsConvos" />

<java-symbol type="array" name="config_keep_warming_services" />

<!-- Whether to cleanup fingerprints upon connection to the daemon and when user switches -->
<java-symbol type="bool" name="config_cleanupUnusedFingerprints" />
</resources>
20 changes: 10 additions & 10 deletions media/jni/audioeffect/android_media_AudioEffect.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,21 +337,21 @@ android_media_AudioEffect_native_setup(JNIEnv *env, jobject thiz, jobject weak_t
}

// create the native AudioEffect object
lpAudioEffect = new AudioEffect(String16(opPackageNameStr.c_str()));
lpAudioEffect = new AudioEffect(typeStr,
String16(opPackageNameStr.c_str()),
uuidStr,
priority,
effectCallback,
&lpJniStorage->mCallbackData,
(audio_session_t) sessionId,
AUDIO_IO_HANDLE_NONE,
device,
probe);
if (lpAudioEffect == 0) {
ALOGE("Error creating AudioEffect");
goto setup_failure;
}

lpAudioEffect->set(typeStr,
uuidStr,
priority,
effectCallback,
&lpJniStorage->mCallbackData,
(audio_session_t) sessionId,
AUDIO_IO_HANDLE_NONE,
device,
probe);
lStatus = AudioEffectJni::translateNativeErrorToJava(lpAudioEffect->initCheck());
if (lStatus != AUDIOEFFECT_SUCCESS && lStatus != AUDIOEFFECT_ERROR_ALREADY_EXISTS) {
ALOGE("AudioEffect initCheck failed %d", lStatus);
Expand Down
6 changes: 4 additions & 2 deletions services/core/java/com/android/server/biometrics/BiometricServiceBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ public abstract class BiometricServiceBase extends SystemService

protected static final boolean DEBUG = true;

private static final boolean CLEANUP_UNKNOWN_TEMPLATES = true;
private static final String KEY_LOCKOUT_RESET_USER = "lockout_reset_user";
private static final int MSG_USER_SWITCHING = 10;
private static final long CANCEL_TIMEOUT_LIMIT = 3000; // max wait for onCancel() from HAL,in ms
Expand All @@ -89,6 +88,7 @@ public abstract class BiometricServiceBase extends SystemService
private final PowerManager mPowerManager;
private final UserManager mUserManager;
private final MetricsLogger mMetricsLogger;
private final boolean mCleanupUnusedFingerprints;
private final boolean mPostResetRunnableForAllClients;
private final BiometricTaskStackListener mTaskStackListener = new BiometricTaskStackListener();
private final ResetClientStateRunnable mResetClientState = new ResetClientStateRunnable();
Expand Down Expand Up @@ -663,6 +663,8 @@ public BiometricServiceBase(Context context) {
mPowerManager = mContext.getSystemService(PowerManager.class);
mUserManager = UserManager.get(mContext);
mMetricsLogger = new MetricsLogger();
mCleanupUnusedFingerprints = mContext.getResources().getBoolean(
com.android.internal.R.bool.config_cleanupUnusedFingerprints);
mPostResetRunnableForAllClients = mContext.getResources().getBoolean(
com.android.internal.R.bool.config_fingerprintPostResetRunnableForAllClients);
}
Expand Down Expand Up @@ -1247,7 +1249,7 @@ protected long getAuthenticatorId(int callingUserId) {
* @param userId
*/
protected void doTemplateCleanupForUser(int userId) {
if (CLEANUP_UNKNOWN_TEMPLATES) {
if (mCleanupUnusedFingerprints) {
enumerateUser(userId);
}
}
Expand Down