Merge "Fix LockSettingsServiceTest"

        return getCredentialTypeInternal(userId) != CREDENTIAL_TYPE_NONE;

    }

    private void setKeystorePassword(byte[] password, int userHandle) {

    @VisibleForTesting /** Note: this method is overridden in unit tests */

    void setKeystorePassword(byte[] password, int userHandle) {

        AndroidKeyStoreMaintenance.onUserPasswordChanged(userHandle, password);

    }

            parcel.recycle();

        }

    }

    @Override

    void setKeystorePassword(byte[] password, int userHandle) {

    }

}

 No newline at end of file

import android.app.NotificationManager;

import android.app.admin.DevicePolicyManager;

import android.app.trust.TrustManager;

import android.content.BroadcastReceiver;

import android.content.Context;

import android.content.ContextWrapper;

import android.content.Intent;

import android.content.IntentFilter;

import android.content.pm.PackageManager;

import android.hardware.face.FaceManager;

import android.hardware.fingerprint.FingerprintManager;

import android.os.Handler;

import android.os.UserHandle;

import android.os.UserManager;

import android.os.storage.StorageManager;

    public int checkCallingOrSelfPermission(String permission) {

        return PackageManager.PERMISSION_GRANTED;

    }

    @Override

    public Intent registerReceiverAsUser(BroadcastReceiver receiver,

            UserHandle user, IntentFilter filter, String broadcastPermission,

            Handler scheduler) {

        return null;

    }

}