Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
326,561 Commits 3 Branches 0 Tags
137d09aa074df979110db4d700ade5a68559d27a
Commit Graph

326561 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
cdb134c012 Merge "Add additional mocking for Context innards" into oc-dr1-dev 2017-06-12 05:06:43 +00:00
Erik Kline
568ee74bd7 Merge "Convert IControlsTethering from interface into callback" into oc-dr1-dev 
am: cacf1981ca  -s ours

Change-Id: Ib6cf8e7b04b9e24b9929d23f7ad3d79f2cf6dcc6
 2017-06-12 04:59:44 +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
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
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
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
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
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
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
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
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
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
Ben Gruver
c1d9d133bf Merge "Don't reset the value of package_verifier_enable if not in demo mode" into oc-dev am: ffd8343ba8 
am: 6a71949f6e

Change-Id: I2bb0ba88e8daeecc82014388d1a0fba54cd7847f
 2017-06-10 00:52:22 +00: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
Ben Gruver
5be97babd6 Merge "Don't reset the value of package_verifier_enable if not in demo mode" into oc-dev 
am: ffd8343ba8

Change-Id: I5ac1fce3ab71415061ba152d9e34c96f9a53e1c9
 2017-06-10 00:45:02 +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
Robert Greenwalt
52bde254ba Merge "Changed Locale in ServiceInfo to a list." am: a1df5b25e6 am: af04c43e3b 
am: 40b0ef4579

Change-Id: I6b40f88b1793b157ec3babcb39caf5d916c6301d
 2017-06-10 00:26:26 +00:00
Robert Greenwalt
40b0ef4579 Merge "Changed Locale in ServiceInfo to a list." am: a1df5b25e6 
am: af04c43e3b

Change-Id: I5fb2897cb5456f92ea4da17d333f091f2f2c1e42
 2017-06-10 00:17:22 +00: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
Robert Greenwalt
af04c43e3b Merge "Changed Locale in ServiceInfo to a list." 
am: a1df5b25e6

Change-Id: I7477fa88ae9cc83605d2172294bf2ecbcafc567e
 2017-06-10 00:10:33 +00:00
Robert Greenwalt
a1df5b25e6 Merge "Changed Locale in ServiceInfo to a list." 2017-06-10 00:03:58 +00:00
Android Build Merger (Role)
5f40d83476 Merge "Merge "Add target sdk check for behavior change." into oc-dev am: e5e246ce5c am: 4e76728dea" into oc-dr1-dev-plus-aosp 2017-06-09 23:59:14 +00:00