Mathew Inwood
3950aab83b
Add maxTargetSdk restriction to unused APIs.
...
These are APIs that have @UnsupportedAppUsage but for which we don't
have any evidence of them currently being used, so should be safe to
remove from the unsupported list.
Bug: 170729553
Test: Treehugger
Change-Id: I4c8fd0006f950de9955242e93968fb0996ceb372
2020-10-27 15:46:07 +00:00
Jeff Sharkey
bed2e7c8b0
Merge changes from topic "oct16c"
...
* changes:
Apply fixes for EfficientStrings.
Apply fixes for EfficientStrings.
Apply fixes for EfficientStringsChecker.
Apply fixes for EfficientCollections.
Trivial refactor for consistent naming.
Expand formatSimple() to support widths.
Refinement of EfficientStringsChecker.
2020-10-21 15:27:15 +00:00
Jeff Sharkey
63465387ca
Apply fixes for EfficientStrings.
...
Refactoring to avoid StringBuffer synchronization overhead.
Bug: 170978902
Test: none
Exempt-From-Owner-Approval: trivial refactoring
Change-Id: Ibf843ed780c1202d5d96a11eaca889e592f19263
2020-10-20 22:00:20 -06:00
Yan Yan
31faab358d
Merge "Require devices with first sdk 0 or later to support mandatory algorithms" am: 27ef72a875 am: bf50daf5dd am: 29a46c9501 am: 796be74cd0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1468662
Change-Id: Ica06a3a4c3695052f554056caab603a857b4e9b2
2020-10-20 23:51:20 +00:00
Yan Yan
796be74cd0
Merge "Require devices with first sdk 0 or later to support mandatory algorithms" am: 27ef72a875 am: bf50daf5dd am: 29a46c9501
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1468662
Change-Id: Ibf64266be25b06664bede24f6aa8464c21de8426
2020-10-20 23:35:19 +00:00
Yan Yan
29a46c9501
Merge "Require devices with first sdk 0 or later to support mandatory algorithms" am: 27ef72a875 am: bf50daf5dd
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1468662
Change-Id: I6cc664926bf6843093cdfa66f85a469c0824d84e
2020-10-20 23:12:10 +00:00
Yan Yan
27ef72a875
Merge "Require devices with first sdk 0 or later to support mandatory algorithms"
2020-10-20 22:33:37 +00:00
Yan Yan
f62269e265
Require devices with first sdk 0 or later to support mandatory algorithms
...
It is safe because these mandatory algorithms are already required
before new algorithms are added
It is also a quick fix to unblock b/171279612, whose root cause is
the device first sdk is wrong
Bug: 171279612
Test: atest CtsNetTestCases:IpSecManagerTest
Change-Id: I5b9d85b2bc8f13f54467c97160d138a4628265f7
2020-10-20 15:12:30 -07:00
Anton Hansson
5477cdc79b
[automerger skipped] Merge "Remove @TestApi from @SystemApi symbols" am: 5cedf5097c am: cbe282347e am: a750f5a9f6 am: fc6940e0ca -s ours
...
am skip reason: Change-Id I772790b783b0a8730b8bf680c9e569a886b8d789 with SHA-1 3d20a50464 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1466264
Change-Id: Ic5423c394cfa3e489ec2f6f6d043afdadb19d9e9
2020-10-20 21:22:43 +00:00
Anton Hansson
fc6940e0ca
Merge "Remove @TestApi from @SystemApi symbols" am: 5cedf5097c am: cbe282347e am: a750f5a9f6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1466264
Change-Id: I859503688ea3254d5bd1b55e80cf1962286e948f
2020-10-20 20:31:58 +00:00
Anton Hansson
a750f5a9f6
Merge "Remove @TestApi from @SystemApi symbols" am: 5cedf5097c am: cbe282347e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1466264
Change-Id: I86daec690141893837ec58ab1d75aecc88557ff9
2020-10-20 19:45:04 +00:00
Anton Hansson
89f943fbd7
[automerger skipped] Merge "Remove @TestApi from @SystemApi symbols" into mainline-prod am: 0bace0cd01 -s ours
...
am skip reason: Change-Id I772790b783b0a8730b8bf680c9e569a886b8d789 with SHA-1 088a664274 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12876438
Change-Id: I64743a9f2f8b9ba6afd5da61e8c5ce67bb1fd3cf
2020-10-20 16:45:24 +00:00
Anton Hansson
5cedf5097c
Merge "Remove @TestApi from @SystemApi symbols"
2020-10-20 13:45:13 +00:00
Anton Hansson
088a664274
Remove @TestApi from @SystemApi symbols
...
I ran these commands:
cd frameworks/base
grep -rl '@TestApi' --include '*.java' | xargs perl -i -p0e \
's/\@SystemApi[\s\n]+(\@\w+[\s\n]+)?\@TestApi/\@SystemApi\1/gs'
grep -rl '@TestApi' --include '*.java' | xargs perl -i -p0e \
's/\@TestApi[\s\n]+(\@\w+[\s\n]+)?\@SystemApi/\1\@SystemApi/gs'
Bug: 171179806
Test: m checkapi
Change-Id: I772790b783b0a8730b8bf680c9e569a886b8d789
2020-10-20 09:04:03 +01:00
Anton Hansson
3d20a50464
Remove @TestApi from @SystemApi symbols
...
I ran these commands:
cd frameworks/base
grep -rl '@TestApi' --include '*.java' | xargs perl -i -p0e \
's/\@SystemApi[\s\n]+(\@\w+[\s\n]+)?\@TestApi/\@SystemApi\1/gs'
grep -rl '@TestApi' --include '*.java' | xargs perl -i -p0e \
's/\@TestApi[\s\n]+(\@\w+[\s\n]+)?\@SystemApi/\1\@SystemApi/gs'
Bug: 171179806
Test: m checkapi
Change-Id: I772790b783b0a8730b8bf680c9e569a886b8d789
Merged-In: I772790b783b0a8730b8bf680c9e569a886b8d789
2020-10-19 19:08:26 +01:00
Anton Hansson
9001afc697
Remove @TestApi from @SystemApi symbols
...
I ran these commands:
cd frameworks/base
grep -rl '@TestApi' --include '*.java' | xargs perl -i -p0e \
's/\@SystemApi[\s\n]+(\@\w+[\s\n]+)?\@TestApi/\@SystemApi\1/gs'
grep -rl '@TestApi' --include '*.java' | xargs perl -i -p0e \
's/\@TestApi[\s\n]+(\@\w+[\s\n]+)?\@SystemApi/\1\@SystemApi/gs'
Bug: 171179806
Test: m checkapi
Change-Id: I772790b783b0a8730b8bf680c9e569a886b8d789
Merged-In: I772790b783b0a8730b8bf680c9e569a886b8d789
2020-10-19 16:41:01 +01:00
Yan Yan
af9772371c
Merge changes from topic "new-ipsec-api" am: 46f82d282a am: 2580e7a9f1 am: f769e1ecb0 am: 021a46ff4b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1398433
Change-Id: I18748127d0c97d9473c96678d556b03ad6048808
2020-10-17 00:09:20 +00:00
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
0baf1b20e1
[automerger skipped] Merge "Allow the network stack to read network stats history" am: 7e4a864f60 am: 5ac12d9b41 am: 851900ba6c am: dd98f7a35b -s ours
...
am skip reason: Change-Id Ibb6342b0f263c874bb1f7ab4031a639778bad37e with SHA-1 4c1d8a48fc is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1450457
Change-Id: I7881c107ed04304221e694ea28b692159f426c31
2020-10-16 05:00:14 +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
Roman Kalukiewicz
76a6131fdb
Add @Nullable annotation to the parameter of Object.equals() methods.
...
Those annotations could be inferred by some tools (like Kotlin), but the
https://checkerframework.org/ doesn't check inherited annotations
complaining about all equals() invocations that get nullable argument.
The change was generated by running
find . -name \*.java | xargs sed -i 's/public boolean equals(Object /public boolean equals(@Nullable Object /'
in the frameworks/base directory and by automatically adding and
formatting required imports if needed. No manual edits.
Bug: 170883422
Test: Annotation change only. Should have not impact.
Exempt-From-Owner-Approval: Mechanical change not specific to any component.
Change-Id: I5eedb571c9d78862115dfdc5dae1cf2a35343580
2020-10-15 10:48:01 -07:00
Chalard Jean
4c1d8a48fc
Allow the network stack to read network stats history
...
Bug: 168984229
Test: testNetworkStatsProvider
Change-Id: Ibb6342b0f263c874bb1f7ab4031a639778bad37e
2020-10-15 07:47:33 +00:00
TreeHugger Robot
a91b64822b
[automerger skipped] Merge "Merge ab/6749736 in stage." into stage-aosp-master am: 9e72f3f5c7 -s ours am: 8217b0a190 -s ours am: 7fd8ac1f03 -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
c855a47473
Merge "Support dynamically update IMSI" am: 05e92bb5ef am: 3fd314dbca am: bb9de525b2 am: d1fae8c1de
...
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
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
Eran Messeri
c2bcd967eb
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
Hridya Valsaraju
de27d61e6d
Revert "Move module utils to the module package."
...
Revert "Move util classes to their destination package"
Revert "Move PacketReader and FdEventReader"
Revert "Move static utils to a module package"
Revert "Move static utils to a module package"
Revert submission 12698912-move_packetreader
Reason for revert: Broke presubmit on git_master, b/169861635
Reverted Changes:
If5d1e4a58:Move module utils to the module package.
I44ffaad3d:Move PacketReader and FdEventReader
I93e9cfd96:Move util classes to their destination package
Ia84d64130:Move static utils to a module package
Iaac2810c7:Move static utils to a module package
Change-Id: Ibbe59075cd7bc4c38e0707ea6ae3b3703b40986f
2020-10-01 20:12:46 +00:00
Chalard Jean
885d9b04b8
Move module utils to the module package.
...
Test: builds
Change-Id: If5d1e4a58fb2d6d9544e6d01995dabe445cf1f25
(cherry picked from commit 046bf639eb7728504be35e30e3dd49af3d029728)
2020-09-26 14:12:10 +09:00
Bill Yi
9efa9de910
[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: 4558f8f002 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515
Change-Id: I98c9f5c3eb4bcf04506448220778841be7e4a48d
2020-09-21 08:28:07 +00:00
Bill Yi
2339d940d1
[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: 72c4162bad -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515
Change-Id: Iab55ccd9cf2cfd9fbd2e3859059b03df35ff52ef
2020-09-21 08:27:05 +00: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