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

8334a265

Commit 8334a265 authored 4 years ago by Treehugger Robot Committed by Gerrit Code Review 4 years ago

Downloads
- Plain Diff

Merge "Note network interfaces based on transport"

parents 4452f55a 2c9ed7f3

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

core/java/com/android/internal/app/IBatteryStats.aidl 1 addition, 1 deletion

core/java/com/android/internal/app/IBatteryStats.aidl
core/java/com/android/internal/os/BatteryStatsHelper.java 4 additions, 5 deletions

core/java/com/android/internal/os/BatteryStatsHelper.java
core/java/com/android/internal/os/BatteryStatsImpl.java 7 additions, 4 deletions

core/java/com/android/internal/os/BatteryStatsImpl.java
services/core/java/com/android/server/ConnectivityService.java 5 additions, 5 deletions

...ces/core/java/com/android/server/ConnectivityService.java
services/core/java/com/android/server/am/BatteryStatsService.java 2 additions, 2 deletions

.../core/java/com/android/server/am/BatteryStatsService.java
services/core/java/com/android/server/connectivity/NetworkAgentInfo.java 1 addition, 1 deletion

...ava/com/android/server/connectivity/NetworkAgentInfo.java
tests/net/java/com/android/server/ConnectivityServiceTest.java 14 additions, 12 deletions

.../net/java/com/android/server/ConnectivityServiceTest.java

with 34 additions and 30 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