Commit Graph

326613 Commits

Author SHA1 Message Date
Bill Yi
beded08d87 Import translations. DO NOT MERGE
Change-Id: I04a1ca378526cb10c0b162dda12264747b96fbcc
Auto-generated-cl: translation import
2017-06-12 11:43:41 -07:00
Android Build Merger (Role)
3b1a5a9154 Merge "Merge "Prevent ConcurrentModificationException in updateAllRecognitions" into oc-dr1-dev am: 1761985e42 am: d9f25b7c24" 2017-06-11 18:13:53 +00:00
Pankaj Kanwar
ae463ba2e8 Merge "Radio Interface changes to pass the encryption object, including the key,to the modem." 2017-06-11 18:13:12 +00:00
Chris Thornton
765b56a097 Merge "Prevent ConcurrentModificationException in updateAllRecognitions" into oc-dr1-dev am: 1761985e42
am: d9f25b7c24

Change-Id: If6f40489b60688ee66f2fca1df2698e3c3ca0b5b
2017-06-11 18:11:01 +00:00
Chris Thornton
d9f25b7c24 Merge "Prevent ConcurrentModificationException in updateAllRecognitions" into oc-dr1-dev
am: 1761985e42

Change-Id: Ifad48a57d045c8b8548d8ca9cc659a16a9a2d1bf
2017-06-11 18:03:32 +00:00
Chris Thornton
1761985e42 Merge "Prevent ConcurrentModificationException in updateAllRecognitions" into oc-dr1-dev 2017-06-11 17:56:31 +00: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
TreeHugger Robot
9f5812c74c Merge "Fix for bug #34905789" 2017-06-10 23:50:47 +00:00
Phil Weaver
c44019d2d5 Merge "Protect a11y against multi-threaded UIs" 2017-06-10 21:43:00 +00:00
Wale Ogunwale
5071728cc0 Merge "Merge "Added 'dumpsys activity lastanr'" into oc-dev am: b32fecd6e0 am: ba16911723" into oc-dr1-dev-plus-aosp
am: 80ee2d8589

Change-Id: I9669efab2fe272eb546fcf093779bab72484f0d5
2017-06-10 16:21:14 +00:00
Wale Ogunwale
cb0e865a9e Merge "Added 'dumpsys activity lastanr'" into oc-dev am: b32fecd6e0 am: a96a9f7326
am: 85cf72df18

Change-Id: Ie00c10b118dc9012149c5467864060f5f9a3a41e
2017-06-10 16:18:22 +00:00
Android Build Merger (Role)
80ee2d8589 Merge "Merge "Added 'dumpsys activity lastanr'" into oc-dev am: b32fecd6e0 am: ba16911723" into oc-dr1-dev-plus-aosp 2017-06-10 16:14:57 +00:00
Wale Ogunwale
ce777c67e7 Merge "Added 'dumpsys activity lastanr'" into oc-dev am: b32fecd6e0
am: ba16911723

Change-Id: I12ba7aeeba10410b2b9291d6b8627bee539ba4df
2017-06-10 16:13:51 +00:00
Wale Ogunwale
85cf72df18 Merge "Added 'dumpsys activity lastanr'" into oc-dev am: b32fecd6e0
am: a96a9f7326

Change-Id: Ic605bd334932fd01a12f7a1776259d1900915307
2017-06-10 16:11:47 +00:00
Wale Ogunwale
ba16911723 Merge "Added 'dumpsys activity lastanr'" into oc-dev
am: b32fecd6e0

Change-Id: I599924b33fbb137ba03607308011a8a76b524c72
2017-06-10 16:07:56 +00: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
Bill Yi
338e1e8fad Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 70a2b34938 -s ours
am: e637937af7  -s ours

Change-Id: I8f9d9ffb739e573f2917479b346b2d613e10ed76
2017-06-10 15:28:18 +00:00
Bill Yi
e637937af7 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 70a2b34938  -s ours

Change-Id: Ica458f82fe18edb4f2b74b11aded21b66f1096d3
2017-06-10 15:21:17 +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
bc69059c8f Merge "Update captive portal notif for Android TV am: 6ab655227a am: 49ffd6bae2" into oc-dr1-dev-plus-aosp
am: 803b04f835

Change-Id: I460f2fa866fd9a88f75ab7ba5796e0b572b9e16e
2017-06-10 07:41:59 +00:00
Rhiannon Malia
e8b1503fdc Update captive portal notif for Android TV am: 6ab655227a am: 949545789b
am: cb4765f307

Change-Id: I8c4ef4faa9bb72747b50dfdfac3a40ac2482bc82
2017-06-10 07:39:47 +00:00
Android Build Merger (Role)
803b04f835 Merge "Update captive portal notif for Android TV am: 6ab655227a am: 49ffd6bae2" into oc-dr1-dev-plus-aosp 2017-06-10 07:36:23 +00:00
Rhiannon Malia
59a5eaba22 Update captive portal notif for Android TV am: 6ab655227a
am: 49ffd6bae2

