- 67ab7d7 [automerger skipped] Merge "Revert "Correct the logic in NetworkCapabilitiesTest"" am: 9f1cd40748 -s ours am: 0e1deb1520 by Chiachang Wang · 4 years, 6 months ago
- c000e91 [automerger skipped] Merge "Correct the logic in NetworkCapabilitiesTest" am: efbd8b3961 -s ours am: 64169ae2a1 by Treehugger Robot · 4 years, 6 months ago
- 0e1deb1 [automerger skipped] Merge "Revert "Correct the logic in NetworkCapabilitiesTest"" am: 9f1cd40748 -s ours by Chiachang Wang · 4 years, 6 months ago
- 64169ae [automerger skipped] Merge "Correct the logic in NetworkCapabilitiesTest" am: efbd8b3961 -s ours by Treehugger Robot · 4 years, 6 months ago
- 9f1cd40 Merge "Revert "Correct the logic in NetworkCapabilitiesTest"" by Chiachang Wang · 4 years, 6 months ago
- 44c49e6 Revert "Correct the logic in NetworkCapabilitiesTest" by Chiachang Wang · 4 years, 6 months ago
- 7a966d4 Merge "Remove Preconditions usage in TestNetworkSpecifier" am: 1077770f78 am: f0ae748bf5 by Remi NGUYEN VAN · 4 years, 6 months ago
- 018b3a1 Merge "Revert "Revert "Remove connectivity dependency on Preconditions""" am: 9cb39acfef am: e3a7e8d8a5 by Remi NGUYEN VAN · 4 years, 6 months ago
- 9098ddd Merge "Add TEST_MAPPING for Connectivity" am: 2ff7a8e1b3 am: 9329f9fe97 by Remi NGUYEN VAN · 4 years, 6 months ago
- 7fd39d2 Merge "Move trimV4AddrZeros to libs/net" am: 405801f0fc am: 4e688a6cb7 by Treehugger Robot · 4 years, 6 months ago
- 898073e Merge "Add SystemMessages protos to Connectivity" am: 805b39b2d9 am: bd85dbeb41 by Remi NGUYEN VAN · 4 years, 6 months ago
- 2e74484 Merge "Swap parameters in QosCallback#registerQosCallback" am: bc71009366 am: cd9b3e06c2 by Jayachandran Chinnakkannu · 4 years, 6 months ago
- 48107ad Merge "Add new @SystemApi for specifying AddressType and IRK" am: bf516b9e11 am: 6ec4bd694b by Treehugger Robot · 4 years, 6 months ago
- 935980c Merge "The phone didn't reload the allowed Network Type" am: cfa02cd687 am: 3dd9c6bf01 by SongFerng Wang · 4 years, 6 months ago
- efd2d89d resolve merge conflicts of 403b7fd0b0a6736bcee1817fb5c774f8c8a040de to stage-aosp-master am: fdc5eb6e56 by Roshan Pius · 4 years, 6 months ago
- 1ff4cc3 Merge "[Fix] Bluetooth device ordering" into rvc-qpr-dev am: a6b0836e95 by tim peng · 4 years, 6 months ago
- f0ae748 Merge "Remove Preconditions usage in TestNetworkSpecifier" am: 1077770f78 by Remi NGUYEN VAN · 4 years, 6 months ago
- e3a7e8d Merge "Revert "Revert "Remove connectivity dependency on Preconditions""" am: 9cb39acfef by Remi NGUYEN VAN · 4 years, 6 months ago
- 9329f9f Merge "Add TEST_MAPPING for Connectivity" am: 2ff7a8e1b3 by Remi NGUYEN VAN · 4 years, 6 months ago
- 4e688a6 Merge "Move trimV4AddrZeros to libs/net" am: 405801f0fc by Treehugger Robot · 4 years, 6 months ago
- a6b0836 Merge "[Fix] Bluetooth device ordering" into rvc-qpr-dev by tim peng · 4 years, 6 months ago
- bd85dbe Merge "Add SystemMessages protos to Connectivity" am: 805b39b2d9 by Remi NGUYEN VAN · 4 years, 6 months ago
- cd9b3e0 Merge "Swap parameters in QosCallback#registerQosCallback" am: bc71009366 by Jayachandran Chinnakkannu · 4 years, 6 months ago
- 6ec4bd6 Merge "Add new @SystemApi for specifying AddressType and IRK" am: bf516b9e11 by Treehugger Robot · 4 years, 6 months ago
- 3dd9c6b Merge "The phone didn't reload the allowed Network Type" am: cfa02cd687 by SongFerng Wang · 4 years, 6 months ago
- efbd8b3 Merge "Correct the logic in NetworkCapabilitiesTest" by Treehugger Robot · 4 years, 6 months ago
- 1077770 Merge "Remove Preconditions usage in TestNetworkSpecifier" by Remi NGUYEN VAN · 4 years, 6 months ago
- 9cb39ac Merge "Revert "Revert "Remove connectivity dependency on Preconditions""" by Remi NGUYEN VAN · 4 years, 6 months ago
- 2ff7a8e Merge "Add TEST_MAPPING for Connectivity" by Remi NGUYEN VAN · 4 years, 6 months ago
- 405801f Merge "Move trimV4AddrZeros to libs/net" by Treehugger Robot · 4 years, 6 months ago
- 335a968 Remove Preconditions usage in TestNetworkSpecifier by Remi NGUYEN VAN · 4 years, 6 months ago
- 496d5dc Revert "Revert "Remove connectivity dependency on Preconditions"" by Remi NGUYEN VAN · 4 years, 6 months ago
- 805b39b Merge "Add SystemMessages protos to Connectivity" by Remi NGUYEN VAN · 4 years, 6 months ago
- bc71009 Merge "Swap parameters in QosCallback#registerQosCallback" by Jayachandran Chinnakkannu · 4 years, 6 months ago
- bf516b9 Merge "Add new @SystemApi for specifying AddressType and IRK" by Treehugger Robot · 4 years, 6 months ago
- fdc5eb6 resolve merge conflicts of 403b7fd0b0a6736bcee1817fb5c774f8c8a040de to stage-aosp-master by Roshan Pius · 4 years, 6 months ago
- 881130b [automerger skipped] Revert "Revert "Expose uids related APIs in NetworkRequest and N..." am: b0c6107723 -s ours am: 964605dc23 -s ours by Chiachang Wang · 4 years, 6 months ago
- cec8be5 Merge changes from topic "backport-connectivityresources" am: 744e27a39e am: b8acfc2327 by Lorenzo Colitti · 4 years, 6 months ago
- b8a344c Cherry-pick some test changes from ag/13210542. am: 250710c687 am: 127c8b8336 by Lorenzo Colitti · 4 years, 6 months ago
- 3efdf7d Add connectivity protos to framework-connectivity am: 3b0736735b am: 86fd14bae2 by Remi NGUYEN VAN · 4 years, 6 months ago
- 8cdbf88 Remove unused NetworkPolicyManagerInternal in CS am: 279b33817f am: f994ab199c by paulhu · 4 years, 6 months ago
- abfe20b Move connectivity AIDLs to android.net am: 3a680dc897 am: 7848a89499 by Remi NGUYEN VAN · 4 years, 6 months ago
- 842b3e6 Migrate framework-connectivity internal resources am: 4f8084867e am: 2c1e6d836c by Remi NGUYEN VAN · 4 years, 6 months ago
- e8f1c93 Expose isUidNetworkingBlocked and isUidRestrictedOnMeteredNetworks am: f969377a96 am: 6a4ff66e39 by Lorenzo Colitti · 4 years, 6 months ago
- ff56893 Add multipath preference, background status API am: 00b8d2cf37 am: 19efae9ff9 by Remi NGUYEN VAN · 4 years, 6 months ago
- 964605d [automerger skipped] Revert "Revert "Expose uids related APIs in NetworkRequest and N..." am: b0c6107723 -s ours by Chiachang Wang · 4 years, 6 months ago
- b8acfc2 Merge changes from topic "backport-connectivityresources" am: 744e27a39e by Lorenzo Colitti · 4 years, 6 months ago
- 127c8b8 Cherry-pick some test changes from ag/13210542. am: 250710c687 by Lorenzo Colitti · 4 years, 6 months ago
- cfa02cd Merge "The phone didn't reload the allowed Network Type" by SongFerng Wang · 4 years, 6 months ago
- 86fd14b Add connectivity protos to framework-connectivity am: 3b0736735b by Remi NGUYEN VAN · 4 years, 6 months ago
- f994ab1 Remove unused NetworkPolicyManagerInternal in CS am: 279b33817f by paulhu · 4 years, 6 months ago
- 7848a89 Move connectivity AIDLs to android.net am: 3a680dc897 by Remi NGUYEN VAN · 4 years, 6 months ago
- 403b7fd Merge changes from topics "revert-1645768-revert-1626206-replaceUidRange-MSYTKFNGUE-HIUTVTIGIR", "ti_redaction" by Treehugger Robot · 4 years, 6 months ago
- 2c1e6d8 Migrate framework-connectivity internal resources am: 4f8084867e by Remi NGUYEN VAN · 4 years, 6 months ago
- 6a4ff66 Expose isUidNetworkingBlocked and isUidRestrictedOnMeteredNetworks am: f969377a96 by Lorenzo Colitti · 4 years, 6 months ago
- 19efae9 Add multipath preference, background status API am: 00b8d2cf37 by Remi NGUYEN VAN · 4 years, 6 months ago
- 744e27a Merge changes from topic "backport-connectivityresources" by Lorenzo Colitti · 4 years, 6 months ago
- fd65c23 Merge "Add VoPS support info for NR" am: 98763306a2 am: e6cbb031cd by Hui Wang · 4 years, 6 months ago
- e6cbb03 Merge "Add VoPS support info for NR" am: 98763306a2 by Hui Wang · 4 years, 6 months ago
- 9876330 Merge "Add VoPS support info for NR" by Hui Wang · 4 years, 6 months ago
- 045fe26 Add new @SystemApi for specifying AddressType and IRK by Martin Brabham · 4 years, 6 months ago
- 250710c Cherry-pick some test changes from ag/13210542. by Lorenzo Colitti · 4 years, 6 months ago
- 8b77bf7 Use module resources in NetworkNotificationManager. by Lorenzo Colitti · 4 years, 6 months ago
- 4b623b3 Merge "Copy NetworkNotificationManager resources to conectivity module." am: 4cc71277cd am: d4aaa768f5 by Lorenzo Colitti · 4 years, 6 months ago
- d4aaa76 Merge "Copy NetworkNotificationManager resources to conectivity module." am: 4cc71277cd by Lorenzo Colitti · 4 years, 6 months ago
- 4cc7127 Merge "Copy NetworkNotificationManager resources to conectivity module." by Lorenzo Colitti · 4 years, 6 months ago
- 3b07367 Add connectivity protos to framework-connectivity by Remi NGUYEN VAN · 4 years, 6 months ago
- 279b338 Remove unused NetworkPolicyManagerInternal in CS by paulhu · 4 years, 6 months ago
- 3a680dc Move connectivity AIDLs to android.net by Remi NGUYEN VAN · 4 years, 7 months ago
- 4f80848 Migrate framework-connectivity internal resources by Remi NGUYEN VAN · 4 years, 6 months ago
- f969377 Expose isUidNetworkingBlocked and isUidRestrictedOnMeteredNetworks by Lorenzo Colitti · 4 years, 6 months ago
- 00b8d2c Add multipath preference, background status API by Remi NGUYEN VAN · 4 years, 6 months ago
- 576e903 Copy NetworkNotificationManager resources to conectivity module. by Lorenzo Colitti · 4 years, 6 months ago
- 2f66943 Merge "DO NOT MERGE Remove superfluous resetting of Keyguard on unocclusion." into rvc-qpr-dev am: 7dc8ba8c37 by Youngjun Kwak · 4 years, 6 months ago
- 0f349ed DO NOT MERGE Remove superfluous resetting of Keyguard on unocclusion. am: 92d80a9626 by kwaky · 4 years, 6 months ago
- 02c6b7c Merge changes from topic "app_hibernation_permission" am: 4dfa5f8db4 am: c4d1d01adf by Kevin Han · 4 years, 6 months ago
- 6debdf7 Add MANAGE_APP_HIBERNATION permission am: 152e389bae am: 0a4f736c02 by Kevin Han · 4 years, 6 months ago
- c4d1d01 Merge changes from topic "app_hibernation_permission" am: 4dfa5f8db4 by Kevin Han · 4 years, 6 months ago
- 0a4f736 Add MANAGE_APP_HIBERNATION permission am: 152e389bae by Kevin Han · 4 years, 6 months ago
- fdb2c46 Merge "AudioTrack: get/setStartThresholdInFrames" am: 64e333a250 am: b84823ab48 by Andy Hung · 4 years, 6 months ago
- 7dc8ba8 Merge "DO NOT MERGE Remove superfluous resetting of Keyguard on unocclusion." into rvc-qpr-dev by Youngjun Kwak · 4 years, 6 months ago
- 4dfa5f8 Merge changes from topic "app_hibernation_permission" by Kevin Han · 4 years, 6 months ago
- b84823a Merge "AudioTrack: get/setStartThresholdInFrames" am: 64e333a250 by Andy Hung · 4 years, 6 months ago
- 3873fd0 Merge "Return 0 instead of throwing RuntimeException from getSmsCapacityOnIcc" am: 258ecb55a5 am: e8ed5b17cf by Treehugger Robot · 4 years, 6 months ago
- fedc922 Merge "Le Scan: Add ambient discovery mode (1/2)" am: 4a47532570 am: c1b4ca0ef5 by Chienyuan Huang · 4 years, 6 months ago
- f26d63f Merge "Support MTE and GWP-ASan features in proto tombstones." am: efad4dcd74 am: 1f58a4bf12 by Peter Collingbourne · 4 years, 6 months ago
- 64e333a Merge "AudioTrack: get/setStartThresholdInFrames" by Andy Hung · 4 years, 6 months ago
- e8ed5b1 Merge "Return 0 instead of throwing RuntimeException from getSmsCapacityOnIcc" am: 258ecb55a5 by Treehugger Robot · 4 years, 6 months ago
- c1b4ca0 Merge "Le Scan: Add ambient discovery mode (1/2)" am: 4a47532570 by Chienyuan Huang · 4 years, 6 months ago
- 258ecb5 Merge "Return 0 instead of throwing RuntimeException from getSmsCapacityOnIcc" by Treehugger Robot · 4 years, 6 months ago
- 4a47532 Merge "Le Scan: Add ambient discovery mode (1/2)" by Chienyuan Huang · 4 years, 6 months ago
- 1f58a4b Merge "Support MTE and GWP-ASan features in proto tombstones." am: efad4dcd74 by Peter Collingbourne · 4 years, 6 months ago
- efad4dc Merge "Support MTE and GWP-ASan features in proto tombstones." by Peter Collingbourne · 4 years, 6 months ago
- bc82f0c Merge "Switch to bionic's pidfd_open." am: 680aaa9195 am: 95445c287c by Josh Gao · 4 years, 6 months ago
- 806baa2 Merge changes from topic "tej_isolate_protologging" am: d5127dceb0 am: 975acea8a5 by Tej Singh · 4 years, 6 months ago
- a06eac3 Move service/enums.proto to proto_logging am: 91bceaae7a am: 4235756ab9 by Tej Singh · 4 years, 6 months ago
- 8d152af Add usb and networkcapabilities back to core/proto am: 185bb90134 am: 6d2b61df0d by Tej Singh · 4 years, 6 months ago
- 95445c2 Merge "Switch to bionic's pidfd_open." am: 680aaa9195 by Josh Gao · 4 years, 6 months ago
- 680aaa9 Merge "Switch to bionic's pidfd_open." by Josh Gao · 4 years, 6 months ago
- 975acea Merge changes from topic "tej_isolate_protologging" am: d5127dceb0 by Tej Singh · 4 years, 6 months ago