OSDN Git Service
Tyler Gunn [Tue, 13 Jun 2017 20:48:12 +0000 (20:48 +0000)]
Merge "Add EXTRA_HANDOVER_FROM_PHONE_ACCOUNT." into oc-dr1-dev
TreeHugger Robot [Tue, 13 Jun 2017 19:17:37 +0000 (19:17 +0000)]
Merge "AOD: Use double tap coordinates to trigger Ambient Indication" into oc-dr1-dev
Bryce Lee [Tue, 13 Jun 2017 18:56:52 +0000 (18:56 +0000)]
Merge "Address issues surrounding freezing by display." into oc-dev
am:
8ab4d11145
Change-Id: I5eec6ff604056b7095ac07afd9721a5223a584d8
Bryce Lee [Tue, 13 Jun 2017 18:50:57 +0000 (18:50 +0000)]
Merge "Address issues surrounding freezing by display." into oc-dev
Tyler Gunn [Fri, 26 May 2017 20:30:09 +0000 (13:30 -0700)]
Add EXTRA_HANDOVER_FROM_PHONE_ACCOUNT.
Used in handovers to tell the account we're handing over to which account
the call is from.
Test: Manual
Bug:
38027075
Change-Id: I9b61a5fce3e4f7344174a1b81f4964ca02b71ccd
Adrian Roos [Fri, 2 Jun 2017 19:50:38 +0000 (12:50 -0700)]
AOD: Use double tap coordinates to trigger Ambient Indication
Bug:
38386446
Test: Double tap on AOD, verify that it still works. On device that supports double tap coordinates, verify that double tapping on ambient music opens ambient music.
Change-Id: Ic75ba731a980c9598c85927e83d2032f01da4822
(cherry picked from commit
44198f5124743f0d603eb4efa3b436bd96f32144)
Bryce Lee [Mon, 12 Jun 2017 21:12:29 +0000 (14:12 -0700)]
Address issues surrounding freezing by display.
The first issue is the animating a display as a consequence of the
freezing due to configuration change during construction. This
additional animation is not expected and interferes with tests
expecting for the original display contents to be shown intact. This
CL addresses the issue by not freezing while the display is not ready
(before construction is finished).
The second problem addressed is book-keeping for
DisplayContentsAnimators in WindowAnimator. Currently, a getter
method is used internally to reference these animators, which
generates them if not present and adds them to the animation
iteration. In the case we set an animation on a display that no
longer exists (which can be the case after unfreezing), we end up
recreating this object. This can lead to us trying to animate a
non-existent DisplayContent. This CL prevents creating an animator
for a non-existent display and adjusts the methods using this getter
to handle this case.
Fixes:
62460846
Fixes:
62461229
Bug:
35486733
Bug:
62541591
Test: go/wm-smoke
Test: open and close projected android auto mode repeatedly and
ensure display correctness
Test: cts-tradefed run singleCommand cts-dev --module CtsMediaTestCases --test android.media.cts.EncodeVirtualDisplayTest#testEncodeVirtualDisplay
Change-Id: I60ade6f97440c8fa01b10e36c019865cf1fd0730
Narayan Kamath [Tue, 13 Jun 2017 10:40:46 +0000 (10:40 +0000)]
Merge "Eagerly serialize historical sessions" into oc-dev
am:
c7ea7effde
Change-Id: Iff55674bc989986e14d0bcea3c71bad5751d4dcb
Narayan Kamath [Tue, 13 Jun 2017 10:32:22 +0000 (10:32 +0000)]
Merge "Eagerly serialize historical sessions" into oc-dev
Narayan Kamath [Mon, 12 Jun 2017 12:34:29 +0000 (13:34 +0100)]
Eagerly serialize historical sessions
mHistoricalSessions maintained a strong reference to a PackageInstallerSession,
which in turn kept references to Bitmaps and other heavy-weight objects around.
Since this field is primarily used for debugging, this change replaces it with
a String dump of the session in question. Each dump takes about 600bytes, which
is comparable to the sizes of the un-serialized raw objects.
Bug:
62485552
Test: Manual
Change-Id: I4949a64b538ab4a97384f4f8bc9a6ef155a4b128
Adam Vartanian [Tue, 13 Jun 2017 08:13:28 +0000 (08:13 +0000)]
Merge "DO NOT MERGE Remove createSocket(Socket, InputStream, boolean) from APIs." into oc-dr1-dev
Android Build Merger (Role) [Tue, 13 Jun 2017 02:32:13 +0000 (02:32 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
7fc501184a -s ours" into oc-dr1-dev
TreeHugger Robot [Tue, 13 Jun 2017 02:31:23 +0000 (02:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Tue, 13 Jun 2017 02:30:19 +0000 (02:30 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
7fc501184a -s ours
Change-Id: I418c08d5f5bf997d7e870bafc2a0b68f519dd990
TreeHugger Robot [Tue, 13 Jun 2017 02:20:34 +0000 (02:20 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Tue, 13 Jun 2017 02:18:42 +0000 (02:18 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Winson Chung [Tue, 13 Jun 2017 01:41:18 +0000 (01:41 +0000)]
Merge "Minimal change to ensure events are propagated to the right DividerView." into oc-dev
am:
b1cdc17dfb
Change-Id: I987d923b923e289baa76d5155cf6a7fe4d9ece6a
TreeHugger Robot [Tue, 13 Jun 2017 01:34:43 +0000 (01:34 +0000)]
Merge "[ErrorProne] Fix Error Prone warnings in aware/p2p code" into oc-dr1-dev
TreeHugger Robot [Tue, 13 Jun 2017 01:18:45 +0000 (01:18 +0000)]
Merge "Minimal change to ensure events are propagated to the right DividerView." into oc-dev
Marie Janssen [Tue, 13 Jun 2017 01:04:55 +0000 (01:04 +0000)]
Merge "Protect broadcast used in settings for bond cancel" into oc-dev
am:
68a4c91bb4
Change-Id: Ifdb4b625f21dcda5248071263aaf6936158efb39
Wale Ogunwale [Tue, 13 Jun 2017 01:01:51 +0000 (01:01 +0000)]
Merge "Ensure that we use SF Vsync Choreographer for the PiP transition." into oc-dev
am:
e1e0db8ca9
Change-Id: I2d854e36c31a8fa1cf74e5c5a536969ee94dc79b
Tianjie Xu [Tue, 13 Jun 2017 00:58:53 +0000 (00:58 +0000)]
Merge "Fix the issue that uncrypt isn't called under quiescent mode" into oc-dev
am:
f40f297546
Change-Id: Id60cf7cf4b82f17fd094fa011bb54a543e636f48
Robert Carr [Tue, 13 Jun 2017 00:54:10 +0000 (00:54 +0000)]
Merge "SurfaceView: Fix missing override for SurfaceControl proxy" into oc-dev
am:
42b3610adc
Change-Id: I3238399a26917f80bd4e33bb20142f62076e6f4f
TreeHugger Robot [Tue, 13 Jun 2017 00:45:40 +0000 (00:45 +0000)]
Merge "Protect broadcast used in settings for bond cancel" into oc-dev
Jorim Jaggi [Tue, 13 Jun 2017 00:41:40 +0000 (00:41 +0000)]
Merge "Attempted fix for navigation bar flicker" into oc-dev
am:
bbd7dfc0a4
Change-Id: I80a618eb59f0479060a69ca4f0be8ac883a8d48d
Jeff Sharkey [Tue, 13 Jun 2017 00:36:09 +0000 (00:36 +0000)]
Merge "Improve developer docs for storage APIs." into oc-dev
am:
05b52d8ba5
Change-Id: I282786d353e3dc406c7123daa00d3e7fe43de7bc
Todd Kennedy [Tue, 13 Jun 2017 00:33:51 +0000 (00:33 +0000)]
Merge "Don't log all instant app resolutions" into oc-dev
am:
3ef0b8260f
Change-Id: I4ef141816c67957b0302be814315e2e739406c31
Vladislav Kaznacheev [Tue, 13 Jun 2017 00:31:02 +0000 (00:31 +0000)]
Merge changes from topic 'sysui-tooltip' into oc-dev
am:
3fbcec5b86
Change-Id: I7affdad6abfb283c0eec6718797f7d8580ea507b
Bill Yi [Tue, 13 Jun 2017 00:27:05 +0000 (00:27 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
7c2a12b658 -s ours
Change-Id: I5f257f746717037d275e025c80581d1f4cccc67d
Will Brazil [Tue, 13 Jun 2017 00:24:40 +0000 (00:24 +0000)]
Merge "Camera2: Cache method list in MethodNameInvoker." into oc-dev
am:
71029bf631
Change-Id: I99c6322d7e06262861eb0bb8be4ce8d4572ffbae
Jorim Jaggi [Tue, 13 Jun 2017 00:21:21 +0000 (00:21 +0000)]
Merge "resolve merge conflicts of
8f1d13300f73 to oc-dr1-dev" into oc-dr1-dev
Bill Yi [Tue, 13 Jun 2017 00:10:34 +0000 (17:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia5c4fec39dd96d826c34c06ea398e05fb53e3328
Auto-generated-cl: translation import
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
Bill Yi [Tue, 13 Jun 2017 00:05:16 +0000 (17:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: If1852e89c1a3732b3f85c47bfa108ee3f4d5fac7
Auto-generated-cl: translation import
Wale Ogunwale [Mon, 12 Jun 2017 23:51:13 +0000 (23:51 +0000)]
Merge "Ensure that we use SF Vsync Choreographer for the PiP transition." into oc-dev
TreeHugger Robot [Mon, 12 Jun 2017 23:41:57 +0000 (23:41 +0000)]
Merge "Fix the issue that uncrypt isn't called under quiescent mode" into oc-dev
TreeHugger Robot [Mon, 12 Jun 2017 23:38:14 +0000 (23:38 +0000)]
Merge "SurfaceView: Fix missing override for SurfaceControl proxy" into oc-dev
Winson Chung [Mon, 12 Jun 2017 22:30:14 +0000 (15:30 -0700)]
Minimal change to ensure events are propagated to the right DividerView.
- The RecentsDrawnEvent sent when Recents is first drawn can be racey, if
it is sent before the configuration change in Divider is dispatched, then
it will be posted for the old DividerView, which prior to ag/
2363241 was
still sending the correct resize calls (the animation is independent of
the view). For now, we register the event handler in Divider, and
instead proxy it to the current view when it is posted.
Bug:
62528361
Test: go/wm-smoke
Test: Play a movie in Play Movies, ensure the activity is resized
Change-Id: I665b0c6af55dea0db1916f5b041589bf72da3baf
TreeHugger Robot [Mon, 12 Jun 2017 23:01:15 +0000 (23:01 +0000)]
Merge "Attempted fix for navigation bar flicker" into oc-dev
Marie Janssen [Fri, 9 Jun 2017 23:38:19 +0000 (16:38 -0700)]
Protect broadcast used in settings for bond cancel
Test: cancel pairing from notification tray
Bug:
62094630
Change-Id: Ia83a874c1ea9a1d9d5502609f81e94052bb5759c
(cherry picked from commit
977992f3fc9f4f6bb2d1f9536143327a6021c5d1)
Jeff Sharkey [Mon, 12 Jun 2017 22:39:20 +0000 (22:39 +0000)]
Merge "Improve developer docs for storage APIs." into oc-dev
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
TreeHugger Robot [Mon, 12 Jun 2017 21:51:27 +0000 (21:51 +0000)]
Merge "Don't log all instant app resolutions" into oc-dev
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"
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
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:45:50 +0000 (13:45 -0700)]
resolve merge conflicts of
8f1d13300f73 to oc-dr1-dev
Change-Id: I1a30ba6663041e1ce0a2d347671deb83b1d9d7ff
TreeHugger Robot [Mon, 12 Jun 2017 20:45:37 +0000 (20:45 +0000)]
Merge "Camera2: Cache method list in MethodNameInvoker." into oc-dev
Bill Yi [Mon, 12 Jun 2017 20:41:44 +0000 (13:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id82e6755421022e36bcb3107d71d2628162ccc9d
Auto-generated-cl: translation import
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
Jeff Sharkey [Mon, 12 Jun 2017 20:17:10 +0000 (14:17 -0600)]
Improve developer docs for storage APIs.
No code changes; only docs.
Test: builds
Bug:
38508833,
37987197,
37978296
Change-Id: Idfeb680480b2f818d18f787cbf20ceab896763a2
Amit Pawar [Mon, 12 Jun 2017 20:00:51 +0000 (20:00 +0000)]
Merge "Fix wake-and-unlock animation" into oc-dev
Jorim Jaggi [Mon, 12 Jun 2017 19:18:41 +0000 (12:18 -0700)]
Attempted fix for navigation bar flicker
Not 100% sure why it was flickering, but I do know that the
flicker started happening after putting this into a separate
thread, and that with that change it doesn't flicker anymore,
ever.
Adds 0.5ms while unlocking but at this point this is a good trade-
off to make.
Test: Unlock device with FP
Change-Id: I736a3c64d9b63df9d6cdcb7855bde13a19560a83
Fixes:
62380221
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
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
Robert Carr [Mon, 12 Jun 2017 18:43:51 +0000 (11:43 -0700)]
SurfaceView: Fix missing override for SurfaceControl proxy
I will not pretend classes are interfaces...I will not pretend
classes are interfaces...
Bug:
62444724
Test: cts-tradefed run singleCommand cts -d -o --module CtsViewTestCases --test android.view.cts.SurfaceViewSyncTest#testSurfaceViewBigScale
go/wm-smoke
Change-Id: Iccca46edcd669430c32f31e9c7d8aba1db254f2d
Etan Cohen [Mon, 12 Jun 2017 18:18:10 +0000 (11:18 -0700)]
[ErrorProne] Fix Error Prone warnings in aware/p2p code
Bug:
33104624
Test: builds
Change-Id: Ibf17a02c81aebfa28903fe440a75e3c2e9244a19
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
Tianjie Xu [Fri, 9 Jun 2017 22:50:14 +0000 (15:50 -0700)]
Fix the issue that uncrypt isn't called under quiescent mode
OTA fails on fugu under quiescent mode because the reboot reason changes
from "recovery-update" to "recovery-update,quiescent". The new reason
isn't checked in shutdown thread so that shutdown thread doesn't call
uncrypt properly before rebooting into recovery.
Bug:
62324707
Test: Recreated and fixed the "block.map" missing failure on fugu.
Change-Id: I110653cd64dbbdc71e89ead2197bf023a7c054e8
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
Winson Chung [Tue, 16 May 2017 20:35:43 +0000 (13:35 -0700)]
Ensure that we use SF Vsync Choreographer for the PiP transition.
- Move the bounds animation onto the animation thread
- Remove existing code referencing the old sf-vsync choreographer
- Add ability for ValueAnimator subclasses to reference a different
AnimationHandler, which uses a different FrameCallbackProvider with the
sf-vsync choreographer in the animations that require it
- Ensure that PiP touch events are batched and sent aligned with the
sf-vsync
- Move GC onto its own thread to not block other BackgroundThread calls
Bug:
36371375
Test: android.server.cts.ActivityManagerPinnedStackTests
Test: bit FrameworksServicesTests:com.android.server.wm.BoundsAnimationControllerTests
Test: go/wm-smoke
Change-Id: I6a41b35a4e4d4d6dbea82c2673452825fe3ffa58
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:47:19 +0000 (16:47 +0000)]
Merge "Work on issue #
62390590: SecurityException in JobIntentService$..." into oc-dev
am:
4eb76b2db8
Change-Id: I3aa5bbccbc669499a8ab6b12f180a7f5841164c3
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: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 15:54:24 +0000 (15:54 +0000)]
Merge "Prevent ConcurrentModificationException in updateAllRecognitions" into oc-dev
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:29:31 +0000 (12:29 +0000)]
Change the multipath hint default to 0.
am:
d1e7d3d73e
Change-Id: Iab590e33a1ae64701f0023970d53b23470533962
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
TreeHugger Robot [Mon, 12 Jun 2017 05:06:35 +0000 (05:06 +0000)]
Merge "Add additional mocking for Context innards" into oc-dr1-dev
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 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
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
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:26:51 +0000 (07:26 +0000)]
Update captive portal notif for Android TV
am:
6ab655227a
Change-Id: I60a67b0f22aa186e8b738b8a9ee002b2b5b04e42
TreeHugger Robot [Sat, 10 Jun 2017 06:06:21 +0000 (06:06 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
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 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
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