Commit Graph

568114 Commits

Author SHA1 Message Date
Paul Hu
eaaa0cbce1 Merge "Register APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting observer" am: a199e8bf27
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689573

Change-Id: If352718bf7de1c6446f291710c2b114ffd57abc6
2021-05-17 07:31:32 +00:00
Paul Hu
a199e8bf27 Merge "Register APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting observer" 2021-05-17 06:45:52 +00:00
Paul Hu
9eec752260 Merge "Read APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting from PermissionMonitor" am: 59dc4f0ac2
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
59dc4f0ac2 Merge "Read APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting from PermissionMonitor" 2021-05-17 03:04:59 +00:00
Chiachang Wang
1fb7474033 Merge "Replace clearAll with withoutDefaultCapabilities" am: 86a1c27f57
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
86a1c27f57 Merge "Replace clearAll with withoutDefaultCapabilities" 2021-05-17 01:56:52 +00:00
paulhu
fac3fc8ff5 Register APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting observer
PermissionMonitor register APPS_ALLOWED_ON_RESTRICTED_NETWORKS
setting observer to listen setting changed callback. Then update
or revoke permission for those apps.

Bug: 185149952
Test: atest FrameworksNetTests
Change-Id: I4b6a21bd3f47b7bcaac36fcabf1202a5a84a4520
2021-05-16 15:52:36 +00:00
paulhu
08295d2feb 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
ed64c29783 Merge changes I3ba50cbd,I970ee365 am: 37f2408143
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
37f2408143 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
Benedict Wong
a6006f1d44 Merge "Remove underlying network caps" am: 886e94b0a3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1709008

Change-Id: I327333d7897c088ef79b41f61dfa8929c2e45f1c
2021-05-14 22:51:39 +00:00
Nathan Harold
b9ec9c28ef Merge "Update VCN Owners Post-Initial-Development" am: 4b8d448b3b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1709010

Change-Id: I9d0d11bd364a759d2f5ccb3d4a56f2a4270d9ac6
2021-05-14 22:48:08 +00:00
Benedict Wong
886e94b0a3 Merge "Remove underlying network caps" 2021-05-14 22:40:54 +00:00
Benedict Wong
b2632543c0 Remove underlying network caps
Bug: 182219992
Test: atest FrameworksVcnTests
Change-Id: Ic2fec8a87fd19a1780333c61759c4092598d349e
2021-05-14 15:28:34 -07:00
Nathan Harold
4b8d448b3b Merge "Update VCN Owners Post-Initial-Development" 2021-05-14 22:27:00 +00:00
Nathan Harold
e0f865d554 Update VCN Owners Post-Initial-Development
Owners files update for VCN now that primary development
is complete and the codebase is stable.

Bug: 8675309
Test: compilation
Change-Id: Ie686729b33f0a7e1c3414374ce4bf3d7ef514a22
2021-05-14 15:05:26 -07:00
Jayachandran Chinnakkannu
5abb533da2 Merge "QOS filter matching support based on remote address and port number for connected sockets" am: 853bb0df91
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
853bb0df91 Merge "QOS filter matching support based on remote address and port number for connected sockets" 2021-05-14 20:02:30 +00:00
Jeff Sharkey
d59dfa2fb1 Merge "Add OWNERS to com.android.internal.app.procstats" am: a469054f27
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1691206

Change-Id: I8cb39a291b70760211d19ec0a841721e80128315
2021-05-14 18:59:42 +00:00
Jeff Sharkey
a469054f27 Merge "Add OWNERS to com.android.internal.app.procstats" 2021-05-14 18:26:22 +00:00
Selim Cinek
bbd0180875 Merge "Updating owners in core and in resources" am: 07107bead9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1693525

Change-Id: I261d086cd6d82fd49c4f6fafd9f6bd9b5ea6f799
2021-05-14 17:35:52 +00:00
Christian Wailes
f9d8fff294 Merge "Fix error formatting issues" am: cd95e9fa3b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1707886