Change-Id: I288db2f6f74109da750b35406f802e11360babaa
2017-06-10 07:35:20 +00:00
Rhiannon Malia
cb4765f307 Update captive portal notif for Android TV am: 6ab655227a
am: 949545789b

Change-Id: I258a24b9069f5ded14c3cec53be3039086cbf0ba
2017-06-10 07:32:47 +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
Rhiannon Malia
949545789b Update captive portal notif for Android TV
am: 6ab655227a

Change-Id: I2096324e76770fee698507c2681d9c2fd92165b9
2017-06-10 07:26:46 +00:00
Bill Yi
8ee4c3af49 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: dfe6e518a2 -s ours
am: 6528998efc  -s ours

Change-Id: I8f1c84471907d056ba190c9ff489030da11686f2
2017-06-10 06:23:55 +00:00
Bill Yi
173bb6c061 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 7c8b1e6832 -s ours
am: 8314ad1f25  -s ours

Change-Id: Ic2b7e8ee6338c3ed5bf154a14f048cbb86784c61
2017-06-10 06:21:36 +00:00
Bill Yi
6528998efc Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: dfe6e518a2  -s ours

Change-Id: I7fbd39eeaaba27b93ef40201096fcd09bd176700
2017-06-10 06:16:16 +00:00
Bill Yi
8314ad1f25 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 7c8b1e6832  -s ours

Change-Id: I8f92d3f9c8b15070a661cf0480268b7100ca33ec
2017-06-10 06:13:36 +00:00
Bill Yi
c3b2fc0691 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 62bee2f5ff -s ours
am: ad38904231  -s ours

Change-Id: I59488902d845e12d630ede0462d30a9a933e2261
2017-06-10 06:10:35 +00:00
TreeHugger Robot
dfe6e518a2 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev 2017-06-10 06:06:25 +00:00
Bill Yi
ad38904231 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 62bee2f5ff  -s ours

Change-Id: I2c72358b3b45a3321d76d9af147d3f3c0b179846
2017-06-10 06:05:23 +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
5571ac1689 Merge "Preemptively create Bitmap from GraphicBuffer" into oc-dev am: a304564081 am: c596ef26c6
am: b855ee1528

Change-Id: I712aa1ccf80f25afd6457438bc8583b74f1117b2
2017-06-10 05:16:37 +00:00
Winson Chung
32cb6e83cf Merge "Preemptively create Bitmap from GraphicBuffer" into oc-dev am: a304564081 am: 489e22503e
am: 051b7ab809

Change-Id: I208e0606c0e35d205630ae2281891ef5a7052911
2017-06-10 05:11:33 +00:00
Winson Chung
b855ee1528 Merge "Preemptively create Bitmap from GraphicBuffer" into oc-dev am: a304564081
am: c596ef26c6

Change-Id: I3e7006c0fc54d7131a2a44c70a8b216bfc646b3c
2017-06-10 05:07:05 +00:00
Winson Chung
051b7ab809 Merge "Preemptively create Bitmap from GraphicBuffer" into oc-dev am: a304564081
am: 489e22503e

Change-Id: Ia2448b59ad2e0afd8d265572c81d794055423b8b
2017-06-10 05:02:02 +00:00
Winson Chung
c596ef26c6 Merge "Preemptively create Bitmap from GraphicBuffer" into oc-dev
am: a304564081

Change-Id: I035b2e3f957334a7ef125256d5a44d2e798e61eb
2017-06-10 04:57:50 +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
Ben Gruver
71ab39af08 Merge "Merge "Don't reset the value of package_verifier_enable if not in demo mode" into oc-dev am: ffd8343ba8 am: 6a71949f6e" into oc-dr1-dev-plus-aosp
am: 6871735ad0

Change-Id: I4b45ccbef9792a3b4e1c2604106814905e99fb7d
2017-06-10 01:02:28 +00:00
Ben Gruver
cea5efdde8 Merge "Don't reset the value of package_verifier_enable if not in demo mode" into oc-dev am: ffd8343ba8 am: 5be97babd6
am: 6fc077a2b1

Change-Id: I350ace09460de3018d9aa6ff5d27fd82bd6cd390
2017-06-10 00:58:56 +00: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
Android Build Merger (Role)
6871735ad0 Merge "Merge "Don't reset the value of package_verifier_enable if not in demo mode" into oc-dev am: ffd8343ba8 am: 6a71949f6e" into oc-dr1-dev-plus-aosp 2017-06-10 00:55:10 +00:00
Ben Gruver
6fc077a2b1 Merge "Don't reset the value of package_verifier_enable if not in demo mode" into oc-dev am: ffd8343ba8
am: 5be97babd6

Change-Id: Ic49f4796cf1bf26036a7d0aa7c06b2d0823e15de
2017-06-10 00:52:24 +00:00