Commit Graph

15507 Commits

Author SHA1 Message Date
Paul Hu
9bea12fcda Merge "Read APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting from PermissionMonitor" am: dec7232c75 am: 6d8b78770a am: 70c7639228
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689572

Change-Id: I6bfca3977345a57da6dc7938911fa3e26ea543e8
2021-05-19 22:48:36 +00:00
Chiachang Wang
2749ade0e0 [automerger skipped] Merge "Replace clearAll with withoutDefaultCapabilities" am: 98546082cc am: d19bda6e8c -s ours am: 420d77919d -s ours
am skip reason: Merged-In Ida8d25d57504864f046e3403f593cc606fbfe982 with SHA-1 c5c3bfb20e is already in history

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

Change-Id: I4af87b18428e5b063e06e3ae9e5ed70696159f0c
2021-05-19 22:47:41 +00:00
Junyu Lai
de07af947a Merge changes I3ba50cbd,I970ee365 am: 260b398281 am: c3fde912c6 am: ae76c2c199
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620859

Change-Id: I9ce9369b30bc568a63321de8764bd49c263b9ea6
2021-05-19 22:47:04 +00:00
Jayachandran Chinnakkannu
30e200c808 Merge "QOS filter matching support based on remote address and port number for connected sockets" am: fd92919d9d am: 61736254b7 am: cea0264ef0 am: 2e83d431f0 am: db9428d005
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1687813

Change-Id: Ia548f7e27aedcaaae684568fce8762813c4cfcc3
2021-05-19 22:43:39 +00:00
Jayachandran Chinnakkannu
978e40ec79 Merge "QOS filter matching support based on remote address and port number for connected sockets" am: fd92919d9d am: 61736254b7 am: cf6df117e0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1687813

Change-Id: I1e20ec6047dda2accc8565a8a2034bd535eb607c
2021-05-19 22:34:55 +00:00
Nikita Iashchenko
1cc81ac920 Move IoUtils#deleteContents from CorePlatformApi set to framework
As a part of internal core libraries cleanup move usages of
IoUtils#deleteContents from CorePlatformApi set to framework.

Bug: 154796679
Test: m update-api
Change-Id: If7037029026b6753ab64be09aa52c40e04d5c7b1
(cherry picked from commit 09b5e4a00f)
2021-05-19 14:40:05 -07:00
Paul Hu
70c7639228 Merge "Read APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting from PermissionMonitor" am: dec7232c75 am: 6d8b78770a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689572

Change-Id: I216224011720d64316b9801ef54859b8de2bdb89
2021-05-17 03:52:42 +00:00
Paul Hu
6d8b78770a Merge "Read APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting from PermissionMonitor" am: dec7232c75
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689572

Change-Id: I5515f041b783e36ca439e2b7b1d77e93ee329be0
2021-05-17 03:28:16 +00:00
Paul Hu
dec7232c75 Merge "Read APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting from PermissionMonitor" 2021-05-17 03:04:59 +00:00
Chiachang Wang
420d77919d [automerger skipped] Merge "Replace clearAll with withoutDefaultCapabilities" am: 98546082cc am: d19bda6e8c -s ours
am skip reason: Merged-In Ida8d25d57504864f046e3403f593cc606fbfe982 with SHA-1 c5c3bfb20e is already in history

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

Change-Id: I7c3a7d6d8ba6b93546d0b436f2d63ab2ae1d2bb9
2021-05-17 03:04:50 +00:00
Chiachang Wang
d19bda6e8c Merge "Replace clearAll with withoutDefaultCapabilities" am: 98546082cc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1708330

Change-Id: Ibb29c90f818ca6f447d91f0eda0abe0ef82363dd
2021-05-17 02:29:35 +00:00
Chiachang Wang
98546082cc Merge "Replace clearAll with withoutDefaultCapabilities" 2021-05-17 01:56:52 +00:00
paulhu
5d847b19cd Read APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting from PermissionMonitor
Let PermissionMonitor read APPS_ALLOWED_ON_RESTRICTED_NETWORKS
setting and grant netd system permission to uids whose package
name is listed in setting.

Bug: 185149952
Test: atest FrameworksNetTests
Change-Id: I856b545c0339a262abbe9d432cfda125bc82dc12
2021-05-16 23:48:55 +08:00
Junyu Lai
ae76c2c199 Merge changes I3ba50cbd,I970ee365 am: 260b398281 am: c3fde912c6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620859

Change-Id: If9a3e37e5359b955e330002d81cbeb48f90ee22b
2021-05-15 17:24:42 +00:00
Junyu Lai
c3fde912c6 Merge changes I3ba50cbd,I970ee365 am: 260b398281
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620859

Change-Id: I2cf4ea0abb1ff7bc74302cce16cbe8041b08d321
2021-05-15 16:53:30 +00:00
Junyu Lai
260b398281 Merge changes I3ba50cbd,I970ee365
* changes:
  [FUI29] Migrate ConnectivityService to use getAllNetworkStateSnapshots
  [FUI27] Fix internal naming of notifyNetworkStatus
