OSDN Git Service
Felipe Leme [Mon, 12 Jun 2017 19:19:46 +0000 (19:19 +0000)]
Merge "Removed deprecated setExtras() method." into oc-dev am:
7c41ddb975 am:
5148d9fe81
am:
eb196c7542
Change-Id: I322fdf688a0d78c090db27a4c0fb6c32152a231c
TreeHugger Robot [Mon, 12 Jun 2017 19:16:42 +0000 (19:16 +0000)]
Merge "TIF: add TvContract.isRecordedProgramUri() method"
Felipe Leme [Mon, 12 Jun 2017 19:13:38 +0000 (19:13 +0000)]
Merge "Removed deprecated setExtras() method." into oc-dev am:
7c41ddb975
am:
5148d9fe81
Change-Id: I7981171fd6b6f0bb6c019f64f418a3348bebcdc7
Felipe Leme [Mon, 12 Jun 2017 19:05:34 +0000 (19:05 +0000)]
Merge "Removed deprecated setExtras() method." into oc-dev
am:
7c41ddb975
Change-Id: Id74b4becd0f26d185cad3ecbe539aaa69f7ac89e
TreeHugger Robot [Mon, 12 Jun 2017 18:58:01 +0000 (18:58 +0000)]
Merge "Removed deprecated setExtras() method." into oc-dev
Lucas Dupin [Mon, 12 Jun 2017 18:47:09 +0000 (18:47 +0000)]
Merge "Scrims should be grey when in-app"
Geoffrey Pitsch [Mon, 12 Jun 2017 17:14:02 +0000 (17:14 +0000)]
Merge "Change FlakyTest to Ignores" into oc-dr1-dev am:
209705d5d7
am:
9fde4fcf26
Change-Id: I80d7220dcc849c01e2026019a585d08ee46f219b
Dianne Hackborn [Mon, 12 Jun 2017 17:08:46 +0000 (17:08 +0000)]
Merge "Merge "Work on issue #
62390590: SecurityException in JobIntentService$..." into oc-dev am:
4eb76b2db8 am:
d066c0c6cb" into oc-dr1-dev-plus-aosp
am:
c6e116cf81
Change-Id: Ic2b99979cf1a5cb1220554035bf54e7a10233ec7
Geoffrey Pitsch [Mon, 12 Jun 2017 17:06:26 +0000 (17:06 +0000)]
Merge "Change FlakyTest to Ignores" into oc-dr1-dev
am:
209705d5d7
Change-Id: I3e0ae84bf3b814b9a891c1909012c1fd4ae791ec
Dianne Hackborn [Mon, 12 Jun 2017 17:05:54 +0000 (17:05 +0000)]
Merge "Work on issue #
62390590: SecurityException in JobIntentService$..." into oc-dev am:
4eb76b2db8 am:
5b3d0066bf
am:
bef027c3b4
Change-Id: I14502b54b7bb807bd43ae472d649511e2ef46b6d
Android Build Merger (Role) [Mon, 12 Jun 2017 17:00:41 +0000 (17:00 +0000)]
Merge "Merge "Work on issue #
62390590: SecurityException in JobIntentService$..." into oc-dev am:
4eb76b2db8 am:
d066c0c6cb" into oc-dr1-dev-plus-aosp
Dianne Hackborn [Mon, 12 Jun 2017 16:59:23 +0000 (16:59 +0000)]
Merge "Work on issue #
62390590: SecurityException in JobIntentService$..." into oc-dev am:
4eb76b2db8
am:
d066c0c6cb
Change-Id: I435c71537d41f94d4e9af2e07a9f2a9258f2eab5
Rajeev Kumar [Mon, 12 Jun 2017 16:58:45 +0000 (16:58 +0000)]
Merge "Fixes the apostrophe and its escaping for zen_priority_introduction, zen_alarms_introduction, zen_silence_introduction_voice, pip_notification_message"
Dianne Hackborn [Mon, 12 Jun 2017 16:57:12 +0000 (16:57 +0000)]
Merge "Work on issue #
62390590: SecurityException in JobIntentService$..." into oc-dev am:
4eb76b2db8
am:
5b3d0066bf
Change-Id: If930e143df6621c1c68a74462d0b64e29e0ad2a9
TreeHugger Robot [Mon, 12 Jun 2017 16:56:24 +0000 (16:56 +0000)]
Merge "Change FlakyTest to Ignores" into oc-dr1-dev
Chris Thornton [Mon, 12 Jun 2017 16:54:59 +0000 (16:54 +0000)]
Merge "Prevent ConcurrentModificationException in updateAllRecognitions" into oc-dev am:
484fb951e0 -s ours am:
5375d9360f
am:
3f3237f4b1
Change-Id: Ica062edbc69050c8cfcf976aed06911f3e62be4e
Dianne Hackborn [Mon, 12 Jun 2017 16:49:08 +0000 (16:49 +0000)]
Merge "Work on issue #
62390590: SecurityException in JobIntentService$..." into oc-dev
am:
4eb76b2db8
Change-Id: I34f85b8e06b3eddfee1ea57e8dfcd3ef74e10ff3
Dianne Hackborn [Mon, 12 Jun 2017 16:47:19 +0000 (16:47 +0000)]
Merge "Work on issue #
62390590: SecurityException in JobIntentService$..." into oc-dev
am:
4eb76b2db8
Change-Id: I3aa5bbccbc669499a8ab6b12f180a7f5841164c3
Chris Thornton [Mon, 12 Jun 2017 16:46:58 +0000 (16:46 +0000)]
Merge "Prevent ConcurrentModificationException in updateAllRecognitions" into oc-dev am:
484fb951e0 am:
722550cc3c -s ours
am:
9252fe6925
Change-Id: I6c287fa3e59545e66d7c811adbbc4b1b08e6fe36
Chris Thornton [Mon, 12 Jun 2017 16:44:22 +0000 (16:44 +0000)]
Merge "Prevent ConcurrentModificationException in updateAllRecognitions" into oc-dev am:
484fb951e0 -s ours
am:
5375d9360f
Change-Id: Ib2dd5a0264733ab829c2976eef29a68056aacc2c
Dianne Hackborn [Mon, 12 Jun 2017 16:38:46 +0000 (16:38 +0000)]
Merge "Work on issue #
62390590: SecurityException in JobIntentService$..." into oc-dev
Chris Thornton [Mon, 12 Jun 2017 16:38:33 +0000 (16:38 +0000)]
Merge "Prevent ConcurrentModificationException in updateAllRecognitions" into oc-dev am:
484fb951e0
am:
722550cc3c -s ours
Change-Id: Ia7ed4ded824000ecf111f4ec2886a50dea67fa76
Chris Thornton [Mon, 12 Jun 2017 16:37:03 +0000 (16:37 +0000)]
Merge "Prevent ConcurrentModificationException in updateAllRecognitions" into oc-dev
am:
484fb951e0 -s ours
Change-Id: I97dc24bc38e194b508a1b485ec4d7e1f8b62285d
Chris Thornton [Mon, 12 Jun 2017 16:25:59 +0000 (16:25 +0000)]
Merge "Prevent ConcurrentModificationException in updateAllRecognitions" into oc-dev
am:
484fb951e0
Change-Id: Ice2c1b83135368f11884f4d8b2cfab138715e69a
Evan Laird [Mon, 12 Jun 2017 15:57:47 +0000 (15:57 +0000)]
Merge "Round the slashes of SlashDrawable" into oc-dr1-dev am:
e1f9b3f195
am:
1e830567a5
Change-Id: I0c455086e88ed0809431a3c8d88ad72d30764625
Chris Thornton [Mon, 12 Jun 2017 15:54:24 +0000 (15:54 +0000)]
Merge "Prevent ConcurrentModificationException in updateAllRecognitions" into oc-dev
Evan Laird [Mon, 12 Jun 2017 15:49:52 +0000 (15:49 +0000)]
Merge "Round the slashes of SlashDrawable" into oc-dr1-dev
am:
e1f9b3f195
Change-Id: Ie5974f71084b99c27decadd0522af2a8a46e304d
TreeHugger Robot [Mon, 12 Jun 2017 15:42:14 +0000 (15:42 +0000)]
Merge "Round the slashes of SlashDrawable" into oc-dr1-dev
Geoffrey Pitsch [Mon, 12 Jun 2017 14:55:28 +0000 (10:55 -0400)]
Change FlakyTest to Ignores
These are failing reliably, no need for FlakyTest
Bug:
62475085
Test: runtest systemui
Change-Id: Ib9abedda149976cffe07ea75c7034dd290d1f715
Lorenzo Colitti [Mon, 12 Jun 2017 12:48:15 +0000 (12:48 +0000)]
Merge "Change the multipath hint default to 0. am:
d1e7d3d73e am:
9620595965" into oc-dr1-dev-plus-aosp
am:
2c23595e7d
Change-Id: Id34d998fd3ed61559faac301b94e16fb95f13f2f
Lorenzo Colitti [Mon, 12 Jun 2017 12:43:07 +0000 (12:43 +0000)]
Change the multipath hint default to 0. am:
d1e7d3d73e am:
896a0065a6
am:
dc5fb1ffe1
Change-Id: Ibc9bac6776e5c3114e3f771e05692e0fc3c2a825
Android Build Merger (Role) [Mon, 12 Jun 2017 12:39:40 +0000 (12:39 +0000)]
Merge "Change the multipath hint default to 0. am:
d1e7d3d73e am:
9620595965" into oc-dr1-dev-plus-aosp
Lorenzo Colitti [Mon, 12 Jun 2017 12:37:13 +0000 (12:37 +0000)]
Change the multipath hint default to 0. am:
d1e7d3d73e
am:
9620595965
Change-Id: Icf1707e4a179bf8835ec9f7be031e9a74e638625
Lorenzo Colitti [Mon, 12 Jun 2017 12:37:07 +0000 (12:37 +0000)]
Change the multipath hint default to 0. am:
d1e7d3d73e
am:
896a0065a6
Change-Id: Ie6611ee7f9169a53132a6e664814bc579d70170d
Lorenzo Colitti [Mon, 12 Jun 2017 12:29:31 +0000 (12:29 +0000)]
Change the multipath hint default to 0.
am:
d1e7d3d73e
Change-Id: Iab590e33a1ae64701f0023970d53b23470533962
Lorenzo Colitti [Mon, 12 Jun 2017 12:29:30 +0000 (12:29 +0000)]
Change the multipath hint default to 0.
am:
d1e7d3d73e
Change-Id: I7fdd9eb04e3b92bd28218fc3a33a6157f84cdc2f
Lorenzo Colitti [Mon, 12 Jun 2017 10:01:34 +0000 (19:01 +0900)]
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
Erik Kline [Mon, 12 Jun 2017 05:20:43 +0000 (05:20 +0000)]
Merge "Add additional mocking for Context innards" into oc-dr1-dev am:
cdb134c012 -s ours
am:
9f409ae862 -s ours
Change-Id: I32aee4d72cd8ee471498e5d04a180d0dafc03332
Erik Kline [Mon, 12 Jun 2017 05:13:17 +0000 (05:13 +0000)]
Merge "Add additional mocking for Context innards" into oc-dr1-dev
am:
cdb134c012 -s ours
Change-Id: I6715134fe1883dc2d4613b38478d60f0ad2c33fe
Erik Kline [Mon, 12 Jun 2017 05:11:52 +0000 (05:11 +0000)]
Merge "Convert IControlsTethering from interface into callback" into oc-dr1-dev am:
cacf1981ca -s ours
am:
568ee74bd7 -s ours
Change-Id: I393f386ca6575c42e6b60457bcc74f1476e039e4
TreeHugger Robot [Mon, 12 Jun 2017 05:06:35 +0000 (05:06 +0000)]
Merge "Add additional mocking for Context innards" into oc-dr1-dev
Erik Kline [Mon, 12 Jun 2017 04:59:44 +0000 (04:59 +0000)]
Merge "Convert IControlsTethering from interface into callback" into oc-dr1-dev
am:
cacf1981ca -s ours
Change-Id: Ib6cf8e7b04b9e24b9929d23f7ad3d79f2cf6dcc6
TreeHugger Robot [Mon, 12 Jun 2017 04:53:19 +0000 (04:53 +0000)]
Merge "Convert IControlsTethering from interface into callback" into oc-dr1-dev
Chris Thornton [Sun, 11 Jun 2017 00:31:57 +0000 (17:31 -0700)]
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
Lucas Dupin [Wed, 24 May 2017 21:14:44 +0000 (14:14 -0700)]
Scrims should be grey when in-app
Bug:
38164389
Test: runtest -x colorextraction/tests/src/com/google/android/colorextraction/ColorExtractorTest.java
Test: runtest -x tests/src/com/android/systemui/colorextraction/SysuiColorExtractorTests.java
Change-Id: Ifcc04a8562e46b4f65bce0470ccd6c02dffcf377
Android Build Merger (Role) [Sun, 11 Jun 2017 18:13:43 +0000 (18:13 +0000)]
Merge "Merge "Prevent ConcurrentModificationException in updateAllRecognitions" into oc-dr1-dev am:
1761985e42 am:
d9f25b7c24"
Pankaj Kanwar [Sun, 11 Jun 2017 18:13:01 +0000 (18:13 +0000)]
Merge "Radio Interface changes to pass the encryption object, including the key,to the modem."
Chris Thornton [Sun, 11 Jun 2017 18:11:01 +0000 (18:11 +0000)]
Merge "Prevent ConcurrentModificationException in updateAllRecognitions" into oc-dr1-dev am:
1761985e42
am:
d9f25b7c24
Change-Id: If6f40489b60688ee66f2fca1df2698e3c3ca0b5b
Chris Thornton [Sun, 11 Jun 2017 18:03:32 +0000 (18:03 +0000)]
Merge "Prevent ConcurrentModificationException in updateAllRecognitions" into oc-dr1-dev
am:
1761985e42
Change-Id: Ifad48a57d045c8b8548d8ca9cc659a16a9a2d1bf
Chris Thornton [Sun, 11 Jun 2017 17:56:21 +0000 (17:56 +0000)]
Merge "Prevent ConcurrentModificationException in updateAllRecognitions" into oc-dr1-dev
Erik Kline [Wed, 7 Jun 2017 07:33:19 +0000 (16:33 +0900)]
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
ec37275ec9702b56bf328031675906a5483b89d4)
Erik Kline [Tue, 6 Jun 2017 10:24:21 +0000 (19:24 +0900)]
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
ab6439b0f8dd0a67c81235a3fc4d9c149de3780d)
Chris Thornton [Sun, 11 Jun 2017 00:31:57 +0000 (17:31 -0700)]
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
TreeHugger Robot [Sat, 10 Jun 2017 23:50:38 +0000 (23:50 +0000)]
Merge "Fix for bug #
34905789"
Phil Weaver [Sat, 10 Jun 2017 21:42:52 +0000 (21:42 +0000)]
Merge "Protect a11y against multi-threaded UIs"
Wale Ogunwale [Sat, 10 Jun 2017 16:21:14 +0000 (16:21 +0000)]
Merge "Merge "Added 'dumpsys activity lastanr'" into oc-dev am:
b32fecd6e0 am:
ba16911723" into oc-dr1-dev-plus-aosp
am:
80ee2d8589
Change-Id: I9669efab2fe272eb546fcf093779bab72484f0d5
Wale Ogunwale [Sat, 10 Jun 2017 16:18:22 +0000 (16:18 +0000)]
Merge "Added 'dumpsys activity lastanr'" into oc-dev am:
b32fecd6e0 am:
a96a9f7326
am:
85cf72df18
Change-Id: Ie00c10b118dc9012149c5467864060f5f9a3a41e
Android Build Merger (Role) [Sat, 10 Jun 2017 16:14:51 +0000 (16:14 +0000)]
Merge "Merge "Added 'dumpsys activity lastanr'" into oc-dev am:
b32fecd6e0 am:
ba16911723" into oc-dr1-dev-plus-aosp
Wale Ogunwale [Sat, 10 Jun 2017 16:13:51 +0000 (16:13 +0000)]
Merge "Added 'dumpsys activity lastanr'" into oc-dev am:
b32fecd6e0
am:
ba16911723
Change-Id: I12ba7aeeba10410b2b9291d6b8627bee539ba4df
Wale Ogunwale [Sat, 10 Jun 2017 16:11:47 +0000 (16:11 +0000)]
Merge "Added 'dumpsys activity lastanr'" into oc-dev am:
b32fecd6e0
am:
a96a9f7326
Change-Id: Ic605bd334932fd01a12f7a1776259d1900915307
Wale Ogunwale [Sat, 10 Jun 2017 16:07:56 +0000 (16:07 +0000)]
Merge "Added 'dumpsys activity lastanr'" into oc-dev
am:
b32fecd6e0
Change-Id: I599924b33fbb137ba03607308011a8a76b524c72
Wale Ogunwale [Sat, 10 Jun 2017 16:05:53 +0000 (16:05 +0000)]
Merge "Added 'dumpsys activity lastanr'" into oc-dev
am:
b32fecd6e0
Change-Id: Iede7911ea687b7890833ee967da010db6041fb49
Wale Ogunwale [Sat, 10 Jun 2017 15:58:07 +0000 (15:58 +0000)]
Merge "Added 'dumpsys activity lastanr'" into oc-dev
Bill Yi [Sat, 10 Jun 2017 15:28:18 +0000 (15:28 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
70a2b34938 -s ours
am:
e637937af7 -s ours
Change-Id: I8f9d9ffb739e573f2917479b346b2d613e10ed76
Bill Yi [Sat, 10 Jun 2017 15:21:17 +0000 (15:21 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
70a2b34938 -s ours
Change-Id: Ica458f82fe18edb4f2b74b11aded21b66f1096d3
TreeHugger Robot [Sat, 10 Jun 2017 15:16:36 +0000 (15:16 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Rhiannon Malia [Sat, 10 Jun 2017 07:41:59 +0000 (07:41 +0000)]
Merge "Update captive portal notif for Android TV am:
6ab655227a am:
49ffd6bae2" into oc-dr1-dev-plus-aosp
am:
803b04f835
Change-Id: I460f2fa866fd9a88f75ab7ba5796e0b572b9e16e
Rhiannon Malia [Sat, 10 Jun 2017 07:39:47 +0000 (07:39 +0000)]
Update captive portal notif for Android TV am:
6ab655227a am:
949545789b
am:
cb4765f307
Change-Id: I8c4ef4faa9bb72747b50dfdfac3a40ac2482bc82
Android Build Merger (Role) [Sat, 10 Jun 2017 07:36:17 +0000 (07:36 +0000)]
Merge "Update captive portal notif for Android TV am:
6ab655227a am:
49ffd6bae2" into oc-dr1-dev-plus-aosp
Rhiannon Malia [Sat, 10 Jun 2017 07:35:20 +0000 (07:35 +0000)]
Update captive portal notif for Android TV am:
6ab655227a
am:
49ffd6bae2
Change-Id: I288db2f6f74109da750b35406f802e11360babaa
Rhiannon Malia [Sat, 10 Jun 2017 07:32:47 +0000 (07:32 +0000)]
Update captive portal notif for Android TV am:
6ab655227a
am:
949545789b
Change-Id: I258a24b9069f5ded14c3cec53be3039086cbf0ba
Rhiannon Malia [Sat, 10 Jun 2017 07:26:51 +0000 (07:26 +0000)]
Update captive portal notif for Android TV
am:
6ab655227a
Change-Id: I60a67b0f22aa186e8b738b8a9ee002b2b5b04e42
Rhiannon Malia [Sat, 10 Jun 2017 07:26:46 +0000 (07:26 +0000)]
Update captive portal notif for Android TV
am:
6ab655227a
Change-Id: I2096324e76770fee698507c2681d9c2fd92165b9
Bill Yi [Sat, 10 Jun 2017 06:23:55 +0000 (06:23 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
dfe6e518a2 -s ours
am:
6528998efc -s ours
Change-Id: I8f1c84471907d056ba190c9ff489030da11686f2
Bill Yi [Sat, 10 Jun 2017 06:21:36 +0000 (06:21 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
7c8b1e6832 -s ours
am:
8314ad1f25 -s ours
Change-Id: Ic2b7e8ee6338c3ed5bf154a14f048cbb86784c61
Bill Yi [Sat, 10 Jun 2017 06:16:16 +0000 (06:16 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
dfe6e518a2 -s ours
Change-Id: I7fbd39eeaaba27b93ef40201096fcd09bd176700
Bill Yi [Sat, 10 Jun 2017 06:13:36 +0000 (06:13 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
7c8b1e6832 -s ours
Change-Id: I8f92d3f9c8b15070a661cf0480268b7100ca33ec
Bill Yi [Sat, 10 Jun 2017 06:10:35 +0000 (06:10 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
62bee2f5ff -s ours
am:
ad38904231 -s ours
Change-Id: I59488902d845e12d630ede0462d30a9a933e2261
TreeHugger Robot [Sat, 10 Jun 2017 06:06:21 +0000 (06:06 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Sat, 10 Jun 2017 06:05:23 +0000 (06:05 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
62bee2f5ff -s ours
Change-Id: I2c72358b3b45a3321d76d9af147d3f3c0b179846
TreeHugger Robot [Sat, 10 Jun 2017 06:03:05 +0000 (06:03 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Sat, 10 Jun 2017 06:00:04 +0000 (06:00 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Rhiannon Malia [Mon, 5 Jun 2017 22:02:55 +0000 (15:02 -0700)]
Update captive portal notif for Android TV
Test: Connect to captive portal, notification appears in side panel
BUG:
38453402
Change-Id: I39baf90897f2f3d67b8b03c31dd74fa1d39d39de
Winson Chung [Sat, 10 Jun 2017 05:16:37 +0000 (05:16 +0000)]
Merge "Preemptively create Bitmap from GraphicBuffer" into oc-dev am:
a304564081 am:
c596ef26c6
am:
b855ee1528
Change-Id: I712aa1ccf80f25afd6457438bc8583b74f1117b2
Winson Chung [Sat, 10 Jun 2017 05:11:33 +0000 (05:11 +0000)]
Merge "Preemptively create Bitmap from GraphicBuffer" into oc-dev am:
a304564081 am:
489e22503e
am:
051b7ab809
Change-Id: I208e0606c0e35d205630ae2281891ef5a7052911
Winson Chung [Sat, 10 Jun 2017 05:07:05 +0000 (05:07 +0000)]
Merge "Preemptively create Bitmap from GraphicBuffer" into oc-dev am:
a304564081
am:
c596ef26c6
Change-Id: I3e7006c0fc54d7131a2a44c70a8b216bfc646b3c
Winson Chung [Sat, 10 Jun 2017 05:02:02 +0000 (05:02 +0000)]
Merge "Preemptively create Bitmap from GraphicBuffer" into oc-dev am:
a304564081
am:
489e22503e
Change-Id: Ia2448b59ad2e0afd8d265572c81d794055423b8b
Winson Chung [Sat, 10 Jun 2017 04:57:50 +0000 (04:57 +0000)]
Merge "Preemptively create Bitmap from GraphicBuffer" into oc-dev
am:
a304564081
Change-Id: I035b2e3f957334a7ef125256d5a44d2e798e61eb
Winson Chung [Sat, 10 Jun 2017 04:56:09 +0000 (04:56 +0000)]
Merge "Preemptively create Bitmap from GraphicBuffer" into oc-dev
am:
a304564081
Change-Id: I916e692fae56ed79a60d37b471b6e07457d2509d
Winson Chung [Sat, 10 Jun 2017 04:50:09 +0000 (04:50 +0000)]
Merge "Preemptively create Bitmap from GraphicBuffer" into oc-dev
Bill Yi [Sat, 10 Jun 2017 01:14:37 +0000 (18:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9310dd36258cc026421953cbea84b51650c47a35
Auto-generated-cl: translation import
Ben Gruver [Sat, 10 Jun 2017 01:02:28 +0000 (01:02 +0000)]
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
Ben Gruver [Sat, 10 Jun 2017 00:58:56 +0000 (00:58 +0000)]
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
Bill Yi [Sat, 10 Jun 2017 00:56:14 +0000 (17:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1b6c615bb62abbb74f14adb70b5e29d96d3aeaad
Auto-generated-cl: translation import
Android Build Merger (Role) [Sat, 10 Jun 2017 00:55:03 +0000 (00:55 +0000)]
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
Ben Gruver [Sat, 10 Jun 2017 00:52:24 +0000 (00:52 +0000)]
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
Ben Gruver [Sat, 10 Jun 2017 00:52:22 +0000 (00:52 +0000)]
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
Ben Gruver [Sat, 10 Jun 2017 00:45:04 +0000 (00:45 +0000)]
Merge "Don't reset the value of package_verifier_enable if not in demo mode" into oc-dev
am:
ffd8343ba8
Change-Id: Ia3b7fe1bad2f3c2d13ce58f97174511ed8434e0b
Ben Gruver [Sat, 10 Jun 2017 00:45:02 +0000 (00:45 +0000)]
Merge "Don't reset the value of package_verifier_enable if not in demo mode" into oc-dev
am:
ffd8343ba8
Change-Id: I5ac1fce3ab71415061ba152d9e34c96f9a53e1c9
Bill Yi [Sat, 10 Jun 2017 00:44:49 +0000 (17:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8a17e54b671202d6e1393410e2c9cc90552e3c32
Auto-generated-cl: translation import
OSDN Git Service
