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

014a5435

Commit 014a5435 authored 3 years ago by Tom Natan Committed by Automerger Merge Worker 3 years ago

Downloads
- Plain Diff

Merge "Fix issue where KidsModeTaskOrganizer registers itself as...

Merge "Fix issue where KidsModeTaskOrganizer registers itself as CompatUICallback" into tm-dev am: ad03eb31

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17259743

Change-Id: I58891f8d74a6d49a72190624ad43dcd0a1950f17

parents 3c48c4ee ad03eb31

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

libs/WindowManager/Shell/src/com/android/wm/shell/ShellTaskOrganizer.java 6 additions, 2 deletions

...er/Shell/src/com/android/wm/shell/ShellTaskOrganizer.java
libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellBaseModule.java 2 additions, 4 deletions

...ll/src/com/android/wm/shell/dagger/WMShellBaseModule.java
libs/WindowManager/Shell/src/com/android/wm/shell/kidsmode/KidsModeTaskOrganizer.java 2 additions, 6 deletions

.../com/android/wm/shell/kidsmode/KidsModeTaskOrganizer.java
libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/kidsmode/KidsModeTaskOrganizerTest.java 4 additions, 4 deletions

.../android/wm/shell/kidsmode/KidsModeTaskOrganizerTest.java

with 14 additions and 16 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