Eran Messeri
c084922997
DO NOT MERGE: Introduce DPMS shim for active DO/PO check am: 0c94b53855 am: a8efd2bc0c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486196
Change-Id: I467120ce7e419a75749efac109609bb30cc35eff
2020-11-04 12:46:45 +00:00
Eran Messeri
a8efd2bc0c
DO NOT MERGE: Introduce DPMS shim for active DO/PO check am: 0c94b53855
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486196
Change-Id: I79e090d92c5bf17993f8e4f710581675eb72f2a9
2020-11-04 12:24:40 +00:00
Eran Messeri
0c94b53855
DO NOT MERGE: Introduce DPMS shim for active DO/PO check
...
Introduce a shim into DevicePolicyManagerInternal &
DevicePolicyManagerService so that NetworkStatsAccessTest would not
diverge from internal development branches.
The DevicePolicyManagerService refactoring on the internal branch
removed isActiveAdminWithPolicy in favour of isActiveDeviceOwner and
isActiveProfileOwner.
These methods are being made available in AOSP for
NetworkStatsAccessTest.
Bug: 170459325
Test: atest NetworkStatsAccessTest
Change-Id: Ic7e0898989fb8222aaba2b35436765c04eb3250c
2020-11-04 10:07:06 +00:00
Mathew Inwood
fe2fed741e
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
Merged-In: I626caf7c1fe46c5ab1f39c2895b42a34319f771a
Change-Id: I54e5ecd11e76ca1de3c5893e3a98b0108e735413
2020-11-04 09:45:53 +00:00
Natasha Lee
22ea903296
[automerger skipped] Merge "Allow the network stack to read network stats history" into rvc-qpr-dev am: ef3ed74b7a am: 4d43ed5483 -s ours
...
am skip reason: Change-Id Ibb6342b0f263c874bb1f7ab4031a639778bad37e with SHA-1 4c1d8a48fc is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12906925
Change-Id: I40c947f523733adb7f97325f48c3062008b64d28
2020-11-03 02:16:09 +00:00
Natasha Lee
4d43ed5483
Merge "Allow the network stack to read network stats history" into rvc-qpr-dev am: ef3ed74b7a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12906925
Change-Id: Ica71524ed28a86befd9f3f16921f58e40eff2cea
2020-11-03 02:14:06 +00:00
Treehugger Robot
5e6e021c8d
[automerger skipped] Merge "Apply FLAG_IMMUTABLE to the PendingIntent in NetworkStatService.java" am: 2c0bf15a21 am: 3672e620c9 am: d4fe2f1ae4 am: 48ae7842a7 -s ours
...
am skip reason: Change-Id I35ccfc0f69fd98b5803da74d9eb12902b351acc7 with SHA-1 f5686f3918 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1481721
Change-Id: Idadfa833e3b030df4a592207ddb7a89a028ecd4d
2020-11-03 02:13:46 +00:00
Treehugger Robot
48ae7842a7
Merge "Apply FLAG_IMMUTABLE to the PendingIntent in NetworkStatService.java" am: 2c0bf15a21 am: 3672e620c9 am: d4fe2f1ae4
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1481721
Change-Id: Ia314010dcaeb89e9229fc17c09fb27f3cfff64a2
2020-11-03 01:57:31 +00:00
Treehugger Robot
d4fe2f1ae4
Merge "Apply FLAG_IMMUTABLE to the PendingIntent in NetworkStatService.java" am: 2c0bf15a21 am: 3672e620c9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1481721
Change-Id: I69f5ad02a04e87b78cc9344556c12753a68c540e
2020-11-03 01:41:22 +00:00
Treehugger Robot
3672e620c9
Merge "Apply FLAG_IMMUTABLE to the PendingIntent in NetworkStatService.java" am: 2c0bf15a21
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1481721
Change-Id: I175f062b3d7f5ead9cbab6142ba1a126ce311d45
2020-11-03 00:34:39 +00:00
Mathew Inwood
529c3aefeb
[automerger skipped] Add maxTargetSdk restriction to unused APIs. am: e44c5f5a7c -s ours
...
am skip reason: Change-Id I8285daa8530260251ecad6f3f38f98e263629ca7 with SHA-1 2217f37fc7 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12967795
Change-Id: I7640cc309f990c400ff3a7db6de77a71bb0f1d72
2020-11-02 15:04:11 +00:00
Mathew Inwood
e44c5f5a7c
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
Merged-In: I8285daa8530260251ecad6f3f38f98e263629ca7
Change-Id: I626caf7c1fe46c5ab1f39c2895b42a34319f771a
2020-11-02 10:30:09 +00:00
Treehugger Robot
62780368b0
Allow the network stack to read network stats history
...
Bug: 168984229
Test: testNetworkStatsProvider
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1450457
Change-Id: Ic9bd2d2d06c790a84e56ec8a6915f1faab16dda0
Merged-In: Ibb6342b0f263c874bb1f7ab4031a639778bad37e
(cherry picked from commit 9010baec16faa806c2253f90225d002c4b2efb0c)
2020-11-02 07:40:58 +00:00
Chalard Jean
339c010f8f
Move module utils to the module package.
...
Test: FrameworksWifiTest FrameworksNetTest
Change-Id: I067eeecd458c34b7f2fbfa439072682661ac750c
2020-11-02 10:01:30 +09:00
Ashwini Oruganti
c5c6f28294
Apply FLAG_IMMUTABLE to the PendingIntent in NetworkStatService.java
...
Broadcast intents sent by AlarmManager are immutable; the system
dispatches them without customization.
Fixes: 171815343
Test: TH
Change-Id: I35ccfc0f69fd98b5803da74d9eb12902b351acc7
Merged-In: I35ccfc0f69fd98b5803da74d9eb12902b351acc7
2020-10-30 10:49:45 -07:00
Baligh Uddin
1f8bafbfb4
[automerger skipped] Restructure Module code [ com.android.tethering ] am: bbe92b335c -s ours
...
am skip reason: Change-Id I2accb96abbdfa665ef34aa79e87af040226bcf32 with SHA-1 7199b112b5 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12948958
Change-Id: I1423385124c67bf55535c00bd16b39808e16139e
2020-10-30 14:50:44 +00:00
Baligh Uddin
bbe92b335c
Restructure Module code [ com.android.tethering ]
...
Code Migration from frameworks/base/packages/Tethering ->
packages/modules/Connectivity/Tethering
BUG: 167962976
Test: TH
Merged-In: I2accb96abbdfa665ef34aa79e87af040226bcf32
Change-Id: Id7656fe7f6a6fae044dc8defd05e83d81c6b8c11
2020-10-30 14:42:23 +00:00
Treehugger Robot
ebf4f1454b
[automerger skipped] Merge "Restructure Module code [ com.android.tethering ]" am: c8769826af -s ours am: 31afdad66a -s ours am: a18699c4a4 -s ours am: 40088801dd -s ours
...
am skip reason: Change-Id Ib4a3a7a14d7d0e544aadf1bfb21ad390f1ba76a7 with SHA-1 571a934615 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1479716
Change-Id: I26b9652e1951f6be776d75707890ed563c6e66ec
2020-10-30 10:38:16 +00:00
Treehugger Robot
40088801dd
[automerger skipped] Merge "Restructure Module code [ com.android.tethering ]" am: c8769826af -s ours am: 31afdad66a -s ours am: a18699c4a4 -s ours
...
am skip reason: Change-Id Ib4a3a7a14d7d0e544aadf1bfb21ad390f1ba76a7 with SHA-1 62822a92cd is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1479716
Change-Id: Ibba9eafcf65c50cfe52b9d42f6b6d77d67ca886c
2020-10-30 10:04:43 +00:00
Treehugger Robot
a18699c4a4
[automerger skipped] Merge "Restructure Module code [ com.android.tethering ]" am: c8769826af -s ours am: 31afdad66a -s ours
...
am skip reason: Change-Id Ib4a3a7a14d7d0e544aadf1bfb21ad390f1ba76a7 with SHA-1 62822a92cd is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1479716
Change-Id: I509d8b350d9fea9757a0740704e401d39ab7f1de
2020-10-30 09:43:18 +00:00
Treehugger Robot
31afdad66a
[automerger skipped] Merge "Restructure Module code [ com.android.tethering ]" am: c8769826af -s ours
...
am skip reason: Change-Id Ib4a3a7a14d7d0e544aadf1bfb21ad390f1ba76a7 with SHA-1 62822a92cd is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1479716
Change-Id: I47de082b8e60278e8baa8381a384001d636e6f90
2020-10-30 09:13:35 +00:00
Baligh Uddin
2e6412b683
[automerger skipped] Merge "Restructure Module code [ com.android.tethering ]" into stage-aosp-master am: 7ba7715c73 -s ours am: 80e5ee71f3 -s ours am: 411e1ad5f6 -s ours
...
am skip reason: Change-Id I68cc959b56d5984b038cea4c621c60f34472f34c with SHA-1 54c723074a is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12948375
Change-Id: I060f66963855b6e490aa09d11e41253076685e99
2020-10-30 06:11:53 +00:00
Baligh Uddin
b6caaa4c1e
Restructure Module code [ com.android.tethering ]
...
Code Migration from frameworks/base/packages/Tethering ->
packages/modules/Connectivity/Tethering
BUG: 167962976
Test: m com.android.tethering + TH
Merged-In: Ib4a3a7a14d7d0e544aadf1bfb21ad390f1ba76a7
Change-Id: Ifae56d991b43c02f1e3496abbafc87d1869add8a
2020-10-30 05:44:59 +00:00
Baligh Uddin
411e1ad5f6
[automerger skipped] Merge "Restructure Module code [ com.android.tethering ]" into stage-aosp-master am: 7ba7715c73 -s ours am: 80e5ee71f3 -s ours
...
am skip reason: Change-Id I68cc959b56d5984b038cea4c621c60f34472f34c with SHA-1 54c723074a is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12948375
Change-Id: I94b96c2777c28841a464808fb5bc44a5efe89a5d
2020-10-30 05:39:31 +00:00
Baligh Uddin
80e5ee71f3
[automerger skipped] Merge "Restructure Module code [ com.android.tethering ]" into stage-aosp-master am: 7ba7715c73 -s ours
...
am skip reason: Change-Id I68cc959b56d5984b038cea4c621c60f34472f34c with SHA-1 54c723074a is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12948375
Change-Id: I0bed410286e6a199774856e053f41a7872079fac
2020-10-30 05:14:12 +00:00
Baligh Uddin
5c108fbf19
[automerger skipped] Merge "Restructure Module code [ com.android.tethering ]" into rvc-d1-dev-plus-aosp am: 75c5696de1 -s ours am: cca3b6b6bb -s ours
...
am skip reason: Change-Id Ide2ba760c0552e614635b3e402890b587ddc3c4c with SHA-1 e62dea3597 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12948776
Change-Id: I4952e2e15004f71f94403909a3360c85a08a3027
2020-10-30 00:57:18 +00:00
Baligh Uddin
cca3b6b6bb
[automerger skipped] Merge "Restructure Module code [ com.android.tethering ]" into rvc-d1-dev-plus-aosp am: 75c5696de1 -s ours
...
am skip reason: Change-Id Ide2ba760c0552e614635b3e402890b587ddc3c4c with SHA-1 e62dea3597 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12948776
Change-Id: I57c6d87cdb2226c6fea789c669289b34768d27e2
2020-10-30 00:41:22 +00:00
Baligh Uddin
f69cbcf3c2
Restructure Module code [ com.android.tethering ]
...
Code Migration from frameworks/base/packages/Tethering ->
packages/modules/Connectivity/Tethering
BUG: 167962976
Test: TH
Merged-In: I68cc959b56d5984b038cea4c621c60f34472f34c
Change-Id: Ia22c69ebff88d2d117a058e6ad22b23fa5d04fda
2020-10-29 21:41:26 +00:00
TreeHugger Robot
1469d40aa4
Merge "Apply FLAG_IMMUTABLE to the PendingIntent in NetworkStatService.java"
2020-10-29 21:27:00 +00:00
TreeHugger Robot
70261409e0
[automerger skipped] Merge "Restructure Module code [ com.android.tethering ]" into rvc-qpr-dev-plus-aosp am: ec2ac82685 -s ours
...
am skip reason: Change-Id I2accb96abbdfa665ef34aa79e87af040226bcf32 with SHA-1 7199b112b5 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12948957
Change-Id: Id1810bb9d1a4e911824207ae2f9b0daf16f4bf5d
2020-10-29 20:48:19 +00:00
Baligh Uddin
54c723074a
Restructure Module code [ com.android.tethering ]
...
Code Migration from frameworks/base/packages/Tethering ->
packages/modules/Connectivity/Tethering
BUG: 167962976
Test: TH
Merged-In: Ide2ba760c0552e614635b3e402890b587ddc3c4c
Change-Id: I68cc959b56d5984b038cea4c621c60f34472f34c
2020-10-29 20:46:03 +00:00
Baligh Uddin
3874f34390
Merge "Restructure Module code [ com.android.tethering ]"
2020-10-29 19:06:32 +00:00
Ashwini Oruganti
f5686f3918
Apply FLAG_IMMUTABLE to the PendingIntent in NetworkStatService.java
...
Broadcast intents sent by AlarmManager are immutable; the system
dispatches them without customization.
Fixes: 171815343
Test: TH
Change-Id: I35ccfc0f69fd98b5803da74d9eb12902b351acc7
2020-10-29 11:19:36 -07:00
Baligh Uddin
e62dea3597
Restructure Module code [ com.android.tethering ]
...
Code Migration from frameworks/base/packages/Tethering ->
packages/modules/Connectivity/Tethering
BUG: 167962976
Test: TH
Merged-In: I2accb96abbdfa665ef34aa79e87af040226bcf32
Change-Id: Ide2ba760c0552e614635b3e402890b587ddc3c4c
2020-10-29 17:31:50 +00:00
Baligh Uddin
7199b112b5
Restructure Module code [ com.android.tethering ]
...
Code Migration from frameworks/base/packages/Tethering ->
packages/modules/Connectivity/Tethering
BUG: 167962976
Test: TH
Change-Id: I2accb96abbdfa665ef34aa79e87af040226bcf32
2020-10-29 15:21:39 +00:00
Mathew Inwood
2217f37fc7
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.
This is a resubmit of ag/12929664 with some APIs excluded that caused
test failures; see bugs 171886397, 171888296, 171864568.
APIs excluded:
Landroid/bluetooth/le/ScanRecord;->parseFromBytes([B)Landroid/bluetooth/le/ScanRecord;
Landroid/os/Process;->myPpid()I
Landroid/os/SharedMemory;->getFd()I
Landroid/hardware/input/InputManager;->INJECT_INPUT_EVENT_MODE_WAIT_FOR_FINISH:I
Bug: 170729553
Test: Treehugger
Change-Id: I8285daa8530260251ecad6f3f38f98e263629ca7
2020-10-29 11:51:12 +00:00
Hongwei Wang
2feaa993c2
Revert "Add maxTargetSdk restriction to unused APIs."
...
This reverts commit 3950aab83b .
Reason for revert: Droidcop-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?testMethod=testAppZygotePreload&testClass=android.app.cts.ServiceTest&atpConfigName=suite%2Ftest-mapping-presubmit-retry_cloud-tf&testModule=CtsAppTestCases&fkbb=6936597&lkbb=6936969&lkgb=6936551&testResults=true&branch=git_master&target=cf_x86_phone-userdebug >, bug b/171886397
Bug: 171886397
Change-Id: Ibe0f0430a3451477c1ee8ef56a596e91ea1e7672
2020-10-28 20:16:22 +00:00
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