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

Commit 7bfd6bd3 authored by Adrian Roos's avatar Adrian Roos Committed by Android Git Automerger
Browse files

am 6fafa8cd: am 36d059f9: am 138b8334: Obliterate LockPatternUtilsCache 

* commit '6fafa8cd':
  Obliterate LockPatternUtilsCache
parents 8e4497fd 6fafa8cd

Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -288,7 +288,6 @@ LOCAL_SRC_FILES += \ 
	core/java/com/android/internal/view/IInputMethodSession.aidl \

	core/java/com/android/internal/view/IInputSessionCallback.aidl \

	core/java/com/android/internal/widget/ILockSettings.aidl \

	core/java/com/android/internal/widget/ILockSettingsObserver.aidl \

	core/java/com/android/internal/widget/IRemoteViewsFactory.aidl \

	core/java/com/android/internal/widget/IRemoteViewsAdapterConnection.aidl \

	keystore/java/android/security/IKeyChainAliasCallback.aidl \

CleanSpec.mk

+1 −0
Original line number Diff line number Diff line
@@ -224,6 +224,7 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/servic 
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/inputflinger $(PRODUCT_OUT)/symbols/system/bin/inputflinger)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/RsFountainFbo_intermediates)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework-base_intermediates/src/telecomm/java/com/android/internal/telecomm)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/com/android/internal/widget/ILockSettingsObserver.java)



# ******************************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THIS BANNER

core/java/com/android/internal/widget/ILockSettings.aidl

+0 −4
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package com.android.internal.widget;



import com.android.internal.widget.ILockSettingsObserver;



/** {@hide} */

interface ILockSettings {

    void setBoolean(in String key, in boolean value, in int userId);
@@ -34,6 +32,4 @@ interface ILockSettings { 
    boolean havePattern(int userId);

    boolean havePassword(int userId);

    void removeUser(int userId);

    void registerObserver(in ILockSettingsObserver observer);

    void unregisterObserver(in ILockSettingsObserver observer);

}

core/java/com/android/internal/widget/ILockSettingsObserver.aidl

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2014 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.internal.widget;



/** {@hide} */

oneway interface ILockSettingsObserver {

    /**

     * Called when a lock setting has changed.

     *

     * Note: Impementations of this should do as little work as possible, because this may be

     * called synchronously while writing a setting.

     *

     * @param key the key of the setting that has changed or {@code null} if any may have changed.

     * @param userId the user whose setting has changed.

     */

    void onLockSettingChanged(in String key, in int userId);

}

core/java/com/android/internal/widget/LockPatternUtils.java

+1 −12
Original line number Diff line number Diff line
@@ -64,13 +64,6 @@ public class LockPatternUtils { 
    private static final String TAG = "LockPatternUtils";

    private static final boolean DEBUG = false;



    /**

     * If true, LockPatternUtils will cache its values in-process. While this leads to faster reads,

     * it can cause problems because writes to to the settings are no longer synchronous

     * across all processes.

     */

    private static final boolean ENABLE_CLIENT_CACHE = false;



    /**

     * The maximum number of incorrect attempts before the user is prevented

     * from trying again for {@link #FAILED_ATTEMPT_TIMEOUT_MS}.
@@ -216,12 +209,8 @@ public class LockPatternUtils { 
        if (mLockSettingsService == null) {

            ILockSettings service = ILockSettings.Stub.asInterface(

                    ServiceManager.getService("lock_settings"));

            if (ENABLE_CLIENT_CACHE) {

                mLockSettingsService = LockPatternUtilsCache.getInstance(service);

            } else {

            mLockSettingsService = service;

        }

        }

        return mLockSettingsService;

    }