2021-05-15 16:21:38 +00:00
Jayachandran Chinnakkannu
db9428d005 Merge "QOS filter matching support based on remote address and port number for connected sockets" am: fd92919d9d am: 61736254b7 am: cea0264ef0 am: 2e83d431f0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1687813

Change-Id: I6cd8f7852b2231a59b990a20658a232df6ce87e4
2021-05-14 21:26:14 +00:00
Jayachandran Chinnakkannu
c897564b79 Merge "QOS filter matching support based on remote address and port number for connected sockets" am: fd92919d9d am: 61736254b7 am: cea0264ef0 am: 2e83d431f0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1687813

Change-Id: Icad3f6832c5e54ebeb47b49d810c7f7295f13b31
2021-05-14 21:26:07 +00:00
Jayachandran Chinnakkannu
2e83d431f0 Merge "QOS filter matching support based on remote address and port number for connected sockets" am: fd92919d9d am: 61736254b7 am: cea0264ef0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1687813

Change-Id: I04ada71bdea2c3851fd6925126f6ff2bfdecad2c
2021-05-14 21:19:17 +00:00
Jayachandran Chinnakkannu
cf6df117e0 Merge "QOS filter matching support based on remote address and port number for connected sockets" am: fd92919d9d am: 61736254b7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1687813

Change-Id: I32f71d0bc49e6a348d64cb0adb8abf421677f306
2021-05-14 20:54:05 +00:00
Jayachandran Chinnakkannu
cea0264ef0 Merge "QOS filter matching support based on remote address and port number for connected sockets" am: fd92919d9d am: 61736254b7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1687813

Change-Id: I6f1d972f822b022995cfdc99942f1167a4f8ef0d
2021-05-14 20:53:05 +00:00
Jayachandran Chinnakkannu
61736254b7 Merge "QOS filter matching support based on remote address and port number for connected sockets" am: fd92919d9d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1687813

Change-Id: Ibd70a86d82d4810425288694f2e3904d471a2d24
2021-05-14 20:28:38 +00:00
Jayachandran Chinnakkannu
fd92919d9d Merge "QOS filter matching support based on remote address and port number for connected sockets" 2021-05-14 20:02:30 +00:00
Junyu Lai
6906c75075 Merge "[FUI26] Address comments on aosp/1560408" am: 819b9a637e am: ee455cedce am: 35039336a6 am: 1bdbacd83c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1618845

Change-Id: I368776aac3fd64065efa4864358884ee25b732b1
2021-05-14 12:25:28 +00:00
Junyu Lai
1bdbacd83c Merge "[FUI26] Address comments on aosp/1560408" am: 819b9a637e am: ee455cedce am: 35039336a6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1618845

Change-Id: I8c62d218953027ee2fb5426ddacae5a6f8bb6c73
2021-05-14 12:20:10 +00:00
Junyu Lai
35039336a6 Merge "[FUI26] Address comments on aosp/1560408" am: 819b9a637e am: ee455cedce
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1618845

Change-Id: If6b9da9ce754f33868305075013b0f82ff64fedb
2021-05-14 12:03:29 +00:00
junyulai
565a3085ce [FUI29] Migrate ConnectivityService to use getAllNetworkStateSnapshots
Test: atest FrameworksNetTests
Bug: 174123988
Change-Id: I3ba50cbd8a7f60779c69ba85e10dc3cc8a52f8b1
2021-05-14 19:48:17 +08:00
junyulai
5eb5fbfce3 [FUI27] Fix internal naming of notifyNetworkStatus
Test: TH
Bug: 174123988
Change-Id: I970ee365ca221956ee85788005d331374b5fa71a
2021-05-14 19:48:17 +08:00
Junyu Lai
ee455cedce Merge "[FUI26] Address comments on aosp/1560408" am: 819b9a637e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1618845

Change-Id: Idde0e161d6241a5c45c0b751e1fca912ed10c7a8
2021-05-14 11:48:14 +00:00
Junyu Lai
819b9a637e Merge "[FUI26] Address comments on aosp/1560408" 2021-05-14 11:34:09 +00:00
Paul Hu
4cb12b5f7d Merge "Address [set|get]RestrictedAllowedApps API review feedback" am: 38d6905614 am: d0c08e3cd8 am: 0cc57b5c0b am: a99d1226d2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1708327

Change-Id: Ib5b6765cea8fa95fb31f6a6ede440dd7c867941a
2021-05-14 11:05:50 +00:00
Paul Hu
a99d1226d2 Merge "Address [set|get]RestrictedAllowedApps API review feedback" am: 38d6905614 am: d0c08e3cd8 am: 0cc57b5c0b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1708327

Change-Id: Ia8e395132226d23fdfb8cd4c93c004c459386104
2021-05-14 11:00:38 +00:00
TreeHugger Robot
9a5859554b Merge "Move connectivity test defaults to tests/common" into sc-dev am: 6c7d52f93c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14543666

