Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

platform_frameworks_base-old
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

8822d4be

Commit 8822d4be authored 10 years ago by Jeff Brown Committed by Android (Google) Code Review 10 years ago

Downloads
- Plain Diff

Merge "resolved conflicts for merge of 4f8cd188 to master"

parents 71beb209 fb0448ab

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

core/java/android/view/WindowManagerPolicy.java 4 additions, 6 deletions

core/java/android/view/WindowManagerPolicy.java
packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java 3 additions, 3 deletions

...c/com/android/keyguard/KeyguardUpdateMonitorCallback.java
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java 2 additions, 5 deletions

...c/com/android/systemui/keyguard/KeyguardViewMediator.java
policy/src/com/android/internal/policy/impl/PhoneWindowManager.java 4 additions, 4 deletions

.../com/android/internal/policy/impl/PhoneWindowManager.java
services/core/java/com/android/server/power/Notifier.java 2 additions, 2 deletions

services/core/java/com/android/server/power/Notifier.java

with 15 additions and 20 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment