Yan Yan
021a46ff4b
Merge changes from topic "new-ipsec-api" am: 46f82d282a am: 2580e7a9f1 am: f769e1ecb0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1398433
Change-Id: I2f7b92f59747df7a78ce72ff5df26d486907be56
2020-10-16 23:24:13 +00:00
Yan Yan
f769e1ecb0
Merge changes from topic "new-ipsec-api" am: 46f82d282a am: 2580e7a9f1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1398433
Change-Id: I45530694608909ddbb21d037cc3302130d8140c7
2020-10-16 23:07:31 +00:00
Yan Yan
2580e7a9f1
Merge changes from topic "new-ipsec-api" am: 46f82d282a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1398433
Change-Id: I074e1cc2d9b8e38d242c4a1c9b2176d3b8338774
2020-10-16 22:52:03 +00:00
Yan Yan
46f82d282a
Merge changes from topic "new-ipsec-api"
...
* changes:
Expose new algorithms as public API
Add new mandatory IPsec algorithms
2020-10-16 22:30:37 +00:00
Yan Yan
4f86de5e54
Expose new algorithms as public API
...
Bug: 161716062
Test: FrameworksNetTests:IpSecAlgorithmTest
Change-Id: I5041c61ad5a4aa58b259e24de80a2c63d6b19dae
2020-10-16 17:53:37 +00:00
Treehugger Robot
dd98f7a35b
Merge "Allow the network stack to read network stats history" am: 7e4a864f60 am: 5ac12d9b41 am: 851900ba6c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1450457
Change-Id: I99ad6018f46c4daee250dbc97249eae42a255f4f
2020-10-16 04:45:50 +00:00
Treehugger Robot
851900ba6c
Merge "Allow the network stack to read network stats history" am: 7e4a864f60 am: 5ac12d9b41
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1450457
Change-Id: Ia0e0564d205ebc512db49e48c9fc3d90a581ea1b
2020-10-16 04:31:48 +00:00
Treehugger Robot
5ac12d9b41
Merge "Allow the network stack to read network stats history" am: 7e4a864f60
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1450457
Change-Id: Ia7a7fdbb57f44ef9ad74d3c1dcb6a273bbb6baf8
2020-10-16 04:20:39 +00:00
Treehugger Robot
7e4a864f60
Merge "Allow the network stack to read network stats history"
2020-10-16 04:12:51 +00:00
Chalard Jean
f1e2cf02ae
Allow the network stack to read network stats history
...
Identical to ag/12843161
Bug: 168984229
Test: testNetworkStatsProvider
Change-Id: I7ad72c3b2b95f26ceec1371e7e0fdb92fa88920c
Merged-In: Ibb6342b0f263c874bb1f7ab4031a639778bad37e
2020-10-16 00:55:01 +00:00
Yan Yan
21abcd0248
Add new mandatory IPsec algorithms
...
This CL adds new mandatory IPsec algorithms and allows
OEM to enable them on old devices using resource overlay
Bug: 161716062
Test: FrameworksNetTests:IpSecAlgorithmTest
Change-Id: Ib827b05ea27dbe61b14ad236e858f825293ed994
2020-10-15 17:35:17 -07:00
TreeHugger Robot
7fd8ac1f03
[automerger skipped] Merge "Merge ab/6749736 in stage." into stage-aosp-master am: 9e72f3f5c7 -s ours am: 8217b0a190 -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
d1fae8c1de
Merge "Support dynamically update IMSI" am: 05e92bb5ef am: 3fd314dbca am: bb9de525b2
...
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
8217b0a190
[automerger skipped] Merge "Merge ab/6749736 in stage." into stage-aosp-master am: 9e72f3f5c7 -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
bb9de525b2
Merge "Support dynamically update IMSI" am: 05e92bb5ef am: 3fd314dbca
...
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
9e72f3f5c7
Merge "Merge ab/6749736 in stage." into stage-aosp-master
2020-10-13 03:31:35 +00:00
Junyu Lai
3fd314dbca
Merge "Support dynamically update IMSI" am: 05e92bb5ef
...
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
05e92bb5ef
Merge "Support dynamically update IMSI"
2020-10-13 02:41:47 +00:00
junyulai
f571003794
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
Xin Li
dace5ac894
Merge ab/6749736 in stage.
...
Bug: 167233921
Merged-In: Iecef31f7bf10ad97b7e0075cf302ae94e248474a
Change-Id: I9e9c873bc2e05a0cfe3af0bf74725500f3f108db
2020-10-10 20:38:57 -07:00
Bill Yi
4558f8f002
[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 5249616425 am: 24c8811399 -s ours am: c5f6e724a4 -s ours am: c281e94f60 -s ours
...
am skip reason: Change-Id Id04ea331831e8b26ba99478848392b40a92548d5 with SHA-1 c54ab73ef9 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515
Change-Id: I908bcb9330b0e2cf00374276e1d8e5fa3fc67fab
2020-09-19 08:02:00 +00:00
Bill Yi
72c4162bad
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 4c6dc6bbea am: b450e2e7e3 -s ours am: 953d2224f7 -s ours am: 7fe436bd3a -s ours
...
am skip reason: Change-Id Id04ea331831e8b26ba99478848392b40a92548d5 with SHA-1 c54ab73ef9 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515
Change-Id: I53f6598e1a8f06322ee1ec7f5c5979d2ab01c05b
2020-09-19 08:01:04 +00:00
Bill Yi
c281e94f60
[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 5249616425 am: 24c8811399 -s ours am: c5f6e724a4 -s ours
...
am skip reason: Change-Id Id04ea331831e8b26ba99478848392b40a92548d5 with SHA-1 c54ab73ef9 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515
Change-Id: I18f6dabacb6e272e2d3fdf63a9220afc5572f2d2
2020-09-19 07:01:25 +00:00
Bill Yi
7fe436bd3a
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 4c6dc6bbea am: b450e2e7e3 -s ours am: 953d2224f7 -s ours
...
am skip reason: Change-Id Id04ea331831e8b26ba99478848392b40a92548d5 with SHA-1 c54ab73ef9 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515
Change-Id: Ib3e8b5c0678513b5128aaf106c8f8044bed09702
2020-09-19 07:00:58 +00:00
Bill Yi
c5f6e724a4
[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 5249616425 am: 24c8811399 -s ours
...
am skip reason: Change-Id Id04ea331831e8b26ba99478848392b40a92548d5 with SHA-1 c54ab73ef9 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515
Change-Id: I2ad75dfe2a2109ea63eade0ed3edc40b92149a16
2020-09-19 05:51:33 +00:00
Bill Yi
953d2224f7
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 4c6dc6bbea am: b450e2e7e3 -s ours
...
am skip reason: Change-Id Id04ea331831e8b26ba99478848392b40a92548d5 with SHA-1 c54ab73ef9 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515
Change-Id: I4a14d0f2ef305f4f564e7e38134763a85fd09ad3
2020-09-19 05:50:36 +00:00
Bill Yi
24c8811399
Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 5249616425
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515
Change-Id: Iaa631aaca21a51d786f59801d317f27ee635c70f
2020-09-19 05:25:29 +00:00
Bill Yi
b450e2e7e3
Merge mainline-release 6664920 to master - DO NOT MERGE am: 4c6dc6bbea
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515
Change-Id: Id233d0d39ad2d63ae3e6d6128b631e149f68990e
2020-09-19 05:22:39 +00:00
Bill Yi
5249616425
Merge "Merge mainline-release 6664920 to master - DO NOT MERGE"
2020-09-18 18:47:48 +00:00
Bill Yi
4c6dc6bbea
Merge mainline-release 6664920 to master - DO NOT MERGE
...
Merged-In: Id04ea331831e8b26ba99478848392b40a92548d5
Change-Id: I888da0c9475f2d00602d917d2f58169f8d7c93a4
2020-09-17 21:56:59 -07:00
Bill Yi
2bcfd77e3b
[automerger skipped] Merge "Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 938d3bb1f5 -s ours am: 1985b30083 -s ours am: 2d0bf149cf -s ours
...
am skip reason: Change-Id I8f9b41ca6388fdeeda287e7919ef05e56f9da1a6 with SHA-1 f72a5498af is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12577741
Change-Id: I36d5555b5fa23140e4916f568353af25b579c653
2020-09-14 22:20:16 +00:00
Bill Yi
2d0bf149cf
[automerger skipped] Merge "Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 938d3bb1f5 -s ours am: 1985b30083 -s ours
...
am skip reason: Change-Id I8f9b41ca6388fdeeda287e7919ef05e56f9da1a6 with SHA-1 f72a5498af is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12577741
Change-Id: I0fe501d77d176eb43d9e308e7fe3e01c579f22bb
2020-09-14 21:50:56 +00:00
Bill Yi
1985b30083
[automerger skipped] Merge "Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 938d3bb1f5 -s ours
...
am skip reason: Change-Id I8f9b41ca6388fdeeda287e7919ef05e56f9da1a6 with SHA-1 f72a5498af is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12577741
Change-Id: I9b5e1a916081cb266eaca328b86506481e938c7f
2020-09-14 21:18:54 +00:00
Bill Yi
32271f3ab0
Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE
...
Merged-In: I8f9b41ca6388fdeeda287e7919ef05e56f9da1a6
Change-Id: If78e130888b8d4653ef128d747e18cc46844d732
2020-09-13 07:58:42 -07:00
Xin Li
3c30341b97
[automerger skipped] Merge "Merge Android R" am: 8ac6741e47 -s ours am: b9db5b54f6 -s ours am: 109e72941f -s ours am: 110fa82457 -s ours
...
am skip reason: Change-Id Ice3e441cc9c0df8d0a6acc016bb74375e081bd67 with SHA-1 ec82033d3e is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1422395
Change-Id: I47087cabc2093c6de6116f11f660aa624dcb260e
2020-09-11 03:58:59 +00:00
Xin Li
110fa82457
[automerger skipped] Merge "Merge Android R" am: 8ac6741e47 -s ours am: b9db5b54f6 -s ours am: 109e72941f -s ours
...
am skip reason: Change-Id Ice3e441cc9c0df8d0a6acc016bb74375e081bd67 with SHA-1 ec82033d3e is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1422395
Change-Id: Idcd3d30dddc7818975b50aee1b253e37608a3eae
2020-09-11 03:33:28 +00:00
Xin Li
109e72941f
[automerger skipped] Merge "Merge Android R" am: 8ac6741e47 -s ours am: b9db5b54f6 -s ours
...
am skip reason: Change-Id Ice3e441cc9c0df8d0a6acc016bb74375e081bd67 with SHA-1 ec82033d3e is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1422395
Change-Id: Ie915db11679ce05f5d37815028015f61ffb1a4a6
2020-09-11 02:02:37 +00:00
Xin Li
4e4e192c97
Merge Android R
...
Bug: 168057903
Merged-In: Ice3e441cc9c0df8d0a6acc016bb74375e081bd67
Change-Id: I1d85742f594be2007c99841b290e502b6ede624e
2020-09-09 20:21:10 -07:00
Xin Li
b2aa183bbe
[automerger skipped] Merge "Mark RP1A.200720.001 as merged" into stage-aosp-master am: 5cc3fc4908 -s ours am: 71088f4be9 -s ours am: a6b343a9bf -s ours
...
am skip reason: Change-Id I608df7327b8366fd365b11c6bdff9ed28fde99b0 with SHA-1 98a01b7fad is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12514140
Change-Id: I6e8a2040ecfef8ba0e28807c2f753d68afa32155
2020-09-02 20:33:01 +00:00
Xin Li
a6b343a9bf
[automerger skipped] Merge "Mark RP1A.200720.001 as merged" into stage-aosp-master am: 5cc3fc4908 -s ours am: 71088f4be9 -s ours
...
am skip reason: Change-Id I608df7327b8366fd365b11c6bdff9ed28fde99b0 with SHA-1 98a01b7fad is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12514140
Change-Id: Ibe18c1e4bb2fffb65add10a48b8a72fde60a2e2b
2020-09-02 19:37:31 +00:00
Xin Li
71088f4be9
[automerger skipped] Merge "Mark RP1A.200720.001 as merged" into stage-aosp-master am: 5cc3fc4908 -s ours
...
am skip reason: Change-Id I608df7327b8366fd365b11c6bdff9ed28fde99b0 with SHA-1 98a01b7fad is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12514140
Change-Id: Ie4932da5ffa8bc042a930b01a18d1ff1ce1abc90
2020-09-02 19:15:20 +00:00
Xin Li
9543e82a2e
Mark RP1A.200720.001 as merged
...
Bug: 167588565
Merged-In: I608df7327b8366fd365b11c6bdff9ed28fde99b0
Change-Id: Ie293ab2bcba5f778a7cac8476e226dc7c15e000f
2020-09-02 11:44:54 -07:00
Xin Li
a06833b6ea
[automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: ff2ffe48ac -s ours am: 60c68b25d9 -s ours am: bf6fb53f14 -s ours
...
am skip reason: Change-Id I3d92a6de21a938f6b352ec26dc23420c0fe02b27 with SHA-1 d2d3a20624 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12484850
Change-Id: Ibf18c18a55f917c4bbdccd1e088a5ec808573ea7
2020-09-01 22:09:55 +00:00
Xin Li
bf6fb53f14
[automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: ff2ffe48ac -s ours am: 60c68b25d9 -s ours
...
am skip reason: Change-Id I3d92a6de21a938f6b352ec26dc23420c0fe02b27 with SHA-1 d2d3a20624 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12484850
Change-Id: Icebcb9092d11694141d0d6a0c47c9f8378f5b03a
2020-09-01 21:46:39 +00:00
Xin Li
60c68b25d9
[automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: ff2ffe48ac -s ours
...
am skip reason: Change-Id I3d92a6de21a938f6b352ec26dc23420c0fe02b27 with SHA-1 d2d3a20624 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12484850
Change-Id: I6fee791ed4a4939ab3f24b66f779a20124d0c63d
2020-09-01 20:37:03 +00:00
Xin Li
8399e3d5eb
Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
...
Bug: 166295507
Merged-In: I3d92a6de21a938f6b352ec26dc23420c0fe02b27
Change-Id: Ifdb80563ef042738778ebb8a7581a97c4e3d96e2
2020-08-31 21:21:38 -07:00
Treehugger Robot
53a9a4c3da
[automerger skipped] Merge "Skip RAT type listener registration if IMSI is not available" am: ebae7edd37 am: 445d5093c6 am: 0f61b833d5 -s ours am: 83f0491092 -s ours
...
am skip reason: Change-Id I408379b3c432d9e62e0837d6b4f6551cc7838e29 with SHA-1 dad37d17fb is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1409907
Change-Id: Ifba95c25fab6decc52b78cc92c95b100d5066fb6
2020-08-25 21:33:59 +00:00
Treehugger Robot
83f0491092
[automerger skipped] Merge "Skip RAT type listener registration if IMSI is not available" am: ebae7edd37 am: 445d5093c6 am: 0f61b833d5 -s ours
...
am skip reason: Change-Id I408379b3c432d9e62e0837d6b4f6551cc7838e29 with SHA-1 dad37d17fb is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1409907
Change-Id: Iff9fe875b4e12d837e5fe52f956ff0f13d3c6ce3
2020-08-25 21:09:22 +00:00
Treehugger Robot
0f61b833d5
Merge "Skip RAT type listener registration if IMSI is not available" am: ebae7edd37 am: 445d5093c6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1409907
Change-Id: I34de6bc6dd862f8042489f60f4b6be76af7c961e
2020-08-25 20:49:04 +00:00
Treehugger Robot
445d5093c6
Merge "Skip RAT type listener registration if IMSI is not available" am: ebae7edd37
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1409907
Change-Id: Ie24dee18456ee0741dbcd9330664398f0492c644
2020-08-25 20:27:30 +00:00