Skip to content
  1. Jun 12, 2017
  3. Jun 11, 2017
    • Chris Thornton's avatar
      Merge "Prevent ConcurrentModificationException in updateAllRecognitions" into oc-dr1-dev · 1761985e
      Chris Thornton authored
      1761985e
    • Erik Kline's avatar
      Add additional mocking for Context innards · f3a08b44
      Erik Kline authored 
      Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
    - cherry-picked to master and verified there as well
Bug: 32163131
Bug: 32561414

Merged-In: I2695841bfc31280060754132e589af1ca95911da
Merged-In: I9a05f34035a15b233a44d517f2b2426481679974
Change-Id: I0b5b1b12d55547d08c332c7d274f19f0023a7b07
(cherry picked from commit ec37275e)
      f3a08b44
    • Erik Kline's avatar
      Convert IControlsTethering from interface into callback · 6e9a1010
      Erik Kline authored 
      Additionally:
    - add updateLinkProperties() method to new callback
    - skeletally connect LinkProperties updates through
      to OffloadController

TODOs liberally sprinkled through out.

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 29337859
Bug: 32163131
Merged-In: I178130e65db4fef26d62ea7eaa9a52f7e8103432
Merged-In: I832d77747de7517513c22d36fff4a2fa2bb95154
Change-Id: I631d17b26be153534551a1615931fc98b598b953
(cherry picked from commit ab6439b0)
      6e9a1010
    • Chris Thornton's avatar
      Prevent ConcurrentModificationException in updateAllRecognitions · 23a57404
      Chris Thornton authored 
      When invoking updateAllRecognitions, if a callback binder was determined
to have died, an internal function would go and remove it from
mModelDataMap. However, updateAllRecognitions was iterating over this
map, so it would then explode. By first making a copy of the model datas
before iterating over all of them, this problem is avoided.

(As part of trying to figure out what was happening, also updated all
the method names that implicitly assumed they had a lock, and double
checked that everything with a Locked suffix is actually locked)

Bug: 62487479
Test: Use the sound trigger test app to load and start two models, force
kill the app (so the dangling binders hang around), then enable power
save (which triggers the call to updateAllRecognitions)

Change-Id: I87b9dfc1b2af5e294050b146737916ccaad882c1
      23a57404
  5. Jun 10, 2017
  7. Jun 09, 2017