Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

platform_frameworks_base
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

88a5cda2

Commit 88a5cda2 authored 1 year ago by Thomas Nguyen Committed by Android (Google) Code Review 1 year ago

Downloads
- Plain Diff

Merge "Guard new satellite APIs with feature flag" into main

parents 94d5dc45 06f95f23

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

core/api/current.txt 2 additions, 1 deletion

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

core/api/system-current.txt
core/res/res/values/config_telephony.xml 10 additions, 21 deletions

core/res/res/values/config_telephony.xml
telephony/java/android/telephony/CarrierConfigManager.java 4 additions, 16 deletions

telephony/java/android/telephony/CarrierConfigManager.java
telephony/java/android/telephony/satellite/SatelliteManager.java 42 additions, 38 deletions

...ny/java/android/telephony/satellite/SatelliteManager.java
telephony/java/android/telephony/satellite/stub/ISatellite.aidl 7 additions, 3 deletions

...ony/java/android/telephony/satellite/stub/ISatellite.aidl
telephony/java/android/telephony/satellite/stub/SatelliteImplBase.java 11 additions, 8 deletions

...a/android/telephony/satellite/stub/SatelliteImplBase.java

with 82 additions and 87 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