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

Commit 25190577 authored by Jim Miller's avatar Jim Miller
Browse files

Post-review Keyguard cleanup. 

- remove userActivity() from KeyguardService interface and call it
on PowerManager directly
- Split IKeyguardResult into two parts: IKeyguardShowCallback and
IKeyguardExitCallback.
- Misc other changes from the review.

Change-Id: I3f679cfa5d3f8bc742f2b2259ac354045e89a87b
parent 32e18d9f

Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -180,7 +180,8 @@ LOCAL_SRC_FILES += \ 
	core/java/com/android/internal/backup/IBackupTransport.aidl \

	core/java/com/android/internal/policy/IFaceLockCallback.aidl \

	core/java/com/android/internal/policy/IFaceLockInterface.aidl \

	core/java/com/android/internal/policy/IKeyguardResult.aidl \

	core/java/com/android/internal/policy/IKeyguardShowCallback.aidl \

	core/java/com/android/internal/policy/IKeyguardExitCallback.aidl \

	core/java/com/android/internal/policy/IKeyguardService.aidl \

	core/java/com/android/internal/os/IDropBoxManagerService.aidl \

	core/java/com/android/internal/os/IResultReceiver.aidl \

core/java/com/android/internal/policy/IKeyguardResult.aidl→core/java/com/android/internal/policy/IKeyguardExitCallback.aidl

+2 −3
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2012 The Android Open Source Project

 * Copyright (C) 2013 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.
@@ -15,7 +15,6 @@ 
 */

package com.android.internal.policy;



oneway interface IKeyguardResult {

    void onShown(IBinder windowToken);

oneway interface IKeyguardExitCallback {

    void onKeyguardExitResult(boolean success);

}

core/java/com/android/internal/policy/IKeyguardService.aidl

+7 −7
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2012 The Android Open Source Project

 * Copyright (C) 2013 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.
@@ -15,7 +15,8 @@ 
 */

package com.android.internal.policy;



import com.android.internal.policy.IKeyguardResult;

import com.android.internal.policy.IKeyguardShowCallback;

import com.android.internal.policy.IKeyguardExitCallback;



import android.os.Bundle;
@@ -25,17 +26,16 @@ interface IKeyguardService { 
    boolean isShowingAndNotHidden();

    boolean isInputRestricted();

    boolean isDismissable();

    oneway void userActivity();

    oneway void verifyUnlock(IKeyguardResult result);

    oneway void verifyUnlock(IKeyguardExitCallback callback);

    oneway void keyguardDone(boolean authenticated, boolean wakeup);

    oneway void setHidden(boolean isHidden);

    oneway void dismiss();

    oneway void onWakeKeyWhenKeyguardShowingTq(int keyCode);

    oneway void onWakeMotionWhenKeyguardShowingTq();

    oneway void onWakeKeyWhenKeyguardShowing(int keyCode);

    oneway void onWakeMotionWhenKeyguardShowing();

    oneway void onDreamingStarted();

    oneway void onDreamingStopped();

    oneway void onScreenTurnedOff(int reason);

    oneway void onScreenTurnedOn(IKeyguardResult result);

    oneway void onScreenTurnedOn(IKeyguardShowCallback callback);

    oneway void setKeyguardEnabled(boolean enabled);

    oneway void onSystemReady();

    oneway void doKeyguardTimeout(in Bundle options);

core/java/com/android/internal/policy/IKeyguardShowCallback.aidl

0 → 100644
+20 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2013 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.policy;



oneway interface IKeyguardShowCallback {

    void onShown(IBinder windowToken);

}

packages/Keyguard/AndroidManifest.xml

+0 −12
Original line number Diff line number Diff line
@@ -45,17 +45,5 @@ 
        <service android:name=".KeyguardService"

            android:exported="true" />



        <activity android:name=".KeyguardTestActivity"

                android:label="@string/app_name"

                android:theme="@android:style/Theme.Holo"

                android:hardwareAccelerated="true"

                android:process="com.android.keyguard.keyguard_test"

                >

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.LAUNCHER" />

            </intent-filter>

        </activity>



    </application>

</manifest>