Treehugger Robot
cbca7cffe3
Merge "Fix a typo in a comment" am: 968238aa92 am: 0df34e3024 am: 173b634aab am: da629196fd
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1459885
Change-Id: I084659f9f874fd7654645043c31e6f5e2b7a04de
2020-10-14 12:28:40 +00:00
Treehugger Robot
da629196fd
Merge "Fix a typo in a comment" am: 968238aa92 am: 0df34e3024 am: 173b634aab
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1459885
Change-Id: I8428419ef645a312c7fbbc45a8ac5709d6ab5d9c
2020-10-14 12:08:20 +00:00
Treehugger Robot
173b634aab
Merge "Fix a typo in a comment" am: 968238aa92 am: 0df34e3024
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1459885
Change-Id: Ifdaed83a7696ad37df0487a91bcb089de229de07
2020-10-14 11:54:57 +00:00
Treehugger Robot
0df34e3024
Merge "Fix a typo in a comment" am: 968238aa92
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1459885
Change-Id: I9174acc91209d83526901587bf4603d61aa30acc
2020-10-14 11:24:43 +00:00
Treehugger Robot
968238aa92
Merge "Fix a typo in a comment"
2020-10-14 10:54:25 +00:00
Chalard Jean
05fcb2e43e
Fix a typo in a comment
...
Test: is not necessary for fixing typos in comments
Change-Id: Idf48d2649e728cafda5c1ca32d21102094cf23f5
2020-10-14 04:56:20 +00:00
Chiachang Wang
6baf4256c9
Merge "Use system api for shell command handling" am: 3da3af2a10 am: 231acbca1b am: 8d5767de05 am: 669defa316
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1456126
Change-Id: Ib1983313f09336f1bac13a8a84e80cffeee721f7
2020-10-13 10:47:57 +00:00
Chiachang Wang
669defa316
Merge "Use system api for shell command handling" am: 3da3af2a10 am: 231acbca1b am: 8d5767de05
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1456126
Change-Id: I8bc3e27c6cb9f7be7056d1124458c4e283a0f945
2020-10-13 10:12:04 +00:00
Chiachang Wang
8d5767de05
Merge "Use system api for shell command handling" am: 3da3af2a10 am: 231acbca1b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1456126
Change-Id: Id33a233789eb58e6ef5be2d5edf3f504c9b4eb12
2020-10-13 09:50:11 +00:00
Chiachang Wang
231acbca1b
Merge "Use system api for shell command handling" am: 3da3af2a10
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1456126
Change-Id: I322bbe2f711f8c50efe9d50056787c0e60051fbb
2020-10-13 09:29:47 +00:00
Chiachang Wang
3da3af2a10
Merge "Use system api for shell command handling"
2020-10-13 08:41:40 +00:00
Chiachang Wang
0efaff8cbc
Use system api for shell command handling
...
ConnectivityService should not use ShellCommand since it's @hide
which does not accessible in mainline modules. Replace it with
system api for mainline.
Bug: 170598012
Test: adb shell cmd connectivity airplane-mode enable
Test: adb shell cmd connectivity airplane-mode disable
Change-Id: I47e7a371c19eb18eac643fe9a2ab481bec5743c2
2020-10-13 08:41:24 +00:00
TreeHugger Robot
973561a3e6
[automerger skipped] Merge "Merge ab/6749736 in stage." into stage-aosp-master am: 009ac78c7b -s ours am: 973d635675 -s ours am: 94c3921a03 -s ours
...
am skip reason: Change-Id Iecef31f7bf10ad97b7e0075cf302ae94e248474a with SHA-1 539d92beb7 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12803991
Change-Id: I93ca7693005bd26b157fc31c10170e4d2dff5934
2020-10-13 04:50:33 +00:00
Junyu Lai
4475546bb0
Merge "Support dynamically update IMSI" am: 2d74c2e267 am: e981a87c00 am: 36b8c1d919 am: a33114824f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1418348
Change-Id: I5e5fc106aaab1b55302c38717cad9dbf1281baec
2020-10-13 04:46:38 +00:00
TreeHugger Robot
94c3921a03
[automerger skipped] Merge "Merge ab/6749736 in stage." into stage-aosp-master am: 009ac78c7b -s ours am: 973d635675 -s ours
...
am skip reason: Change-Id Iecef31f7bf10ad97b7e0075cf302ae94e248474a with SHA-1 539d92beb7 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12803991
Change-Id: Icb052e904d339089be1b2e0014b7dd16f958e3d6
2020-10-13 04:22:42 +00:00
Junyu Lai
a33114824f
Merge "Support dynamically update IMSI" am: 2d74c2e267 am: e981a87c00 am: 36b8c1d919
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1418348
Change-Id: Id948a9453139cbf4e9afc75647152bdbd24cfe0a
2020-10-13 04:19:38 +00:00
TreeHugger Robot
973d635675
[automerger skipped] Merge "Merge ab/6749736 in stage." into stage-aosp-master am: 009ac78c7b -s ours
...
am skip reason: Change-Id Iecef31f7bf10ad97b7e0075cf302ae94e248474a with SHA-1 539d92beb7 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12803991
Change-Id: I35256efaa6acc9a9f28371993587f888c1a77252
2020-10-13 03:51:03 +00:00
Junyu Lai
36b8c1d919
Merge "Support dynamically update IMSI" am: 2d74c2e267 am: e981a87c00
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1418348
Change-Id: Ic369f77eb09979e8ed36e4207fe42f293548ba90
2020-10-13 03:49:06 +00:00
TreeHugger Robot
009ac78c7b
Merge "Merge ab/6749736 in stage." into stage-aosp-master
2020-10-13 03:31:35 +00:00
Junyu Lai
e981a87c00
Merge "Support dynamically update IMSI" am: 2d74c2e267
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1418348
Change-Id: Id06d5d37ad5f12e689643c916548e9a59089eb3b
2020-10-13 03:22:09 +00:00
Junyu Lai
2d74c2e267
Merge "Support dynamically update IMSI"
2020-10-13 02:41:47 +00:00
junyulai
c822fe5e07
Support dynamically update IMSI
...
Currently, NetworkStatsSubscriptionsMonitor will skip the
listener registration until the IMSI is available to deal
with SIM PIN locked case. However, this solution can only
handle the case that IMSI changes from/to null. And it also
relies on the assumption that IMSI never changes for a subId.
Thus, support dynamically update IMSI to handle IMSI changes
more robustly.
This patch also address leftover comments at ag/12400327.
Test: enable SIM PIN and manually test
Test: atest NetworkStatsSubscriptionsMonitorTest#testSubscriberIdUnavailable
Test: atest NetworkStatsSubscriptionsMonitorTest#testSubscriberIdChanged
Test: ./out/host/linux-x86/bin/statsd_testdrive 10082
Bug: 160941101
Change-Id: I625a5b10ee4806f6fee99c2d9d6c5e7977ff785e
2020-10-12 15:31:02 +08:00
Lorenzo Colitti
052fe66496
Merge "Speculatively fix L2TP keepalive issues by reducing mtu" am: f67e00b803 am: d3bf9a15a0 am: 23a036cd42 am: e9e92b80ac
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399646
Change-Id: Iba6098badc018fa64b1c5fc20177b97a81a2e685
2020-10-12 01:48:18 +00:00
Lorenzo Colitti
e9e92b80ac
Merge "Speculatively fix L2TP keepalive issues by reducing mtu" am: f67e00b803 am: d3bf9a15a0 am: 23a036cd42
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399646
Change-Id: I5b11411b87069687d32dede7194f9cd8a232c963
2020-10-12 01:34:41 +00:00
Lorenzo Colitti
23a036cd42
Merge "Speculatively fix L2TP keepalive issues by reducing mtu" am: f67e00b803 am: d3bf9a15a0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399646
Change-Id: Ie6a7fdb8e1ce035ce145b90645290e7e4777f7e6
2020-10-12 01:20:47 +00:00
Lorenzo Colitti
d3bf9a15a0
Merge "Speculatively fix L2TP keepalive issues by reducing mtu" am: f67e00b803
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399646
Change-Id: Iac7fc24c531db663469df1b1161d9f85a4c6f3ee
2020-10-12 01:06:47 +00:00
Lorenzo Colitti
f67e00b803
Merge "Speculatively fix L2TP keepalive issues by reducing mtu"
2020-10-12 00:40:44 +00:00
Xin Li
7d27412dad
Merge ab/6749736 in stage.
...
Bug: 167233921
Merged-In: Iecef31f7bf10ad97b7e0075cf302ae94e248474a
Change-Id: I9e9c873bc2e05a0cfe3af0bf74725500f3f108db
2020-10-10 20:38:57 -07:00
Treehugger Robot
8cec12f482
Merge "Don't let NAW.mNetworkInfo escape" am: 6e8c64b349 am: 497eab9a18 am: a6fa1d584b am: 04f8105750
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1455976
Change-Id: I239201986987a07c09321d7be7e0feae7eaf9f15
2020-10-09 12:04:45 +00:00
Treehugger Robot
04f8105750
Merge "Don't let NAW.mNetworkInfo escape" am: 6e8c64b349 am: 497eab9a18 am: a6fa1d584b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1455976
Change-Id: I5811b1c40540123b0d6446f8af7638ce2eac6d99
2020-10-09 11:51:01 +00:00
Treehugger Robot
a6fa1d584b
Merge "Don't let NAW.mNetworkInfo escape" am: 6e8c64b349 am: 497eab9a18
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1455976
Change-Id: I8a9899d9a5d7eba8423cbba99f085174ae383e6a
2020-10-09 11:05:01 +00:00
Treehugger Robot
497eab9a18
Merge "Don't let NAW.mNetworkInfo escape" am: 6e8c64b349
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1455976
Change-Id: I01ef40f341c653a524ee4565c3d9bf2564e0f98f
2020-10-09 10:48:42 +00:00
Treehugger Robot
6e8c64b349
Merge "Don't let NAW.mNetworkInfo escape"
2020-10-09 10:33:47 +00:00
Chalard Jean
c8c06be939
Don't let NAW.mNetworkInfo escape
...
Thankfully this has no users.
This agent needs to be migrated to the modern API for
NetworkAgent, which does not have NetworkInfo at all
so this would be a hindrance
Test: FrameworksNetTests NetworkStackTests
Change-Id: I091a6ca8cdf18860f23832ae1008fa02cf0472e8
2020-10-09 17:06:30 +09:00
Remi NGUYEN VAN
c1c3e254da
Merge "Move IpUtils to frameworks/libs/net" am: 1ea097fcb2 am: 5d47632002 am: ff1cfa230d am: 96c5807a35
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440234
Change-Id: I27072c126ee7eedc2de3d1cdccd0fd503f1577a1
2020-10-09 01:58:35 +00:00
Remi NGUYEN VAN
96c5807a35
Merge "Move IpUtils to frameworks/libs/net" am: 1ea097fcb2 am: 5d47632002 am: ff1cfa230d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440234
Change-Id: Ia364eb033d4ed9ae8db4f27fcfd065065581ae73
2020-10-09 01:26:33 +00:00
Remi NGUYEN VAN
ff1cfa230d
Merge "Move IpUtils to frameworks/libs/net" am: 1ea097fcb2 am: 5d47632002
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440234
Change-Id: I03872655d1ef3a7bb436666196ed67bd61601f65
2020-10-09 00:52:31 +00:00
Remi NGUYEN VAN
5d47632002
Merge "Move IpUtils to frameworks/libs/net" am: 1ea097fcb2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440234
Change-Id: Ibd41a02a9a185667a7fe332213ef692c4d8bf515
2020-10-09 00:30:36 +00:00
Remi NGUYEN VAN
1ea097fcb2
Merge "Move IpUtils to frameworks/libs/net"
2020-10-09 00:13:40 +00:00
Paul Hu
331899ce0c
Merge "Remove unused ACTION_PACKAGE_ADDED intent." am: eba570a209 am: cc74ac7b8e am: ecf81b9f6f am: 076300f4d8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1450335
Change-Id: Idf245e96272708345fd41e2874592e97a3af7ee8
2020-10-08 03:15:11 +00:00
Paul Hu
076300f4d8
Merge "Remove unused ACTION_PACKAGE_ADDED intent." am: eba570a209 am: cc74ac7b8e am: ecf81b9f6f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1450335
Change-Id: I30b53b8ef22233bf1dec8cb899c217eddbf53fa1
2020-10-08 03:03:09 +00:00
Paul Hu
ecf81b9f6f
Merge "Remove unused ACTION_PACKAGE_ADDED intent." am: eba570a209 am: cc74ac7b8e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1450335
Change-Id: I3330b90cc1bb56b4c0964f47826d607c2f1e907c
2020-10-08 02:49:43 +00:00
Paul Hu
cc74ac7b8e
Merge "Remove unused ACTION_PACKAGE_ADDED intent." am: eba570a209
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1450335
Change-Id: I53a20a48053889357e62f29799e091d22a3ffc59
2020-10-08 02:19:12 +00:00
Paul Hu
eba570a209
Merge "Remove unused ACTION_PACKAGE_ADDED intent."
2020-10-08 02:05:17 +00:00
Chiachang Wang
9611a3ad54
Merge "Update to positive logic to better match the method naming" am: 1c7bc039ea am: 37fc16ad0a am: 656901d024 am: 40bf5f95e9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1450336
Change-Id: I111b7fa8eaecbec7e65357f7b9aa9b3f369d00c9
2020-10-07 10:19:15 +00:00
Chiachang Wang
40bf5f95e9
Merge "Update to positive logic to better match the method naming" am: 1c7bc039ea am: 37fc16ad0a am: 656901d024
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1450336
Change-Id: I2e1203c0864e04c1e0229ef4a8727a0719a3d139
2020-10-07 10:02:54 +00:00
Chiachang Wang
656901d024
Merge "Update to positive logic to better match the method naming" am: 1c7bc039ea am: 37fc16ad0a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1450336
Change-Id: I6e823ac8769864d9a1bfd6d675331d4b683da331
2020-10-07 09:50:45 +00:00
Chiachang Wang
37fc16ad0a
Merge "Update to positive logic to better match the method naming" am: 1c7bc039ea
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1450336
Change-Id: Ib01ae19fb846fdd75cf792e85dc1776a4a6876ee
2020-10-07 09:22:49 +00:00
Chiachang Wang
8cdc2856b7
Update to positive logic to better match the method naming
...
The method checkInterfacePresent seems that should return if the
interface is present or not, but it actually return an opposite
result. It may confuse the caller. E.g. The override method in
VpnTest assume it always returns true in the test. It will fail
the vpn start flow due to interface gone.
Bug: 169215213
Test: atest FrameworksNetTess
Change-Id: I3e9a64f0900336b8205674b94db68f090b4e9ff9
2020-10-07 06:48:15 +00:00
Eran Messeri
ab20969835
Refactoring: Use explicit methods for checking DO/PO
...
Do not use USES_POLICY_PROFILE_OWNER / USES_POLICY_DEVICE_OWNER.
Instead, use explicit methods for checking if the caller is
the Device Owner or Profile Owner.
USES_POLICY_PROFILE_OWNER is confusing since internally in the
DevicePolicyManagerService, it implied a Device Owner is also a
Profile Owner, which is not always what the caller expected.
This is the first phase of the refactoring, removing external calles'
dependency on these constants. The next phase will remove them
internally completely in favour of an implementation that
accesses mOwners directly.
There are no functional changes in this CL.
Bug: 163028934
Test: atest FrameworksServicesTests:DevicePolicyManagerTest
Change-Id: I57c8465d190a3b4b130d57fd622cc93eaeb9c717
2020-10-06 10:34:23 +01:00