Change-Id: I4fdf71f667af2ab6f2276d53b210a892e1fca912
2021-05-14 17:27:46 +00:00
Selim Cinek
07107bead9 Merge "Updating owners in core and in resources" 2021-05-14 17:21:16 +00:00
Christian Wailes
cd95e9fa3b Merge "Fix error formatting issues" 2021-05-14 17:12:04 +00:00
Jay Patel
a111377f7d Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de9d" into stage-aosp-master 2021-05-14 16:44:53 +00:00
Jay Patel
d28e890b48 Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de9d" into stage-aosp-master 2021-05-14 16:44:50 +00:00
Jay Patel
8db1be84ce Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de9d" into stage-aosp-master 2021-05-14 16:44:47 +00:00
Jay Patel
8f43581b46 Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de9d" into stage-aosp-master 2021-05-14 16:44:44 +00:00
Jay Patel
1feaa9f621 Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de9d" into stage-aosp-master 2021-05-14 16:44:34 +00:00
Jay Patel
307b7d3ac1 Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de9d" into stage-aosp-master 2021-05-14 16:44:31 +00:00
Jay Patel
f58b846016 Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de9d" into stage-aosp-master 2021-05-14 16:44:27 +00:00
Jay Patel
e4409e6b7e Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de9d" into stage-aosp-master 2021-05-14 16:44:24 +00:00
Jay Patel
e71830dafc Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de9d" into stage-aosp-master 2021-05-14 16:44:18 +00:00
Jay Patel
3036d7bf83 Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de9d" into stage-aosp-master 2021-05-14 16:44:09 +00:00
Gavin Corkery
589f728b5a Merge "Add per-file bugreporting OWNERS" am: 324a5e53a9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1706699

Change-Id: I5f6ebb0e79f5fdeb98f1d247205d07c2536004e4
2021-05-14 16:05:10 +00:00
Gavin Corkery
324a5e53a9 Merge "Add per-file bugreporting OWNERS" 2021-05-14 15:40:45 +00:00
Selim Cinek
2a914eff4f Updating owners in core and in resources
Adding cinek as owner of base framework and
adding members of Sysui Motion & gfx as owners of
resources as we have to touch these often.

Bug: N/A
Test: add code changes, observe new ownership
Change-Id: I2b8c4a0e38b425b85d008a3589569a42f2b59556
2021-05-14 14:32:03 +00:00
junyulai
a081acd610 [FUI29] Migrate ConnectivityService to use getAllNetworkStateSnapshots
Test: atest FrameworksNetTests
Bug: 174123988
Change-Id: I3ba50cbd8a7f60779c69ba85e10dc3cc8a52f8b1
2021-05-14 19:48:17 +08:00
junyulai
9c964b11e6 [FUI27] Fix internal naming of notifyNetworkStatus
Test: TH
Bug: 174123988
Change-Id: I970ee365ca221956ee85788005d331374b5fa71a
2021-05-14 19:48:17 +08:00
Junyu Lai
1befdd5001 Merge "[FUI26] Address comments on aosp/1560408" am: c1e493f98d
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
c1e493f98d Merge "[FUI26] Address comments on aosp/1560408" 2021-05-14 11:34:09 +00:00
Chiachang Wang
8e1b94193f 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
Paul Hu
bdf47a1733 Merge "Address [set|get]RestrictedAllowedApps API review feedback" am: f9dc4b0f52
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1708327

Change-Id: I0c9966c379e956fbf8a01d81d5f1dd0e68662763
2021-05-14 10:25:37 +00:00
Paul Hu
f9dc4b0f52 Merge "Address [set|get]RestrictedAllowedApps API review feedback" 2021-05-14 10:00:39 +00:00
Aaron Huang
27d2960c50 Merge "Rename *Iface* APIs to *Interface*" am: f281058618
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1693585

Change-Id: I62fa0403c8b2d78e7e7a90be8ac804576ec27456
2021-05-14 09:36:36 +00:00
Aaron Huang
f281058618 Merge "Rename *Iface* APIs to *Interface*" 2021-05-14 09:11:29 +00:00
Treehugger Robot
99f78a5484 Merge "Reference unreachable netId from INetd" am: da4644daf7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1708326

Change-Id: Iedbf9e9b150c95aa0da6a7b20af0dd1412703e2b
2021-05-14 08:39:18 +00:00
Treehugger Robot
da4644daf7 Merge "Reference unreachable netId from INetd" 2021-05-14 08:08:08 +00:00
junyulai
60d0f06006 [FUI26] Address comments on aosp/1560408
Test: TH
Bug: 174123988
Change-Id: I949eeb8903e903d8ede90521442b1f917d5cdfeb
2021-05-14 15:57:44 +08:00
paulhu
51eb816c5d Address [set|get]RestrictedAllowedApps API review feedback
- Rename [set|get]RestrictedAllowedApps to
  [set|get]AppsAllowedOnRestrictedNetworks
- Remove the regex of validate package name check

Bug: 188085693
Test: m update-api && m
Change-Id: I07966fb66093523a67e1e6a1ecfa05cc399e22f2
2021-05-14 15:27:36 +08:00