Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Supress IKeygaurdSerivce#setOccluded binder call from WM." into sc-dev

Browse Source
This commit is contained in:
Issei Suzuki
2021-03-15 10:43:24 +00:00
committed by Android (Google) Code Review
parent ef6aa4d213 9934a78d47
commit 9ab4b954ce
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java
View File

@@ -149,9 +149,14 @@ public class KeyguardService extends Service {
RemoteAnimationTarget[] wallpapers,
RemoteAnimationTarget[] nonApps,
IRemoteAnimationFinishedCallback finishedCallback) {
// TODO(bc-unlock): Calls KeyguardViewMediator#setOccluded to update the state and
// run animation.
try {
if (transit == TRANSIT_OLD_KEYGUARD_OCCLUDE) {
mBinder.setOccluded(true /* isOccluded */, true /* animate */);
} else if (transit == TRANSIT_OLD_KEYGUARD_UNOCCLUDE) {
mBinder.setOccluded(false /* isOccluded */, true /* animate */);
}
// TODO(bc-unlock): Implement occlude/unocclude animation applied on apps,
// wallpapers and nonApps.
finishedCallback.onAnimationFinished();
} catch (RemoteException e) {
Slog.e(TAG, "RemoteException");

6
services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java
View File

@@ -258,8 +258,12 @@ public class KeyguardServiceDelegate {
}
}
/**
* @deprecated Notify occlude status change via remote animation.
*/
@Deprecated
public void setOccluded(boolean isOccluded, boolean animate) {
if (mKeyguardService != null) {
if (!WindowManagerService.sEnableRemoteKeyguardAnimation && mKeyguardService != null) {
if (DEBUG) Log.v(TAG, "setOccluded(" + isOccluded + ") animate=" + animate);
mKeyguardService.setOccluded(isOccluded, animate);
}