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

d55bbb7e

Commit d55bbb7e authored 3 years ago by Ricky Wai Committed by Android (Google) Code Review 3 years ago

Downloads
- Plain Diff

Merge "Merge BroadcastOptions and ActivityOptions PendingIntent BAL flags and remove @hide"

parents 2c22cec6 bcf44fa9

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

core/api/current.txt 2 additions, 0 deletions

core/api/current.txt
core/api/system-current.txt 2 additions, 0 deletions

core/api/system-current.txt
core/java/android/app/ActivityOptions.java 5 additions, 41 deletions

core/java/android/app/ActivityOptions.java
core/java/android/app/BroadcastOptions.java 25 additions, 37 deletions

core/java/android/app/BroadcastOptions.java
core/java/android/app/ComponentOptions.java 76 additions, 0 deletions

core/java/android/app/ComponentOptions.java

with 110 additions and 78 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