e2d48ff57c5529b32a9cd7bfdcf21d29df539f73
Documentation pointing to the registerNetwork() overload including a timeout argument was pointing to the version removed by commit15fd4395e1. This makes it impossible to cherry pick15fd4395e1due to the linter complaining about unresolvable links. This patch fixes the documentation to point to the registerNetwork() with argument types NetworkRequest, NetworkCallback, int, in that order. Bug: 36370941 Test: no functional change Change-Id: Ieaf58f81d89fdf63f480fd15e65ed52822fc4f51
Merge "Merge "Adding 'uhid' permission for bluetooth stack." am:
3e010d1353 am: 96d3b668bb am: 50c5253c2d" into oc-dev-plus-aosp
…
…
Merge "Merge "Change signalStrength to int." am:
73818566d6 am: 762e0c1162 am: 7e80c3f00b" into oc-dev-plus-aosp
Merge "Setting Session commited broadcast when an existing apk is enabled for a different user" into oc-dev am:
fc157e702f
…
Description
No description provided
Languages
Java
73.7%
Kotlin
14%
PowerBuilder
5.8%
C++
5.2%
AIDL
1%