OSDN Git Service
Todd Kennedy [Tue, 13 Jun 2017 00:33:45 +0000 (00:33 +0000)]
Merge "Don't log all instant app resolutions" into oc-dev am:
3ef0b8260f
am:
5ca9d413f8
Change-Id: I10e7c59edb955ba537a12bd52f7117b382d46d7f
Vladislav Kaznacheev [Tue, 13 Jun 2017 00:32:20 +0000 (00:32 +0000)]
Merge changes from topic 'sysui-tooltip' into oc-dev am:
3fbcec5b86
am:
7e21054200
Change-Id: Icfe6bb79c13c6e0ef925f30933f7831978a2886c
Bill Yi [Tue, 13 Jun 2017 00:29:07 +0000 (00:29 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
7c2a12b658 -s ours
am:
e887d21330 -s ours
Change-Id: Ie236dae37b227cf65c837e0efea1ea1f9e9aa9b3
Will Brazil [Tue, 13 Jun 2017 00:26:49 +0000 (00:26 +0000)]
Merge "Camera2: Cache method list in MethodNameInvoker." into oc-dev am:
71029bf631
am:
5884f6ce0d
Change-Id: I725739aed3207992022aa500bb99072410a9a305
Jorim Jaggi [Tue, 13 Jun 2017 00:20:35 +0000 (00:20 +0000)]
Merge "resolve merge conflicts of
963fed0345c5 to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp
Jeff Sharkey [Tue, 13 Jun 2017 00:14:55 +0000 (00:14 +0000)]
Merge "Active camera apps can defy reserved cache space." into oc-dr1-dev
am:
f7dc56ecc9
Change-Id: Ic66cdb0548cf8c973214364843cf147ac5d231be
Jeff Sharkey [Tue, 13 Jun 2017 00:09:45 +0000 (00:09 +0000)]
Merge "Active camera apps can defy reserved cache space." into oc-dr1-dev
Tyler Gunn [Mon, 12 Jun 2017 22:46:58 +0000 (22:46 +0000)]
Merge changes from topic 'ims-handover-api' into oc-dr1-dev
am:
e15da2649b
Change-Id: I98a44fe768bdffaaaca742b1c9e8e10f42c73a90
Tyler Gunn [Mon, 12 Jun 2017 22:35:38 +0000 (22:35 +0000)]
Merge changes from topic 'ims-handover-api' into oc-dr1-dev
* changes:
Add callSessionMayHandover API to ImsCallSession.
IMS: Support for Possible Call Session Handover
Jeff Sharkey [Mon, 12 Jun 2017 22:00:09 +0000 (22:00 +0000)]
Merge "Hide APIs not intended to ship in DR." into oc-dr1-dev
am:
3d4c62de10
Change-Id: Iea3267aeea3c9633876cc055e45d095e0c5f1306
Mady Mellor [Mon, 12 Jun 2017 21:57:17 +0000 (21:57 +0000)]
Merge "Updates to NotificationMenuRowPlugin so that long press may be captured" into oc-dr1-dev
am:
f3f6ddf7cb
Change-Id: I0147acff32fb79096617dff8080fab677d6c805e
Todd Kennedy [Mon, 12 Jun 2017 21:57:15 +0000 (21:57 +0000)]
Merge "Don't log all instant app resolutions" into oc-dev
am:
3ef0b8260f
Change-Id: Ibcc839c12fd0c23da254992a7147abb1e08d17cc
TreeHugger Robot [Mon, 12 Jun 2017 21:51:27 +0000 (21:51 +0000)]
Merge "Don't log all instant app resolutions" into oc-dev
Vladislav Kaznacheev [Mon, 12 Jun 2017 21:51:10 +0000 (21:51 +0000)]
Merge changes from topic 'sysui-tooltip' into oc-dev
am:
3fbcec5b86
Change-Id: I9ff9e36b3fa7c0e3c0bd4cd2048f9d0ce510399c
Jeff Sharkey [Mon, 12 Jun 2017 21:50:33 +0000 (21:50 +0000)]
Merge "Hide APIs not intended to ship in DR." into oc-dr1-dev
Mady Mellor [Mon, 12 Jun 2017 21:48:38 +0000 (21:48 +0000)]
Merge "Updates to NotificationMenuRowPlugin so that long press may be captured" into oc-dr1-dev
TreeHugger Robot [Mon, 12 Jun 2017 21:42:50 +0000 (21:42 +0000)]
Merge changes from topic 'sysui-tooltip' into oc-dev
* changes:
Pass window token when creating a tooltip popup
Revert "Use a PopupWindow to show tooltips"
Bill Yi [Mon, 12 Jun 2017 21:32:23 +0000 (21:32 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
66c8f60eb7 -s ours
Change-Id: I16ea34198d95d7da16a3a07cf0da1aa9b2b3304e
Bill Yi [Mon, 12 Jun 2017 21:30:08 +0000 (21:30 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
fe84caad61 -s ours
Change-Id: Ia5bf5f5b4f2534adf8ea60557494263f1eaef51b
TreeHugger Robot [Mon, 12 Jun 2017 21:24:43 +0000 (21:24 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Mon, 12 Jun 2017 21:24:10 +0000 (21:24 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Mon, 12 Jun 2017 21:21:12 +0000 (21:21 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
7c2a12b658 -s ours
Change-Id: I4170e095966f1d8752e2b020777b5719a779b376
TreeHugger Robot [Mon, 12 Jun 2017 21:15:29 +0000 (21:15 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Jorim Jaggi [Mon, 12 Jun 2017 20:52:31 +0000 (13:52 -0700)]
resolve merge conflicts of
963fed0345c5 to oc-dr1-dev-plus-aosp
Change-Id: Ife92b10f60b68cb5cfc970a52a248692c6342e17
Will Brazil [Mon, 12 Jun 2017 20:49:49 +0000 (20:49 +0000)]
Merge "Camera2: Cache method list in MethodNameInvoker." into oc-dev
am:
71029bf631
Change-Id: I24120e653feef23b155111cbc69f6b3033b2427c
TreeHugger Robot [Mon, 12 Jun 2017 20:45:37 +0000 (20:45 +0000)]
Merge "Camera2: Cache method list in MethodNameInvoker." into oc-dev
Jeff Sharkey [Fri, 9 Jun 2017 16:01:20 +0000 (10:01 -0600)]
Active camera apps can defy reserved cache space.
We normally prevent apps from allocating into the "reserved" cache
space, but this change makes an exception for an active camera app,
since the user is probably trying to capture an important memory.
This change only lets the active camera app clear up to half of the
reserved space, since we don't want to completely destroy the
experience of all other apps.
Test: manual app before/during/after active camera session
Bug:
38267830
Change-Id: Ie9e63884fb2638ca881e10b894629eea84601648
Amit Pawar [Mon, 12 Jun 2017 20:09:07 +0000 (20:09 +0000)]
Merge "Fix wake-and-unlock animation" into oc-dev
am:
8f1d13300f
Change-Id: Ib0876be70423fa3218ffb3172f3a177c45f98681
Amit Pawar [Mon, 12 Jun 2017 20:00:51 +0000 (20:00 +0000)]
Merge "Fix wake-and-unlock animation" into oc-dev
Android Build Merger (Role) [Mon, 12 Jun 2017 19:15:57 +0000 (19:15 +0000)]
Merge "Merge "Removed deprecated setExtras() method." into oc-dev am:
7c41ddb975 am:
2f8647c4d1" into oc-dr1-dev-plus-aosp
Felipe Leme [Mon, 12 Jun 2017 19:13:42 +0000 (19:13 +0000)]
Merge "Removed deprecated setExtras() method." into oc-dev am:
7c41ddb975
am:
2f8647c4d1
Change-Id: Ice204340ffe9c2eba6fde4ccb133a9a96510cd25
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
Vladislav Kaznacheev [Mon, 12 Jun 2017 19:10:49 +0000 (12:10 -0700)]
Pass window token when creating a tooltip popup
This allows using tooltips in System UI.
Bug:
62065980
Test: android.view.cts.TooltipTest passes
Change-Id: If0a76d0806aa92efa4be57204c4517242b0ebb99
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
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: I5453d54e45385a03bae56a4742bcd680aff47356
Will Brazil [Fri, 9 Jun 2017 19:22:53 +0000 (12:22 -0700)]
Camera2: Cache method list in MethodNameInvoker.
Retrieving list of methods in every invoke() call is very expensive.
Caching the list inside the constructor prevents several unnecessary
calls to Class.getMethods().
Test: Run camera2 CTS
Bug:
62490715
Change-Id: Ib2a93af0f364b055df2eab9bd7870730428429ad
Vladislav Kaznacheev [Mon, 12 Jun 2017 18:59:29 +0000 (18:59 +0000)]
Revert "Use a PopupWindow to show tooltips"
This reverts commit
77e539775b52da55a8b23f1a9765d471ee782013.
Change-Id: Ic4054e0d507ce95ab93282d4da002dd804aeb26d
TreeHugger Robot [Mon, 12 Jun 2017 18:58:01 +0000 (18:58 +0000)]
Merge "Removed deprecated setExtras() method." into oc-dev
Bill Yi [Mon, 12 Jun 2017 18:47:44 +0000 (11:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: If7f8b590d878dfbd97565b52d6353682221a2b39
Auto-generated-cl: translation import
Jorim Jaggi [Sat, 10 Jun 2017 01:00:00 +0000 (18:00 -0700)]
Fix wake-and-unlock animation
Since okToDisplay was false when we started the keyguard exit
animation, no animation was applied and we didn't create a
starting window, which lead to flickering. We fix this by
allowing animations from mScreenOnEarly.
Furthermore, we synchronize the navigation bar better with the
rest of the animation.
We also need to apply no animation to the status bar window as
we go through performShowLocked because we were waiting for it
to draw.
Test: go/wm-smoke
Test: Wake-and-unlock
Test: Make sure no other regression with screen on experience
Change-Id: I5f264b74cc258e8d7f608978edfb1faa5ead385c
Fixes:
38441599
Bill Yi [Mon, 12 Jun 2017 18:17:27 +0000 (11:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3fc0aef0174fec3bbe3e215a75dd4169d319b81c
Auto-generated-cl: translation import
Mady Mellor [Tue, 6 Jun 2017 18:42:50 +0000 (11:42 -0700)]
Updates to NotificationMenuRowPlugin so that long press may be captured
This will allow the NotificationMenuRow plugin to do something else
rather than showing a menu when the view is long pressed.
- Allow menu to intercept touch events
- If the menu item provided to long press is null, don’t show it
- Also passes the status bar notification when the menu is created
or updated
Bug:
62534409
Test: manual, have no plugin and long press -> see notification info
have a plugin that returns null for long press -> nothing happens
Change-Id: I384c5217d5343e990f4c3506eb2477b015705e5c
Bill Yi [Mon, 12 Jun 2017 17:47:09 +0000 (10:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1c7d49d4ee0b5b45cf1f7bdbf6da707921ccfde4
Auto-generated-cl: translation import
Todd Kennedy [Mon, 12 Jun 2017 17:33:32 +0000 (10:33 -0700)]
Don't log all instant app resolutions
we only want to log the successes
Change-Id: I31c79a1c964088ee67fd7527ca7fea16b0d29830
Fixes:
36563095
Test: Manual; run and see that only the success events are in the eventlog
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
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
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
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: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
Jeff Sharkey [Fri, 9 Jun 2017 17:37:02 +0000 (11:37 -0600)]
Hide APIs not intended to ship in DR.
This CL will be reverted once it merges into the next release branch
to re-introduce the proposed APIs.
This CL also makes the following code changes to preserve API
compatibility:
-- It keeps the recently added RemoteViews.clone() synchronized logic
intact, but moves it inside the method to avoid changing the API
signature.
-- It reverts the RttCall.read() behavior to the oc-dev logic, since
we can't throw IOException until we get an API level bump. (The
original logic returned null instead of throwing.)
Test: builds, boots
Bug:
62427252,
62431886,
62427329
Bug:
62468911,
62431162,
62428935,
62429096
Bug:
37290820,
37359238,
36886243
Bug:
30143923,
35761231,
62192626,
29829689
Change-Id: I83d723f598cb0ee1fe198e65debd86ef7fd0420c
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
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
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:13:17 +0000 (05:13 +0000)]
Merge "Add additional mocking for Context innards" into oc-dr1-dev
am:
cdb134c012 -s ours
Change-Id: I6715134fe1883dc2d4613b38478d60f0ad2c33fe
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
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
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: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
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: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
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: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
OSDN Git Service
