Commit Graph

325966 Commits

Author SHA1 Message Date
TreeHugger Robot
66c8f60eb7 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev 2017-06-12 21:24:50 +00:00
TreeHugger Robot
fe84caad61 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev 2017-06-12 21:24:16 +00:00
Felipe Leme
5148d9fe81 Merge "Removed deprecated setExtras() method." into oc-dev
am: 7c41ddb975

Change-Id: Id74b4becd0f26d185cad3ecbe539aaa69f7ac89e
2017-06-12 19:05:34 +00:00
TreeHugger Robot
7c41ddb975 Merge "Removed deprecated setExtras() method." into oc-dev 2017-06-12 18:58:10 +00:00
Bill Yi
4655f36913 Import translations. DO NOT MERGE
Change-Id: If7f8b590d878dfbd97565b52d6353682221a2b39
Auto-generated-cl: translation import
2017-06-12 11:47:44 -07:00
Bill Yi
38eacb297a Import translations. DO NOT MERGE
Change-Id: I1c7d49d4ee0b5b45cf1f7bdbf6da707921ccfde4
Auto-generated-cl: translation import
2017-06-12 10:47:09 -07:00
TreeHugger Robot
209705d5d7 Merge "Change FlakyTest to Ignores" into oc-dr1-dev 2017-06-12 16:56:31 +00:00
Dianne Hackborn
d066c0c6cb Merge "Work on issue #62390590: SecurityException in JobIntentService$..." into oc-dev
am: 4eb76b2db8

Change-Id: I3aa5bbccbc669499a8ab6b12f180a7f5841164c3
2017-06-12 16:47:19 +00:00
Dianne Hackborn
4eb76b2db8 Merge "Work on issue #62390590: SecurityException in JobIntentService$..." into oc-dev 2017-06-12 16:38:52 +00:00
Chris Thornton
5375d9360f Merge "Prevent ConcurrentModificationException in updateAllRecognitions" into oc-dev
am: 484fb951e0  -s ours

Change-Id: I97dc24bc38e194b508a1b485ec4d7e1f8b62285d
2017-06-12 16:37:03 +00:00
Chris Thornton
484fb951e0 Merge "Prevent ConcurrentModificationException in updateAllRecognitions" into oc-dev 2017-06-12 15:54:33 +00:00
TreeHugger Robot
e1f9b3f195 Merge "Round the slashes of SlashDrawable" into oc-dr1-dev 2017-06-12 15:42:21 +00:00
Geoffrey Pitsch
eefa3be55d Change FlakyTest to Ignores
These are failing reliably, no need for FlakyTest

Bug: 62475085
Test: runtest systemui
Change-Id: Ib9abedda149976cffe07ea75c7034dd290d1f715
2017-06-12 10:55:28 -04:00
Lorenzo Colitti
9620595965 Change the multipath hint default to 0.
am: d1e7d3d73e

Change-Id: Iab590e33a1ae64701f0023970d53b23470533962
2017-06-12 12:29:31 +00:00
Lorenzo Colitti
d1e7d3d73e Change the multipath hint default to 0.
It was set to 3 (handover+reliability) during the development
cycle, but should not be set to a nonzero value on user devices
until the returned value takes into account the amount of
non-default network data usage.

Bug: 34630278
Test: marlin builds and boots
Test: ConnectivityServiceTest passes
Change-Id: I2b09a6e09c497886862cbaaaf3b283dedfbfa94c
2017-06-12 21:18:07 +09:00
TreeHugger Robot
cdb134c012 Merge "Add additional mocking for Context innards" into oc-dr1-dev 2017-06-12 05:06:43 +00:00
TreeHugger Robot
cacf1981ca Merge "Convert IControlsTethering from interface into callback" into oc-dr1-dev 2017-06-12 04:53:25 +00:00
Chris Thornton
d3178c4ed5 Prevent ConcurrentModificationException in updateAllRecognitions
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
2017-06-11 21:14:53 -07:00
Chris Thornton
1761985e42 Merge "Prevent ConcurrentModificationException in updateAllRecognitions" into oc-dr1-dev 2017-06-11 17:56:31 +00:00
Erik Kline
f3a08b44ed Add additional mocking for Context innards
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 ec37275ec9)
2017-06-11 18:19:22 +09:00
Erik Kline
6e9a10104c Convert IControlsTethering from interface into callback
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 ab6439b0f8)
2017-06-11 18:08:03 +09:00
Chris Thornton
23a57404e3 Prevent ConcurrentModificationException in updateAllRecognitions
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
2017-06-10 17:38:41 -07:00
Wale Ogunwale
a96a9f7326 Merge "Added 'dumpsys activity lastanr'" into oc-dev
am: b32fecd6e0

Change-Id: Iede7911ea687b7890833ee967da010db6041fb49
2017-06-10 16:05:53 +00:00
Wale Ogunwale
b32fecd6e0 Merge "Added 'dumpsys activity lastanr'" into oc-dev 2017-06-10 15:58:14 +00:00
TreeHugger Robot
70a2b34938 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev 2017-06-10 15:16:43 +00:00
Rhiannon Malia
49ffd6bae2 Update captive portal notif for Android TV
am: 6ab655227a

