diff options
| author | Cody Kesting <ckesting@google.com> | 2020-04-01 01:13:11 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-04-01 01:13:11 +0000 |
| commit | 5add803be8958db2593ba2488c28e823503d5f86 (patch) | |
| tree | 84c8b73d3967e83986076e74e28215059ca2922b /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 1db5f59dcf646e524124749e89e0237a2ab6b6c2 (diff) | |
| parent | e277c77fe1d91de10b14097f672c25a7dd289214 (diff) | |
Merge changes I2431a6d2,I9096969a,I748bd9de,Ia5387ca2,I803bdec8, ... into rvc-dev
* changes:
Update CS helper for clearing NetworkCapabilities UIDs.
Simplify unregister logic for Connectivity Diagnostics callbacks.
Clarify comments for Connectivity Diagnostics reports.
Sort administrator UIDs for NetworkCapabilities.
Add combine() and equals() for NetworkCapabilities admin UIDs.
Use IBinder as key for ConnectivityDiagnostics storage in CS.
Decrement networkRequestPerUid when callbacks are unregistered.
Invoke onConnectivityReport on registering ConnectivityDiagnostics.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions