summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorChristopher Wiley <wiley@google.com>2016-06-08 20:55:10 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-06-08 20:55:13 +0000
commit281ec3272f8335513bf85f17465f55b241ae0725 (patch)
treeeed5b3476077d17918f62406133c0d776cdf3ae3 /tools/aapt2/diff/Diff.cpp
parentee651e63e056f888e7cec5ebe46a2bab251496d7 (diff)
parent5c0b10a4a9eecc5307bb89a271221f2b20448797 (diff)
Merge changes from topic 'tethering-ownership' into nyc-mr1-dev
* changes: Tethering: Own WiFi tethering state and lifetime Use an ArrayMap instead of HashMap to track tether interfaces Consolidate cleanup logic in TetherInterfaceSM.TetheredState Annotate TetherInterfaceStateMachineTest for APCT Rely on Tethering mutex for TetherInterfaceSM Rename TetherInterfaceSM to TetherInterfaceStateMachine Remove dead code from TetherInterfaceSM Remove transient StartingState from TetherInterfaceSM Expand test coverage of TetherInterfaceSM Add demonstration unittest for TetherInterfaceSM Extract TetherInterfaceSM to its own class. Make Tethering.TetherInterfaceSM more self contained Clean up class members in Tethering.TetherInterfaceSM Fix trivial warnings in Tethering.java
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions