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

94404471

Commit 94404471 authored 4 years ago by Roshan Pius Committed by Automerger Merge Worker 4 years ago

Downloads
- Plain Diff

Merge "ConnectivityService: Plumb attribution tag for location permission...

Merge "ConnectivityService: Plumb attribution tag for location permission checks" am: 482b2dda am: 74371a29

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534625

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I656644b786bccbe03cdb93a37a0f47e12e5c330d

parents e399fb29 74371a29

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

packages/Connectivity/framework/src/android/net/ConnectivityManager.java 8 additions, 5 deletions

...tivity/framework/src/android/net/ConnectivityManager.java
packages/Connectivity/framework/src/android/net/IConnectivityManager.aidl 7 additions, 4 deletions

...ivity/framework/src/android/net/IConnectivityManager.aidl
services/core/java/com/android/server/ConnectivityService.java 45 additions, 23 deletions

...ces/core/java/com/android/server/ConnectivityService.java
tests/net/java/android/net/ConnectivityManagerTest.java 6 additions, 4 deletions

tests/net/java/android/net/ConnectivityManagerTest.java
tests/net/java/com/android/server/ConnectivityServiceTest.java 5 additions, 4 deletions

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

with 71 additions and 40 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