Change-Id: I60a67b0f22aa186e8b738b8a9ee002b2b5b04e42
2017-06-10 07:26:51 +00:00
TreeHugger Robot
dfe6e518a2 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev 2017-06-10 06:06:25 +00:00
TreeHugger Robot
7c8b1e6832 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev 2017-06-10 06:03:09 +00:00
TreeHugger Robot
62bee2f5ff Merge "Import translations. DO NOT MERGE" into oc-dr1-dev 2017-06-10 06:00:11 +00:00
Rhiannon Malia
6ab655227a Update captive portal notif for Android TV
Test: Connect to captive portal, notification appears in side panel

BUG:38453402
Change-Id: I39baf90897f2f3d67b8b03c31dd74fa1d39d39de
2017-06-10 05:22:42 +00:00
Winson Chung
489e22503e Merge "Preemptively create Bitmap from GraphicBuffer" into oc-dev
am: a304564081

Change-Id: I916e692fae56ed79a60d37b471b6e07457d2509d
2017-06-10 04:56:09 +00:00
Winson Chung
a304564081 Merge "Preemptively create Bitmap from GraphicBuffer" into oc-dev 2017-06-10 04:50:16 +00:00
Bill Yi
115afb735c Import translations. DO NOT MERGE
Change-Id: I9310dd36258cc026421953cbea84b51650c47a35
Auto-generated-cl: translation import
2017-06-09 18:14:37 -07:00
Bill Yi
dc62d84ffa Import translations. DO NOT MERGE
Change-Id: I1b6c615bb62abbb74f14adb70b5e29d96d3aeaad
Auto-generated-cl: translation import
2017-06-09 17:56:14 -07:00
Ben Gruver
6a71949f6e Merge "Don't reset the value of package_verifier_enable if not in demo mode" into oc-dev
am: ffd8343ba8

Change-Id: Ia3b7fe1bad2f3c2d13ce58f97174511ed8434e0b
2017-06-10 00:45:04 +00:00
Bill Yi
bb39a82705 Import translations. DO NOT MERGE
Change-Id: I8a17e54b671202d6e1393410e2c9cc90552e3c32
Auto-generated-cl: translation import
2017-06-09 17:44:49 -07:00
Ben Gruver
ffd8343ba8 Merge "Don't reset the value of package_verifier_enable if not in demo mode" into oc-dev 2017-06-10 00:39:02 +00:00
Bill Yi
c8fcad3c82 Import translations. DO NOT MERGE
Change-Id: Ia5c68401fedb31ebd81cffb9700833d9dd1f71a5
Auto-generated-cl: translation import
2017-06-09 17:37:30 -07:00
Wale Ogunwale
f1285916c3 Added 'dumpsys activity lastanr'
Allows for dumping the activity state during the last anr. This will
also be included in collected bug reports.

Bug: 38121026
Test: Cause an anr to occur and run 'adb shell dumpsys activity lastanr'
Change-Id: I1e4200f9e5cc16bfab98e5af31fc599cdd54cd11
2017-06-09 17:17:07 -07:00
Dianne Hackborn
729a328aca Work on issue #62390590: SecurityException in JobIntentService$...
...JobServiceEngineImpl$WrapperWorkItem.complete

Add more useful information in the security exception message that
is shown -- the reason the last job that was running on the context
was stopped.  This should tell you why when you are calling at that
point your job is no longer running.

Test: bit CtsJobSchedulerTestCases:*

Change-Id: Ia7155248b4b4f032cbf8e8754c5437f658ed192c
2017-06-09 16:50:00 -07:00
George Mount
62a18e12a3 Merge "Add target sdk check for behavior change." into oc-dev
am: e5e246ce5c

Change-Id: I3734ee5cd46536a015a8fc60bf8b57818800c792
2017-06-09 23:49:21 +00:00
George Mount
e5e246ce5c Merge "Add target sdk check for behavior change." into oc-dev 2017-06-09 23:41:47 +00:00
Jorim Jaggi
c48a8176e8 Merge "Fix thread booster" into oc-dev
am: 4c1209e00e

Change-Id: I3ef8bce9cd703a630280595a47baebae12c28387
2017-06-09 23:33:16 +00:00
Lucas Dupin
ed268dc350 Merge "Removed test from presubmit." into oc-dev
am: 4f30aa2be8

Change-Id: I3f73f3581fad4575f774f2c5ba870cc3308443a4
2017-06-09 23:26:36 +00:00
Jorim Jaggi
4c1209e00e Merge "Fix thread booster" into oc-dev 2017-06-09 23:24:04 +00:00
Felipe Leme
d52611258e Removed deprecated setExtras() method.
Bug: 37563972
Test: CtsAutoFillServiceTestCases pass

Change-Id: I7fef7c81267dad9097c711dbba849adf9d6b1cc5
2017-06-09 16:19:58 -07:00
Hugo Benichi
169f7bebce Merge "Instrument captive portal login activity" into oc-dr1-dev 2017-06-09 23:17:32 +00:00
TreeHugger Robot
4f30aa2be8 Merge "Removed test from presubmit." into oc-dev 2017-06-09 23:17:18 +00:00
Daniel Sandler
9bb81db15e Merge "" into oc-dev
am: 0aaae4ae78

Change-Id: Ibeceac21612da6669d0a216729c2671170651480
2017-06-09 23:05:29 +00:00
Daniel Sandler
0aaae4ae78 Merge "🐙" into oc-dev 2017-06-09 22:55:49 +00:00