Robert Greenwalt d852e7517f [automerger skipped] am 2b17d4bf: (-s ours) am 1a337547: Merge "Add bugreport info about network feature use. DO NOT MERGE" into eclair am: 58a72c1740 -s ours ...

am skip reason: subject contains skip directive

Original change: undetermined

Change-Id: Iaa3b0c0cbc2191d9ba67cc0f7ece9824a6d5353a

2021-05-31 03:38:13 +00:00

core

Fix Javadoc errors so the sdk can build.

2010-01-13 11:47:50 -08:00

framework

Merge "Use updated NetworkEventDispatcher API" into sc-dev

2021-05-26 13:34:07 +00:00

service

Update allowed on restricted networks getter/setter

2021-05-26 16:16:57 +08:00

services/java/com/android/server

resolved conflicts for merge of b954337d to master

2010-01-15 10:45:11 -08:00

tests

Update allowed on restricted networks getter/setter

2021-05-26 16:16:57 +08:00

Tethering

Include sdk versioning proto in tethering apex

2021-05-25 13:01:31 +01:00

.gitignore

Add a .gitignore in packages/modules/Connectivity.

2020-11-27 18:09:21 +09:00

OWNERS

add maze to OWNERS

2021-01-19 18:31:52 -08:00

PREUPLOAD.cfg

Add repo hooks for packages/modules/Connectivity.

2020-11-27 18:09:24 +09:00

TEST_MAPPING

Merge history of packages/Connectivity

2021-05-24 04:40:14 +00:00

Description

android_packages_modules_Connectivity

189 MiB

Languages

Java 81.4%

Kotlin 7.7%

AIDL 4.5%

C++ 4.5%

C 1.7%

Other 0.1%