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

Commit 4c870a09 authored by Andrew Scull's avatar Andrew Scull Committed by Android (Google) Code Review
Browse files

Merge "Resolve error-prone warnings."

parents e41f824c 8fc2ec83

services/core/java/com/android/server/locksettings/LockSettingsService.java

+1 −1
Original line number Diff line number Diff line
@@ -150,12 +150,12 @@ public class LockSettingsService extends ILockSettings.Stub { 
    private final NotificationManager mNotificationManager;

    private final UserManager mUserManager;

    private final IActivityManager mActivityManager;

    private final SyntheticPasswordManager mSpManager;



    private final KeyStore mKeyStore;



    private boolean mFirstCallToVold;

    protected IGateKeeperService mGateKeeperService;

    private SyntheticPasswordManager mSpManager;



    /**

     * The UIDs that are used for system credential storage in keystore.

services/core/java/com/android/server/locksettings/LockSettingsStorage.java

+1 −1
Original line number Diff line number Diff line
@@ -555,7 +555,7 @@ class LockSettingsStorage { 
        void initialize(SQLiteDatabase db);

    }



    class DatabaseHelper extends SQLiteOpenHelper {

    static class DatabaseHelper extends SQLiteOpenHelper {

        private static final String TAG = "LockSettingsDB";

        private static final String DATABASE_NAME = "locksettings.db";