Change-Id: Ia33d381cbe11daea6e551e922d668156e949ec48
2021-05-14 10:56:38 +00:00
Paul Hu
0cc57b5c0b Merge "Address [set|get]RestrictedAllowedApps API review feedback" am: 38d6905614 am: d0c08e3cd8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1708327

Change-Id: Iedd6429e956f77ba595f5dd6029c48a487ddbf0c
2021-05-14 10:41:33 +00:00
TreeHugger Robot
6c7d52f93c Merge "Move connectivity test defaults to tests/common" into sc-dev 2021-05-14 10:40:28 +00:00
Chiachang Wang
3267274176 Replace clearAll with withoutDefaultCapabilities
As the feedback from API review, the clearAll method in Builder
does not match the actual usage. Thus, remove it and replace
with withoutDefaultCapabilities to provide clearer usage.

Bug: 184735772
Test: make update-api ; m
Change-Id: Ida8d25d57504864f046e3403f593cc606fbfe982
Merged-In: Ida8d25d57504864f046e3403f593cc606fbfe982
2021-05-14 10:36:37 +00:00
Aaron Huang
8882f3d398 [automerger skipped] Merge "Rename *Iface* APIs to *Interface*" am: 666aa69090 am: 902c1df2d7 am: c2d39cdac4 -s ours am: 319b0be3ed -s ours
am skip reason: Merged-In I38b476e762fb57fa88c4a789092d0af6f5330d80 with SHA-1 aa601c3bf1 is already in history

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

Change-Id: I5b28120863044fb544a7b9377ebe33d233c7fd51
2021-05-14 10:29:48 +00:00
Treehugger Robot
749399ef6a Merge "Reference unreachable netId from INetd" am: 7c26f06ea1 am: 99054d066c am: 52dcdaf9ea am: 5c752b5aca
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1708326

Change-Id: I368ed1fea79c57735acbc643b431073e482547a4
2021-05-14 10:28:54 +00:00
TreeHugger Robot
094d0c386b Merge "Address comments on ag/14486203" into sc-dev am: 4aa5b97ccb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14540395

Change-Id: Ia8a1d90b3935d23e47a9cc8783d08f90d87a2def
2021-05-14 10:27:14 +00:00
Paul Hu
d0c08e3cd8 Merge "Address [set|get]RestrictedAllowedApps API review feedback" am: 38d6905614
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1708327

Change-Id: I0c9966c379e956fbf8a01d81d5f1dd0e68662763
2021-05-14 10:25:37 +00:00
Aaron Huang
319b0be3ed [automerger skipped] Merge "Rename *Iface* APIs to *Interface*" am: 666aa69090 am: 902c1df2d7 am: c2d39cdac4 -s ours
am skip reason: Merged-In I38b476e762fb57fa88c4a789092d0af6f5330d80 with SHA-1 aa601c3bf1 is already in history

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

Change-Id: I39709941a1770435d9a2e221025b46eed5d32ea0
2021-05-14 10:07:18 +00:00
Treehugger Robot
5c752b5aca Merge "Reference unreachable netId from INetd" am: 7c26f06ea1 am: 99054d066c am: 52dcdaf9ea
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1708326

Change-Id: Ia8db25ba86450341d4b9278eba350014fa3b880c
2021-05-14 10:06:00 +00:00
Paul Hu
38d6905614 Merge "Address [set|get]RestrictedAllowedApps API review feedback" 2021-05-14 10:00:39 +00:00
TreeHugger Robot
4aa5b97ccb Merge "Address comments on ag/14486203" into sc-dev 2021-05-14 09:59:43 +00:00
Aaron Huang
c2d39cdac4 Merge "Rename *Iface* APIs to *Interface*" am: 666aa69090 am: 902c1df2d7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1693585

Change-Id: I9aa62677f52ac78916c518d1378a05bda143f676
2021-05-14 09:44:33 +00:00
Chiachang Wang
bd12eb8f1c Merge "Replace clearAll with withoutDefaultCapabilities" into sc-dev am: cc142fec4c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14514111

Change-Id: Ic1427d7e1265bca01ef186adae490583ef6f05c6
2021-05-14 09:37:24 +00:00
Aaron Huang
902c1df2d7 Merge "Rename *Iface* APIs to *Interface*" am: 666aa69090
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1693585

Change-Id: I62fa0403c8b2d78e7e7a90be8ac804576ec27456
2021-05-14 09:36:36 +00:00
Treehugger Robot
52dcdaf9ea Merge "Reference unreachable netId from INetd" am: 7c26f06ea1 am: 99054d066c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1708326

Change-Id: I2f14897dda29c6ea4469952e56a0fa0e1c8a9a8f
2021-05-14 09:36:35 +00:00
Chiachang Wang
cc142fec4c Merge "Replace clearAll with withoutDefaultCapabilities" into sc-dev 2021-05-14 09:32:42 +00:00
Aaron Huang
666aa69090 Merge "Rename *Iface* APIs to *Interface*" 2021-05-14 09:11:29 +00:00