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

ca9e2463

Commit ca9e2463 authored 2 years ago by Liahav Eitan Committed by Android (Google) Code Review 2 years ago

Downloads
- Plain Diff

Merge "Ask for user consent before resolving personal intent in work profile" into udc-dev

parents cc20521b 013c72e3

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/com/android/internal/app/IntentForwarderActivity.java 52 additions, 4 deletions

...ava/com/android/internal/app/IntentForwarderActivity.java
core/res/AndroidManifest.xml 4 additions, 1 deletion

core/res/AndroidManifest.xml
core/res/res/layout/miniresolver.xml 6 additions, 0 deletions

core/res/res/layout/miniresolver.xml
core/tests/coretests/src/com/android/internal/app/IntentForwarderActivityTest.java 33 additions, 2 deletions

...com/android/internal/app/IntentForwarderActivityTest.java

with 95 additions and 7 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