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

763285e5

Commit 763285e5 authored 5 years ago by Rubin Xu Committed by Android (Google) Code Review 5 years ago

Downloads
- Plain Diff

Merge "Do not crash if attempt to launch app from locked profile" into rvc-dev

parents 0af18474 6c113b6d

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

core/java/android/app/ActivityManagerInternal.java 2 additions, 1 deletion

core/java/android/app/ActivityManagerInternal.java
services/core/java/com/android/server/am/UserController.java 12 additions, 8 deletions

services/core/java/com/android/server/am/UserController.java
services/core/java/com/android/server/wm/ActivityStartInterceptor.java 2 additions, 2 deletions

.../java/com/android/server/wm/ActivityStartInterceptor.java
services/tests/wmtests/src/com/android/server/wm/ActivityStartInterceptorTest.java 1 addition, 1 deletion

...c/com/android/server/wm/ActivityStartInterceptorTest.java

with 17 additions and 12 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