Lorenzo Colitti
fe7b39264b
[automerger skipped] Merge changes from topic "backport-connectivityresources" am: 744e27a39e am: b8acfc2327 am: cec8be5ba4 -s ours
...
am skip reason: skip tag Change-Id Ic0d24d36af0b87153d527083f8964ddc6cd78482 with SHA-1 a405de0796 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645297
Change-Id: Ie24e96154851ddeac6971e4bfa49a0eb43e5915c
2021-03-22 12:27:31 +00:00
Lorenzo Colitti
a6809963a3
[automerger skipped] Cherry-pick some test changes from ag/13210542. am: 250710c687 am: 127c8b8336 am: b8a344c44c -s ours
...
am skip reason: skip tag Change-Id I35d28c8df341dbbac2774026c6ca749e296c0482 with SHA-1 21147c02f8 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645000
Change-Id: I886ca8978862d2dacc11d2bd5d4977698e953935
2021-03-22 12:27:21 +00:00
Remi NGUYEN VAN
a06d62bd67
[automerger skipped] Add connectivity protos to framework-connectivity am: 3b0736735b am: 86fd14bae2 am: 3efdf7d59d -s ours
...
am skip reason: skip tag Change-Id I2c4a37ff2ee9e8efde49885feeafa27dcff7ca2c with SHA-1 48462ab566 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635040
Change-Id: I593f9d014d29a8041c9acbe1f3034f15613c88b5
2021-03-22 12:27:12 +00:00
paulhu
e827d058a6
[automerger skipped] Remove unused NetworkPolicyManagerInternal in CS am: 279b33817f am: f994ab199c am: 8cdbf889be -s ours
...
am skip reason: skip tag Change-Id I8719ef2e96e7db9da2894b467b9e7a1bc09de386 with SHA-1 96ab9cfeeb is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646969
Change-Id: I3bfe4457a7b9f3a0b7f2f3604f0f1745c96cb7bb
2021-03-22 12:26:52 +00:00
Remi NGUYEN VAN
34d7042de9
[automerger skipped] Move connectivity AIDLs to android.net am: 3a680dc897 am: 7848a89499 am: abfe20b16d -s ours
...
am skip reason: skip tag Change-Id I611f1941698c574e37aea912ee76dadc8b32e41a with SHA-1 e5215e3c35 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596272
Change-Id: Ice5060b366cfb6cbce6e6151f2fb1a1208e9b939
2021-03-22 12:26:41 +00:00
Remi NGUYEN VAN
0a9f62252d
[automerger skipped] Migrate framework-connectivity internal resources am: 4f8084867e am: 2c1e6d836c am: 842b3e6a57 -s ours
...
am skip reason: skip tag Change-Id I77a3efca2cd644f9828db1ed5d3cae8070fb8363 with SHA-1 dd5f6037ec is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1641905
Change-Id: I17ffd47283c43a6df1e61ca9ef864ca32d99e4e9
2021-03-22 12:26:31 +00:00
Lorenzo Colitti
eb452e66b9
[automerger skipped] Expose isUidNetworkingBlocked and isUidRestrictedOnMeteredNetworks am: f969377a96 am: 6a4ff66e39 am: e8f1c936bb -s ours
...
am skip reason: skip tag Change-Id I4ad0ca60431fe3702be85332530b6e93728d55e7 with SHA-1 0c1a37b7ad is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644390
Change-Id: Ia3231e995ce0b7105357b4bb629532440d6b46d2
2021-03-22 12:26:22 +00:00
Remi NGUYEN VAN
a70a3b8314
[automerger skipped] Add multipath preference, background status API am: 00b8d2cf37 am: 19efae9ff9 am: ff56893947 -s ours
...
am skip reason: skip tag Change-Id I8a03162b2f6691086bb64e75ffd354cdfca7f86a with SHA-1 87eb49b62f is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644388
Change-Id: I147c04bb30ed920679d88cd765b7517ca4fbd12e
2021-03-22 12:26:13 +00:00
Anton Hansson
5672191039
Merge "Merge "Add VoPS support info for NR" am: 98763306a2 am: e6cbb031cd am: fd65c23661" into sc-dev
2021-03-22 12:12:25 +00:00
Lucas Lin
0e726e611e
Merge "Replace CM#isNetworkSupported() with checking FEATURE_TELEPHONY" into sc-dev
2021-03-22 12:06:48 +00:00
Bernardo Rufino
04addcb189
Merge "Adjust ACSD APIs" into sc-dev
2021-03-22 11:39:08 +00:00
Hui Wang
d2dc4ae865
Merge "Add VoPS support info for NR" am: 98763306a2 am: e6cbb031cd am: fd65c23661
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1585530
Change-Id: Ide029f3f8603474b3f30c7fc250c50e25cea2323
2021-03-22 11:01:14 +00:00
Lorenzo Colitti
31681dca8c
[automerger skipped] Merge "Copy NetworkNotificationManager resources to conectivity module." am: 4cc71277cd am: d4aaa768f5 am: 4b623b3194 -s ours
...
am skip reason: skip tag Change-Id I99c0d28069dd1a13d452105b0a83a03a833232a2 with SHA-1 fe3f33de19 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644996
Change-Id: I97d82338363702be56963839a241e1d72c1e9c86
2021-03-22 11:00:35 +00:00
Youngjun Kwak
2071aacc80
[automerger skipped] Merge "DO NOT MERGE Remove superfluous resetting of Keyguard on unocclusion." into rvc-qpr-dev am: 7dc8ba8c37 am: 2f669431dd -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13828749
Change-Id: I49c69c12a6830fdbd55e13911d518e29f6934988
2021-03-22 10:59:54 +00:00
kwaky
e8f83e0f45
[automerger skipped] DO NOT MERGE Remove superfluous resetting of Keyguard on unocclusion. am: 92d80a9626 am: 0f349ed813 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13828749
Change-Id: Ia30a51022ef3cbc635a1de069f9a13afaa3a5ae1
2021-03-22 10:59:45 +00:00
Kevin Han
4939908629
Merge changes from topic "app_hibernation_permission" am: 4dfa5f8db4 am: c4d1d01adf am: 02c6b7ccd6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624868
Change-Id: Id8b6c9bd78b76c0ebb0b6249a41b9cec5c5b34bd
2021-03-22 10:59:19 +00:00
Kevin Han
54e732bb3b
[automerger skipped] Add MANAGE_APP_HIBERNATION permission am: 152e389bae am: 0a4f736c02 am: 6debdf7e80 -s ours
...
am skip reason: skip tag Change-Id Id57ee57f49710d0b8a49a4ec561800db43089f87 with SHA-1 7d14fde4f4 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646329
Change-Id: I48654bb58b6173b804e4f3dfc5aea76efb527309
2021-03-22 10:59:07 +00:00
Andy Hung
474ecbb564
[automerger skipped] Merge "AudioTrack: get/setStartThresholdInFrames" am: 64e333a250 am: b84823ab48 am: fdb2c46585 -s ours
...
am skip reason: skip tag Change-Id I5064d04961e48b530c49071ff84c2e0d2065f41b with SHA-1 1c34209969 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644446
Change-Id: I24e5198323195b810b229a6a90c0220411dc2dd4
2021-03-22 10:58:29 +00:00
Treehugger Robot
67f4172451
Merge "Return 0 instead of throwing RuntimeException from getSmsCapacityOnIcc" am: 258ecb55a5 am: e8ed5b17cf am: 3873fd0c6a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1643623
Change-Id: I53cc9c17607de633dd6bb6a7380a53d1193e8c39
2021-03-22 10:56:45 +00:00
Chienyuan Huang
50421a5c83
Merge "Le Scan: Add ambient discovery mode (1/2)" am: 4a47532570 am: c1b4ca0ef5 am: fedc9228f3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1629277
Change-Id: I14fe563d36d9f63e2a39cb33599a8587a3dba73c
2021-03-22 10:55:14 +00:00
Peter Collingbourne
2e6fd97092
Merge "Support MTE and GWP-ASan features in proto tombstones." am: efad4dcd74 am: 1f58a4bf12 am: f26d63feb3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625208
Change-Id: If1ff31554c8651b964acf28d54c7334d333e6f99
2021-03-22 10:54:45 +00:00
Josh Gao
1c6dd547b5
Merge "Switch to bionic's pidfd_open." am: 680aaa9195 am: 95445c287c am: bc82f0c678
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646356
Change-Id: I357c24ce5ba57d7887dce9e7f58d0e924e59ce85
2021-03-22 10:54:02 +00:00
Tej Singh
b3db256be1
[automerger skipped] Merge changes from topic "tej_isolate_protologging" am: d5127dceb0 am: 975acea8a5 am: 806baa23ba -s ours
...
am skip reason: skip tag Change-Id I24ff96806e417ad4ee89d84f051ea790a416338f with SHA-1 e5cffdb857 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1639879
Change-Id: Ibaab71602ed90389843202b05fa5d903aee6745d
2021-03-22 10:53:30 +00:00
Tej Singh
3033e82164
[automerger skipped] Move service/enums.proto to proto_logging am: 91bceaae7a am: 4235756ab9 am: a06eac39b6 -s ours
...
am skip reason: skip tag Change-Id I9ea0a1482336694c446e950ea5cb46b95372b76d with SHA-1 51cffe5260 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1639218
Change-Id: I43c3f660a3030f5edfe268792510abc8ebc38a18
2021-03-22 10:53:20 +00:00
Tej Singh
fb57096d12
[automerger skipped] Add usb and networkcapabilities back to core/proto am: 185bb90134 am: 6d2b61df0d am: 8d152af2b9 -s ours
...
am skip reason: skip tag Change-Id I055a3ca44b83921018697bdefec29161b483d0fe with SHA-1 d825d18431 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1639216
Change-Id: I481972bb025749863d9585e0a83a17abaf135047
2021-03-22 10:53:10 +00:00
Ming-Shin Lu
39217229c8
Merge "Fix NavigationBar overlapping with the IME window" into sc-dev
2021-03-22 10:22:36 +00:00
Oli Lan
168fa576a5
Merge "Add clipboard CTS tests to presubmit test mapping for ClipboardService." into sc-dev
2021-03-22 10:19:29 +00:00
Lucas Lin
385414ee28
Merge "Remove the usage of NETID_UNSET from Vpn.java" into sc-dev
2021-03-22 09:38:26 +00:00
Remi NGUYEN VAN
15615ed0f2
Merge "Add NetworkFactory to connectivity jarjar rules" into sc-dev
2021-03-22 09:27:06 +00:00
Adrian Roos
07f3583061
Merge "IME Insets: Remove obsolete applyImeVisibility call" into sc-dev
2021-03-22 08:38:04 +00:00
lucaslin
2cc371c74b
Remove the usage of NETID_UNSET from Vpn.java
...
Modify Vpn#getNetId() to Vpn#getNetwork() and uses NETID_UNSET
when getNetwork() returns null in ConnectivityServiceTest.
Bug: 182963397
Test: atest FrameworksNetTests
Change-Id: I69d449705b1dc541287c72af8dc7705dc4733109
2021-03-22 08:29:18 +00:00
TreeHugger Robot
0467858710
Merge "Animations for visual immersive mode" into sc-dev
2021-03-22 07:45:57 +00:00
TreeHugger Robot
f1ce6c68c9
Merge "Validate HotwordDetectionService to be in the isolated process." into sc-dev
2021-03-22 07:03:44 +00:00
Lucas Lin
22ca359895
Merge "Expose some APIs from ConnectivityManager" into sc-dev
2021-03-22 06:44:49 +00:00
Lucas Lin
1fe4cb3e5d
Merge "Use getAllInterfaceNames to get all interface names" into sc-dev
2021-03-22 04:47:22 +00:00
Tiger Huang
7901e98c45
Animations for visual immersive mode
...
The CL applies fade-in/fade-out animations for BEHAVIOR_DEFAULT while
changing the system bar visibility.
Fix: 168913586
Test: WindowInsetsTests
Change-Id: I6e9887baf2ba40b51c01bf2239915d381ba891a6
2021-03-22 12:21:48 +08:00
lucaslin
02ec9e9d4a
Remove the usage of hidden API - setIsAvailable() from Vpn
...
In fact, NetworkAgent#getLegacyNetworkInfo() will call this API,
so VPN doesn't need to call it.
Remove the redundant behavior and the usage of hidden API.
Bug: 182963397
Test: m
Change-Id: I3b88f22fffde3dd4000d28342ed07209c7121a37
2021-03-22 03:54:00 +00:00
lucaslin
9eae065a2e
Expose some APIs from ConnectivityManager
...
- Expose setRequireVpnForUids to Vpn.java
- Expose setLegacyLockdownVpnEnabled to LockdownVpnTracker.java
- Expose requestRouteToHostAddress to
GnssNetworkConnectivityHandler.java
Bug: 182963397
Test: m
Change-Id: I1fb5ecfbe37878ba3534e6c6c7599ca29db2735c
2021-03-22 11:51:27 +08:00
Remi NGUYEN VAN
1fa5fc98f7
Add NetworkFactory to connectivity jarjar rules
...
NetworkFactory is part of net-utils-device-common, but is outside of
the com.android.net.module.util and needs a separate jarjar rule.
Bug: 171540887
Test: atest FrameworksNetTests
Change-Id: Iec828a789175acdbe4e7f35e4cc942922540495c
2021-03-22 03:50:15 +00:00
Chiachang Wang
a95de94fd4
Merge "Remove hidden onAvailable callback override" into sc-dev
2021-03-22 02:44:16 +00:00
Lorenzo Colitti
9997912ba9
Merge "Use connectivity resources in service-connectivity" into sc-dev
2021-03-22 02:21:13 +00:00
Julia Reynolds
b7eee43f50
Merge "Provide more specific notification cancelation reasons" into sc-dev
2021-03-22 02:08:10 +00:00
Shubang Lu
f505c5d215
Merge "Unhide media metrics APIs" into sc-dev
2021-03-22 01:27:07 +00:00
Remi NGUYEN VAN
906cde3fde
Merge "Use jniThrowErrnoException from JNIHelp" into sc-dev
2021-03-22 00:20:36 +00:00
Roshan Pius
1d050e01e0
Merge "resolve merge conflicts of 403b7fd0b0 to stage-aosp-master" into sc-dev
2021-03-21 23:41:31 +00:00
Roshan Pius
819ee3fe2d
Merge "NetworkControllerWifiTest: Fix unit test" into sc-dev
2021-03-21 23:41:31 +00:00
TreeHugger Robot
41ec7a8e38
Merge "Add device config parameters to DiscreteRegistry." into sc-dev
2021-03-21 22:56:05 +00:00
Stanislav Zholnin
3c46aca490
Add device config parameters to DiscreteRegistry.
...
DiscreteRegistry cut off and quantization can be set using
adb shell device_config command.
Bug: 176965672
Test: in development
Change-Id: If4df5413d7c7f9bcbdcb751ac2ab772d51c1da80
2021-03-21 21:18:23 +00:00
Roshan Pius
00617edb46
resolve merge conflicts of 403b7fd0b0 to stage-aosp-master
...
Change-Id: Ib9d7923104ac0a60f6af5a3a2d2b7f13bc0262e3
2021-03-21 19:16:33 +00:00
Roshan Pius
2322c835cb
NetworkControllerWifiTest: Fix unit test
...
WifiInfo.makeCopy(boolean) was changed to WifiInfo.makeCopy(long).
Bug: 156867433
Bug: 162602799
Test: Compiles
Change-Id: Idec6165f6cf9819c56513a65c6958f2390cddbfe
2021-03-21 17:56:42 +00:00