Treehugger Robot
1e7b9bca3d
Merge "Fix a crash in eng builds" am: 26d146ff7f am: 99890b486d am: f65b271328
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527538
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6e1c20b4c1004e8205d65f318939ee7d8b006f00
2020-12-14 06:39:50 +00:00
Treehugger Robot
f65b271328
Merge "Fix a crash in eng builds" am: 26d146ff7f am: 99890b486d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527538
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If9e83003de2a3a0b227ca558264403be312fa1e6
2020-12-14 06:11:21 +00:00
Treehugger Robot
99890b486d
Merge "Fix a crash in eng builds" am: 26d146ff7f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527538
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I245a8498d89e73fefa448a23d71a30d3f34b56ca
2020-12-14 05:50:17 +00:00
Treehugger Robot
26d146ff7f
Merge "Fix a crash in eng builds"
2020-12-14 05:17:15 +00:00
Chiachang Wang
83e35e70c4
Merge "Resolve UidRange dependency between NMS and CS module" am: c5be33af21 am: 8a3181b166 am: 2ec8e8071a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1495869
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6c3474e6522fc67aec5333b323768692619019ee
2020-12-14 04:23:43 +00:00
Chiachang Wang
2ec8e8071a
Merge "Resolve UidRange dependency between NMS and CS module" am: c5be33af21 am: 8a3181b166
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1495869
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If34efef1e3b485de6c93f78c4401ea92fa8edfe4
2020-12-14 03:49:42 +00:00
Chiachang Wang
8a3181b166
Merge "Resolve UidRange dependency between NMS and CS module" am: c5be33af21
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1495869
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2e55c3c4bed3d71eb48242428c179809aae00a1f
2020-12-14 03:10:01 +00:00
Chiachang Wang
c5be33af21
Merge "Resolve UidRange dependency between NMS and CS module"
2020-12-14 02:55:41 +00:00
Chalard Jean
8fb84150bf
Fix a crash in eng builds
...
CAPTIVE_PORTAL is a CS-managed capability, and causes CS to log a wtf.
When this test is run on an eng build, this sends SIGSEGV to the test,
which is pretty difficult to debug.
Test: FrameworksNetTests NetworkStackTests
Change-Id: I72fc46a6daa4e886425b4dc967318cca9f1a5302
2020-12-13 23:02:08 +09:00
Paul Hu
36628bfc96
Merge "Replace PackageManager @hide APIs" am: dddbd4f495 am: 7ebc0f1ab3 am: 088de50335
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1523340
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I553db1721ab56fce663bc6db10aa23735f5788d8
2020-12-11 11:06:55 +00:00
Paul Hu
19606c6e32
Merge "Expose TcpRepairWindow as module-lib API" am: ec942a8e70 am: 3988f15290 am: 3bee0fbcc8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519961
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iae69946c88267eca4c350d902df0af50fca9de5b
2020-12-11 11:04:22 +00:00
Chalard Jean
d2c548d880
Merge changes from topic "remove_legacy_NA" am: 71ab824707 am: a698a47ada am: 7ba18da6b6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1456097
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If9cd6ce929a7103d2d6b7195a71ee64ea0a4ee0a
2020-12-11 11:03:36 +00:00
Lucas Lin
1061b76b27
Merge "Use getUserHandles() instead of getUsers() to get user id" am: df93f1c06c am: 7936252059 am: 865683a998
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513050
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7fa8802614bf28453501cdc2bc1989b3531b2280
2020-12-11 11:02:48 +00:00
Treehugger Robot
b7f07a5371
Merge "Add a mutability flag to the PendingIntent" am: e5046ca23b am: 590c8766b6 am: a97a84a6cf
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1505734
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2d71235f8a61e617f95094da1154342c00e9b8d5
2020-12-11 10:53:02 +00:00
Paul Hu
91c64b9b11
Merge "Address leftover comments" am: 6e253df579 am: 3b29da5cf7 am: 3bd18cce4a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1495899
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3f46b0c6d5c2dcce540fcb1f9d7f2cc22c934f93
2020-12-11 10:51:37 +00:00
Paul Hu
088de50335
Merge "Replace PackageManager @hide APIs" am: dddbd4f495 am: 7ebc0f1ab3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1523340
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I018004ee98ac6b9fada57972ca2affeb94ef4956
2020-12-11 10:49:04 +00:00
Paul Hu
7ebc0f1ab3
Merge "Replace PackageManager @hide APIs" am: dddbd4f495
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1523340
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id4e2fab962ba401f2c941c58c0eb2210a8f835e7
2020-12-11 10:05:38 +00:00
Paul Hu
dddbd4f495
Merge "Replace PackageManager @hide APIs"
2020-12-11 09:50:28 +00:00
Paul Hu
3bee0fbcc8
Merge "Expose TcpRepairWindow as module-lib API" am: ec942a8e70 am: 3988f15290
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519961
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7a125dfa9b4bccc9e8943c4b972ff8cb25d4ccaf
2020-12-11 06:31:07 +00:00
Paul Hu
3988f15290
Merge "Expose TcpRepairWindow as module-lib API" am: ec942a8e70
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519961
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2621e4f244e70dfdbd6e6e228f9c6401326fc56a
2020-12-11 06:15:36 +00:00
Paul Hu
ec942a8e70
Merge "Expose TcpRepairWindow as module-lib API"
2020-12-11 05:37:10 +00:00
Chalard Jean
7ba18da6b6
Merge changes from topic "remove_legacy_NA" am: 71ab824707 am: a698a47ada
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1456097
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I87cc62579b19699438704f472fc754837d878038
2020-12-11 03:29:50 +00:00
Lucas Lin
865683a998
Merge "Use getUserHandles() instead of getUsers() to get user id" am: df93f1c06c am: 7936252059
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513050
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id16394df0ad8e97efe8e75c00a406242a1cac206
2020-12-11 03:29:25 +00:00
Chalard Jean
a698a47ada
Merge changes from topic "remove_legacy_NA" am: 71ab824707
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1456097
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I141e67982f1119d5fc700ed2cb75e2f8220f5383
2020-12-11 02:40:14 +00:00
Lucas Lin
7936252059
Merge "Use getUserHandles() instead of getUsers() to get user id" am: df93f1c06c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513050
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6e03c6f4317e11ffe64b7bcf170f70f535995e85
2020-12-11 02:37:54 +00:00
Chalard Jean
71ab824707
Merge changes from topic "remove_legacy_NA"
...
* changes:
Remove support for legacy network agents
Remove deprecated constructors for NetworkAgent
Migrate NetworkAgentWrapper to the new NA API
Cleanup TestNetworkService
2020-12-11 02:32:57 +00:00
Chalard Jean
abb6617d31
[automerger skipped] Merge "Move module utils to the module package." into mainline-prod am: 30c0e47829 -s ours
...
am skip reason: Change-Id I067eeecd458c34b7f2fbfa439072682661ac750c with SHA-1 863fb9b9d9 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12891421
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2c7bb055686d87509ecd9ccdfdacb5dc72551e8e
2020-12-11 02:18:48 +00:00
Chalard Jean
30c0e47829
Merge "Move module utils to the module package." into mainline-prod
2020-12-11 02:07:48 +00:00
Lucas Lin
df93f1c06c
Merge "Use getUserHandles() instead of getUsers() to get user id"
2020-12-11 02:02:37 +00:00
Treehugger Robot
a97a84a6cf
Merge "Add a mutability flag to the PendingIntent" am: e5046ca23b am: 590c8766b6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1505734
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I55e12c551a3a80853cd186c20fc97a57f6a86090
2020-12-10 16:42:46 +00:00
Paul Hu
3bd18cce4a
Merge "Address leftover comments" am: 6e253df579 am: 3b29da5cf7
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1495899
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I03a2140e5574088fd0768e3ac8e3f47e54c98b6d
2020-12-10 16:32:51 +00:00
Treehugger Robot
590c8766b6
Merge "Add a mutability flag to the PendingIntent" am: e5046ca23b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1505734
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idd6c05fbe1fee9c1e3858ef1d52da9dc8c8c7366
2020-12-10 16:32:39 +00:00
Treehugger Robot
e5046ca23b
Merge "Add a mutability flag to the PendingIntent"
2020-12-10 16:27:58 +00:00
Paul Hu
3b29da5cf7
Merge "Address leftover comments" am: 6e253df579
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1495899
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0e2439670745ab19220e6cd44e6a62de5f61b842
2020-12-10 16:13:09 +00:00
Paul Hu
6e253df579
Merge "Address leftover comments"
2020-12-10 15:47:27 +00:00
paulhu
667972157f
Replace PackageManager @hide APIs
...
ConnectivityService is using
PackageManager#getApplicationInfoAsUser() to get application
info but this API is not able to call after CS becomes a
mainline module. Thus, replace it with formal API.
Bug: 170593746
Test: atest FrameworksNetTests
Test: atest CtsNetTestCasesLegacyApi22
Change-Id: Idd1269aa50e234801583097bb6f40b099bab8fba
2020-12-10 23:32:32 +08:00
Chiachang Wang
1f50ae5c28
Resolve UidRange dependency between NMS and CS module
...
ConnectivityService is going to become a mainline module which
cannot access hidden APIs. Thus, replace the VPN uid range
controlling APIs from NMS to INetd directly.
Bug: 170598012
Test: atest FrameworksNetTests
Test: atest HostsideVpnTests
Test: manually test to connect to VPN and check the uid range
Change-Id: Ie6656ef36f54c2f14d5a2899e763a29b70a30f5d
2020-12-10 22:24:47 +08:00
paulhu
58333ae5bf
Add a mutability flag to the PendingIntent
...
From S, it's required to specify explicitly either FLAG_MUTABLE
or FLAG_IMMUTABLE when creating a PendingIntent. Thus, add a
mutability flag to the PendingIntent in ConnectivityServiceTest
that doesn't specify it before.
Bug: 173157160
Test: atest FrameworksNetTests
Change-Id: I755c53b90d709dfbac576dc076722476c3edee35
2020-12-10 12:28:14 +00:00
Paul Hu
9a0d7d2933
Merge "Revert "ConnectivityServiceTest: Mark unaudited PendingIntents with FLAG_MUTABLE_UNAUDITED""
2020-12-10 12:27:07 +00:00
Lucas Lin
d5f5032707
Merge "Reimplement DumpUtils#checkDumpPermission() in ConnectivityService" am: 984653607c am: e70771ef74 am: cf8a782105
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519792
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If1eb5c4a9975fd87dfab5bb893d6c23ae2bae41c
2020-12-10 11:54:51 +00:00
Lucas Lin
cf8a782105
Merge "Reimplement DumpUtils#checkDumpPermission() in ConnectivityService" am: 984653607c am: e70771ef74
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519792
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I52b048b4ecd3f228c7d13aafeaa6bd852f564a46
2020-12-10 11:15:16 +00:00
Lucas Lin
e70771ef74
Merge "Reimplement DumpUtils#checkDumpPermission() in ConnectivityService" am: 984653607c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519792
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibd216cc83e539f202e01076b97fa2d981185dc49
2020-12-10 11:06:27 +00:00
Lucas Lin
984653607c
Merge "Reimplement DumpUtils#checkDumpPermission() in ConnectivityService"
2020-12-10 10:57:58 +00:00
Treehugger Robot
6dc4b5aaa0
Merge "[Mainline] Network netId to getNetId() migration" am: cd20ac9243 am: 249e8cab99 am: e42273a5f7
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1520637
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6c09a80a7dd55b357426e01b50725254a9c03148
2020-12-10 10:01:36 +00:00
Treehugger Robot
e42273a5f7
Merge "[Mainline] Network netId to getNetId() migration" am: cd20ac9243 am: 249e8cab99
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1520637
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ifd1771c329d6b4c45f85d32cf44a7499efddcbfb
2020-12-10 09:43:15 +00:00
Lorenzo Colitti
358aeea9d3
Merge changes I6eb6d92b,I638e29fd,I2348b7a3 am: 0da448710c am: 3ff54c739f am: 5bbcd79710
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1521657
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I430d7069e1dfbe89780cb459fff9e1eb63daa349
2020-12-10 09:18:35 +00:00
Treehugger Robot
249e8cab99
Merge "[Mainline] Network netId to getNetId() migration" am: cd20ac9243
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1520637
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I65d8843281e3c3fe15141ad2583955e069339413
2020-12-10 09:11:10 +00:00
Lorenzo Colitti
5bbcd79710
Merge changes I6eb6d92b,I638e29fd,I2348b7a3 am: 0da448710c am: 3ff54c739f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1521657
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6de299ec480f1a34042d2ef2ee86f00d030510e8
2020-12-10 09:02:40 +00:00
Treehugger Robot
cd20ac9243
Merge "[Mainline] Network netId to getNetId() migration"
2020-12-10 08:47:27 +00:00
Lorenzo Colitti
3ff54c739f
Merge changes I6eb6d92b,I638e29fd,I2348b7a3 am: 0da448710c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1521657
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I87704813daaf2a0b4495a835abde950e683993e5
2020-12-10 08:32:15 +00:00