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

275b1136

Commit 275b1136 authored 3 years ago by Wei Sheng Shih Committed by Android (Google) Code Review 3 years ago

Downloads
- Plain Diff

Merge "setTurnScreenOn can only used as wakeup" into sc-v2-dev

parents 274cdd4c f3a1274a

No related branches found

No related tags found

No related merge requests found

Changes 2

Hide whitespace changes

Inline Side-by-side

Showing

core/java/android/app/Activity.java 1 addition, 4 deletions

core/java/android/app/Activity.java
services/core/java/com/android/server/wm/KeyguardController.java 7 additions, 32 deletions

...s/core/java/com/android/server/wm/KeyguardController.java

with 8 additions and 36 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