OSDN Git Service
Selim Cinek [Wed, 21 Jun 2017 19:08:44 +0000 (19:08 +0000)]
Merge "Fixed a bug where the panel could be stuck" into oc-dev
am:
e8dceabd98
Change-Id: I717e03ac52383494403aaaf886e970d86bb3f3e2
Selim Cinek [Wed, 21 Jun 2017 19:00:10 +0000 (19:00 +0000)]
Merge "Fixed a a11y regression to click notifications" into oc-dev
am:
b792f98446
Change-Id: Idebc4fa9cb0b2512043b0aa817a96926ec0a0d2a
TreeHugger Robot [Wed, 21 Jun 2017 18:57:42 +0000 (18:57 +0000)]
Merge "Fixed a bug where the panel could be stuck" into oc-dev
Selim Cinek [Wed, 21 Jun 2017 18:48:53 +0000 (18:48 +0000)]
Merge "Fixed a a11y regression to click notifications" into oc-dev
TreeHugger Robot [Wed, 21 Jun 2017 18:31:28 +0000 (18:31 +0000)]
Merge "Add customs accessibility actions to snooze, allow it to be focused" into oc-dr1-dev
TreeHugger Robot [Wed, 21 Jun 2017 18:26:53 +0000 (18:26 +0000)]
Merge "Make the log message in setInteractive a local variable." into oc-dr1-dev
TreeHugger Robot [Wed, 21 Jun 2017 17:30:59 +0000 (17:30 +0000)]
Merge "Support native shared libs" into oc-dr1-dev
Jean-Michel Trivi [Wed, 21 Jun 2017 17:23:30 +0000 (17:23 +0000)]
Merge "DnD: Total silence doesn't suppress A11y" into oc-dev
am:
9f1494368b
Change-Id: Ic213b2675ee5571449c74b19184da7cb91331c01
Jean-Michel Trivi [Wed, 21 Jun 2017 17:15:31 +0000 (17:15 +0000)]
Merge "DnD: Total silence doesn't suppress A11y" into oc-dev
Selim Cinek [Wed, 21 Jun 2017 16:44:52 +0000 (09:44 -0700)]
Fixed a bug where the panel could be stuck
Test: collapse the panels, let go, tap quickly, panel isn't stuck
Bug:
62602000
Change-Id: I449bcd4a6207c054eb5d536ba48ff8f05e26eb9a
Selim Cinek [Wed, 21 Jun 2017 16:01:26 +0000 (09:01 -0700)]
Fixed a a11y regression to click notifications
Test: add notification, try clicking it on the lockscreen with talkback
Change-Id: I27dd75cab6bfdff3f534c31ebfb4df7a43129a6d
Fixes:
62767220
Svetoslav Ganov [Wed, 21 Jun 2017 02:35:51 +0000 (19:35 -0700)]
Support native shared libs
resolve merge conflict for
ac9b6706b
Add the shared libs that are APKs to the native library
path when creating application class loaders. Also don't
allow shared libraries hosting native libs to request
extraction of the native libs out of the APK. Lastly,
shared libraries hosting native libs must be declared
as multi-architecture.
Test: CTS tests in this topic
bug:
62720360
Change-Id: Ie3f203db12a3f3826e114c219a8341d9acab604f
Michael Wright [Tue, 20 Jun 2017 20:21:27 +0000 (21:21 +0100)]
Make the log message in setInteractive a local variable.
If the error message isn't a local variable, it will go out of scope
immediately after LogIfSlow is constructed. Unfortunately, LogIfSlow
maintains a pointer to String8s internal char* member... which causes a
use after free when it goes to log. Oops.
Bug:
62820330
Test: none
Change-Id: Ie1da3be723f8aae165822002ff42954480a43aa5
TreeHugger Robot [Wed, 21 Jun 2017 13:22:54 +0000 (13:22 +0000)]
Merge "Always allow Ethernet to be an upstream" into oc-dr1-dev
Chad Brubaker [Wed, 21 Jun 2017 08:19:25 +0000 (08:19 +0000)]
Merge "Allow Instant Apps to call getPermissionControllerPackageName" into oc-dev
am:
88f98985d5
Change-Id: Ifd33084351941d2fe58f6534014940a18d57528f
TreeHugger Robot [Wed, 21 Jun 2017 08:14:06 +0000 (08:14 +0000)]
Merge "Allow Instant Apps to call getPermissionControllerPackageName" into oc-dev
Erik Kline [Thu, 9 Mar 2017 02:44:11 +0000 (11:44 +0900)]
Always allow Ethernet to be an upstream
If there are any upstream types defined at all, make sure that
either TYPE_ETHERNET is included somewhere within the sorted list
or force it to be at the front.
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
32163131
Bug:
36076442
Merged-In: I97737f4c12285f0bbeed0bd2efdfec6fbe95fd03
Merged-In: Id60706e623febcc35063ccb96c797fc4f9a223b1
Merged-In: I97cc3c5ad7dcd4359c28e6aa817856a226a4f8cc
Change-Id: Ie61d1358f73d518de23f6ca48ca2765ca14a1067
(cherry picked from commit
0e61baa0ac83e580429217f8394e1790d6510158)
Chad Brubaker [Wed, 21 Jun 2017 06:13:21 +0000 (23:13 -0700)]
Allow Instant Apps to call getPermissionControllerPackageName
This is needed for requesting permissions to work.
Bug:
62791664
Test: Requesting a runtime permission doesn't crash the app
Change-Id: If18ac8e4c903f3804ec24df39d169fa9145f449e
TreeHugger Robot [Wed, 21 Jun 2017 04:21:29 +0000 (04:21 +0000)]
Merge "Camera: remove capture session lock" into oc-dr1-dev
Felipe Leme [Wed, 21 Jun 2017 04:02:27 +0000 (04:02 +0000)]
Merge changes from topics 'bug_62802026_take_2', 'bug_62802026' into oc-dev
am:
4f7fd183eb
Change-Id: Ibd7aebe46d1bb419ca33f8f38999fa9ab0d981ff
Felipe Leme [Wed, 21 Jun 2017 04:00:27 +0000 (04:00 +0000)]
Fixed how FillEventHistory is reset and clarified javadoc.
am:
2e30c6f371
Change-Id: I55eb6f4a11e28ef2a8171c62848eb2b067f05ba1
TreeHugger Robot [Wed, 21 Jun 2017 03:45:42 +0000 (03:45 +0000)]
Merge changes from topics 'bug_62802026_take_2', 'bug_62802026' into oc-dev
* changes:
Don't add FillEventHistory events to the wrong session.
Fixed how FillEventHistory is reset and clarified javadoc.
TreeHugger Robot [Wed, 21 Jun 2017 03:16:31 +0000 (03:16 +0000)]
Merge "Add metric for bluetooth pairing page" into oc-dr1-dev
TreeHugger Robot [Wed, 21 Jun 2017 02:52:00 +0000 (02:52 +0000)]
Merge "Add action for launching Assist Gesture settings" into oc-dr1-dev
Dianne Hackborn [Wed, 21 Jun 2017 02:42:23 +0000 (02:42 +0000)]
Merge "Small doc fix." into oc-dev
am:
0f98ddaa01
Change-Id: Iac5b780a9894ce3a5433d1c434286e01313e7f99
Rob Carr [Wed, 21 Jun 2017 02:38:55 +0000 (02:38 +0000)]
Merge "SurfaceView: Fix positioning issue when toggling visibility." into oc-dev
am:
70f1565b55
Change-Id: I88d205835ce91ea21d77a15649aad2d3b9c187d7
Svetoslav Ganov [Wed, 21 Jun 2017 02:32:45 +0000 (02:32 +0000)]
Merge "[DO NOT MERGE] Support native shared libs" into oc-dev
am:
324c41ba89 -s ours
Change-Id: I5f6d29e1e6d2710fe5b119d8fd1a470fbdf0d8cd
TreeHugger Robot [Wed, 21 Jun 2017 01:58:56 +0000 (01:58 +0000)]
Merge "Small doc fix." into oc-dev
Yin-Chia Yeh [Mon, 19 Jun 2017 21:17:29 +0000 (14:17 -0700)]
Camera: remove capture session lock
Use CameraDeviceImpl#mInterfaceLock for all device/session locking
Test: CTS/stress testing camera open/close
Bug:
62767980
Change-Id: I4e57e9e1d4548c3f9ae85799b742bebed9a0e451
Rob Carr [Wed, 21 Jun 2017 01:47:51 +0000 (01:47 +0000)]
Merge "SurfaceView: Fix positioning issue when toggling visibility." into oc-dev
Svetoslav Ganov [Wed, 21 Jun 2017 01:06:14 +0000 (01:06 +0000)]
Merge "[DO NOT MERGE] Support native shared libs" into oc-dev
jackqdyulei [Mon, 19 Jun 2017 20:11:05 +0000 (13:11 -0700)]
Add metric for bluetooth pairing page
Bug:
38383542
Test: Build
Change-Id: Iabc31726528ce8348858cb0aabf5defecee8ea04
Felipe Leme [Wed, 21 Jun 2017 00:15:45 +0000 (17:15 -0700)]
Don't add FillEventHistory events to the wrong session.
The AutofillSession.getFillEventHistory() method returns only the event history
for the last onFillRequest(). In the scenario where the user switches
activities and the server has multiple sessions open, only the events for the
last session should be recorded.
Test: existing CtsAutoFillServiceTestCases pass
Test: LoginActivityTest.checkFillSelectionFromPreviousSessionIsDiscarded
Fixes:
62802026
Change-Id: I447ed77c2167095867b35d616b5cf2ae43aa28db
TreeHugger Robot [Tue, 20 Jun 2017 23:46:27 +0000 (23:46 +0000)]
Merge "Update jobscheduler dumpsys" into oc-dr1-dev
TreeHugger Robot [Tue, 20 Jun 2017 23:45:07 +0000 (23:45 +0000)]
Merge "Reset last activated time after auto mode changed" into oc-dr1-dev
TreeHugger Robot [Tue, 20 Jun 2017 23:41:35 +0000 (23:41 +0000)]
Merge "Only enable wide color gamut support on capable devices" into oc-dr1-dev
TreeHugger Robot [Tue, 20 Jun 2017 23:35:57 +0000 (23:35 +0000)]
Merge "Vary opacity based on number of tasks." into oc-dr1-dev
Wale Ogunwale [Tue, 20 Jun 2017 23:32:15 +0000 (23:32 +0000)]
Merge "Added dumsys activity starter" into oc-dev
am:
ea0de895bb
Change-Id: I6d66510b54cf5a3c40fcbd87b671f3551ca0d3e8
TreeHugger Robot [Tue, 20 Jun 2017 23:23:38 +0000 (23:23 +0000)]
Merge "Add logging constant to track settings entity header clicks" into oc-dr1-dev
TreeHugger Robot [Tue, 20 Jun 2017 23:18:05 +0000 (23:18 +0000)]
Merge "Added dumsys activity starter" into oc-dev
Selim Cinek [Tue, 20 Jun 2017 22:51:24 +0000 (22:51 +0000)]
Merge "Retrying the remoteview application on the ui thread" into oc-dev
am:
07b93779ba
Change-Id: I21c7d62b1cb775a2992d4abcf5c4cfdae91c09a3
Jean-Michel Trivi [Tue, 20 Jun 2017 21:58:18 +0000 (14:58 -0700)]
DnD: Total silence doesn't suppress A11y
When entering Total silence mode, text prompts from a11y were losing
AppOpsManager.OP_PLAY_AUDIO, causing them to play muted (amplification
of 0.0f) even though the STREAM_ACCESSIBILITY volume was not.
The fix consists in adding another category of sound suppression
behavior in AudioAttributes, for usage types that should never be
suppressed (== muted), and using it for USAGE_ACCESSIBILITY.
When ZenModeHelper iterates over usages to mute/unmute players,
consider whether that usage's suppression behavior is SUPPRESSIBLE_NEVER.
Test: turn Talkback on, then enter Total silence and verify Talkback is heard
Bug
62827456
Change-Id: I48cae48797ef9bc6bcaee82484ba078ee445345c
Felipe Leme [Tue, 20 Jun 2017 22:43:23 +0000 (22:43 +0000)]
Merge "Removed deprecated, hidden method." into oc-dev
am:
17efecf48f
Change-Id: Id79feb953db68214e848e9bb3f8f3aaec6d56824
Selim Cinek [Tue, 20 Jun 2017 22:40:59 +0000 (22:40 +0000)]
Merge "Retrying the remoteview application on the ui thread" into oc-dev
Eugene Susla [Tue, 20 Jun 2017 22:40:28 +0000 (22:40 +0000)]
Merge "[Companion] Fix notification access dialog being in new task" into oc-dev
am:
2eacbac8c3
Change-Id: I08da454829489d51ae109ad20ee67aa705f9dcc2
TreeHugger Robot [Tue, 20 Jun 2017 22:31:17 +0000 (22:31 +0000)]
Merge "Removed deprecated, hidden method." into oc-dev
Sujith Ramakrishnan [Tue, 20 Jun 2017 22:27:53 +0000 (22:27 +0000)]
Merge "Add a new flag to check if provisioning is completed on ATV" into oc-dev
am:
59c6385bf9
Change-Id: Iba2e6a6fe6c76c6ae1776f9ce430223ed6222dc4
TreeHugger Robot [Tue, 20 Jun 2017 22:22:54 +0000 (22:22 +0000)]
Merge "[Companion] Fix notification access dialog being in new task" into oc-dev
Bryce Lee [Tue, 20 Jun 2017 22:17:39 +0000 (22:17 +0000)]
Merge "Limit creating new surface for legacy apps to size changes." into oc-dev
am:
d523125679
Change-Id: Ie1c199bbc721f282dc0de788d36481fef9530460
TreeHugger Robot [Tue, 20 Jun 2017 22:13:09 +0000 (22:13 +0000)]
Merge "Add a new flag to check if provisioning is completed on ATV" into oc-dev
Bryce Lee [Tue, 20 Jun 2017 22:05:22 +0000 (22:05 +0000)]
Merge "Limit creating new surface for legacy apps to size changes." into oc-dev
Robert Carr [Tue, 20 Jun 2017 21:55:21 +0000 (14:55 -0700)]
SurfaceView: Fix positioning issue when toggling visibility.
There is an issue (seemingly preexisting) with getPositionInWindow
after toggling view visibility. We see it when showing a view,
hiding it, and then showing it again. At this point we end up
with this call-stack:
SurfaceView#setVisibility->SurfaceView#updateSurface
->View#getPositionInWindow
and getPositionInWindow fills in the wrong values. This newly discovered
bug is tracked as
62839113.
In a second bug, introduced in the SurfaceView refactoring,
we are not appropriately clearing the last RenderThread reported
position when toggling visibility. This means that even after the
setVisibility call when getPositionInWindow begins returning
the correct values, we don't update the position. This CL fixes
that and fixes
62653411 as a result. However we still have a flicker
as we did in N as the initial position is wrong.
Test: Manual from bug, go/wm-smoke
Change-Id: I1037b8dfdb343f9ce8c8616eb9197c6d039ed133
Fixes:
62653411
Bug:
62839113
Felipe Leme [Tue, 20 Jun 2017 17:55:01 +0000 (10:55 -0700)]
Fixed how FillEventHistory is reset and clarified javadoc.
Test: existing CtsAutoFillServiceTestCases pass
Test: checkFillSelectionIsResetAfterReturningNull()
Test: checkFillSelectionIsResetAfterReturningError()
Test: checkFillSelectionIsResetAfterTimeout()
Bug:
62802026
Change-Id: I389d95fc13c08f1056960e5f67e131c8dc306401
TreeHugger Robot [Tue, 20 Jun 2017 21:45:59 +0000 (21:45 +0000)]
Merge "Fix confusing javadoc for WifiManager.EXTRA_RESULTS_UPDATED" into oc-dr1-dev
Makoto Onuki [Tue, 20 Jun 2017 19:20:34 +0000 (12:20 -0700)]
Update jobscheduler dumpsys
- Show job IDs in the history.
- Show "last successful/failed run time" for existing jobs.
Bug
62052247
Test: Manual test with dumpsys jobscheduler
Change-Id: Ic0cdab58e4c5b454a3df8300607e9c24c4b1f438
Romain Guy [Tue, 20 Jun 2017 19:23:42 +0000 (12:23 -0700)]
Only enable wide color gamut support on capable devices
Bug:
62827458
Test: CtsColorModeTests, more tests going in MR1
Change-Id: Idca2804b04ae6bdcbec6bcda6fd74dc6ada89c31
Wale Ogunwale [Tue, 20 Jun 2017 20:38:14 +0000 (13:38 -0700)]
Added dumsys activity starter
Dumps the last state of ActivityStarter to help debug ANR issue.
Also log reason for starting an activity.
Bug:
38121026
Test: adb shell dumpsys activity starter
Change-Id: Ib77ff974b1122946fac96f8835ab3fdfc732cf7b
Andrew Sapperstein [Tue, 20 Jun 2017 20:49:13 +0000 (20:49 +0000)]
Merge "Update lockscreen to use config_headlineFontFamilyLight" into oc-dr1-dev
Justin Klaassen [Tue, 20 Jun 2017 17:08:50 +0000 (10:08 -0700)]
Reset last activated time after auto mode changed
Fixes:
62749129
Test: runtest -c com.android.server.NightDisplayServiceTest \
frameworks-services
Change-Id: I7e5a4c56cd20be70e693aa2327972b5da77b6f27
Android Build Merger (Role) [Tue, 20 Jun 2017 20:07:49 +0000 (20:07 +0000)]
Merge "Merge "Disable activity leak detection by default for userdebug" into oc-dev am:
956ea5f09d" into oc-dr1-dev
Mathieu Chartier [Tue, 20 Jun 2017 20:06:32 +0000 (20:06 +0000)]
Merge "Disable activity leak detection by default for userdebug" into oc-dev
am:
956ea5f09d
Change-Id: I71d5feb7f558347ddb21dc53e7a7d5b9eda9db6d
Android Build Merger (Role) [Tue, 20 Jun 2017 20:06:05 +0000 (20:06 +0000)]
Merge "Merge "Fix battery percent text not updating on Font size change" into oc-dev am:
2ca91661f0" into oc-dr1-dev
Evan Laird [Tue, 20 Jun 2017 20:05:03 +0000 (20:05 +0000)]
Merge "Fix battery percent text not updating on Font size change" into oc-dev
am:
2ca91661f0
Change-Id: I45c6faf144a0e8c0710b10aec69a7dac0f316fe3
Evan Laird [Tue, 20 Jun 2017 19:59:00 +0000 (19:59 +0000)]
Merge "Fix battery percent text not updating on Font size change" into oc-dev
am:
2ca91661f0
Change-Id: I32b0b2475982e1c93f58478407c9ac1f11670fc0
Mathieu Chartier [Tue, 20 Jun 2017 19:55:19 +0000 (19:55 +0000)]
Merge "Disable activity leak detection by default for userdebug" into oc-dev
Evan Laird [Tue, 20 Jun 2017 19:49:34 +0000 (19:49 +0000)]
Merge "Fix battery percent text not updating on Font size change" into oc-dev
Makoto Onuki [Tue, 20 Jun 2017 19:20:04 +0000 (19:20 +0000)]
Merge "Enhance recent sync log in dumpsys content" into oc-dr1-dev
Svet Ganov [Fri, 16 Jun 2017 22:04:01 +0000 (15:04 -0700)]
[DO NOT MERGE] Support native shared libs
Add the shared libs that are APKs to the native library
path when creating application class loaders. Also don't
allow shared libraries hosting native libs to request
extraction of the native libs out of the APK. Lastly,
shared libraries hosting native libs must be declared
as multi-architecture.
Test: CTS tests in this topic
bug:
62720360
Change-Id: I0a398593ebe41b2976cb706ca8a388005f5aec83
Selim Cinek [Mon, 19 Jun 2017 23:58:35 +0000 (16:58 -0700)]
Retrying the remoteview application on the ui thread
Because of various reasons, the async inflation could spuriously
fail, leading to dropped notifications.
We're now retrying them on the UI thread before we fail completely.
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationInflaterTest.java
Bug:
38190555
Change-Id: I13feaeaad925b72798a22194add16528c9438412
Philip P. Moltmann [Tue, 20 Jun 2017 18:42:03 +0000 (18:42 +0000)]
Merge "remove the lock-use for prunePrintService in case blocking main thread" into oc-dev
am:
c06746ce46
Change-Id: I0ac3d9bf7af40f672f7ae482318c375041b28d12
Philip P. Moltmann [Tue, 20 Jun 2017 18:28:03 +0000 (18:28 +0000)]
Merge "remove the lock-use for prunePrintService in case blocking main thread" into oc-dev
Andrii Kulian [Tue, 20 Jun 2017 18:14:22 +0000 (18:14 +0000)]
Merge "Look on all displays if can't launch on a source secondary one" into oc-dev
am:
d883070267
Change-Id: I4129187f5ac00a08f5b0bb6fdf62a9703c861bd9
Andrii Kulian [Tue, 20 Jun 2017 18:01:14 +0000 (18:01 +0000)]
Merge "Look on all displays if can't launch on a source secondary one" into oc-dev
Bryce Lee [Tue, 20 Jun 2017 17:47:55 +0000 (10:47 -0700)]
Limit creating new surface for legacy apps to size changes.
Creating the surface for every change (such as creation and
visibility) can lead to issues swapping buffers. This
changelist limits the action to only when the size changes.
Change-Id: Ic549d244613a93a43a9f4ddf284bbfb0c13300fa
Fixes:
62801621
Test: follow repro steps in bug, verified no crash.
Test: go/wm-smoke
Jason Monk [Tue, 20 Jun 2017 17:42:30 +0000 (17:42 +0000)]
Merge "Fix QS wifi accessibility announcements" into oc-dev
am:
accdadae9d
Change-Id: I3eca1aa3f0fac1067ed25cf74ad0b2301ee146bc
Jason Monk [Tue, 20 Jun 2017 17:32:26 +0000 (17:32 +0000)]
Merge "Fix QS wifi accessibility announcements" into oc-dev
Daniel Sandler [Tue, 20 Jun 2017 17:25:11 +0000 (17:25 +0000)]
Merge "Log screenshot exceptions." into oc-dr1-dev
Felipe Leme [Tue, 20 Jun 2017 17:16:59 +0000 (10:16 -0700)]
Removed deprecated, hidden method.
Test: existing CtsAutoFillServiceTestCases pass
Bug:
37563972
Change-Id: I10c5a2b16b422694d72b3ccaf6629d50247c7f49
Jason Monk [Tue, 20 Jun 2017 17:16:05 +0000 (13:16 -0400)]
Fix QS wifi accessibility announcements
The state was being inverted in events to try to get clicks correct,
but events can occur at other times, so really we want to invert
the state between when the click happens and when the next state
change occurs. Also add a toString to fix equals checks on the content
description to make the announcements less noisy.
Test: manual
Change-Id: Ie4159664e9a81fd1719dbf7c06fba5e7b827cc6d
Fixes:
62679498
Makoto Onuki [Fri, 9 Jun 2017 00:12:05 +0000 (17:12 -0700)]
Enhance recent sync log in dumpsys content
- Add "Per Adapter History" section that has recent activities per adapter. Example:
mxxxx@gmail.com/com.google u0 [com.android.calendar]
2017-06-19 14:19:07 success Source=LOCAL Elapsed=0s Reason=10014 Extras=[upload=true ]
2017-06-19 14:19:06 success Source=SERVER Elapsed=16s Reason=10014 Extras=[feed=#contacts@group.v.calendar.google.com ]
mxxxx@gmail.com/com.google u0 [com.android.chrome]
2017-06-19 13:26:25 canceled Source=POLL Elapsed=0s Reason=AccountsUpdated Extras=[initialize=true ]
mxxxx@gmail.com/com.google u0 [com.android.contacts]
- Improve pending/periodic syncs with better formatting, and sort them in a sane order.
Bug:
38498544
Bug:
62391411
Test: manual test with "dumpsys content"
Change-Id: I947a9255230f27a7f438d648da324787fdf16f55
Andreas Huber [Tue, 20 Jun 2017 17:05:23 +0000 (17:05 +0000)]
Merge "Add an extra level of indirection to make sure that native IHwBinder" into oc-dr1-dev
TreeHugger Robot [Tue, 20 Jun 2017 16:51:38 +0000 (16:51 +0000)]
Merge "Separate theme breakpoints" into oc-dr1-dev
Fan Zhang [Mon, 19 Jun 2017 19:32:14 +0000 (12:32 -0700)]
Add logging constant to track settings entity header clicks
Bug:
62709062
Test: builds
Change-Id: I5f2785d9bf1561ed7d2684ded1fcba354be54ccf
Jonathan Solnit [Tue, 20 Jun 2017 16:24:23 +0000 (16:24 +0000)]
Merge "Check for keyguard occlusion on camera lift" into oc-dr1-dev
Philip P. Moltmann [Tue, 20 Jun 2017 15:48:54 +0000 (15:48 +0000)]
Merge "Correct lastId on onCreate with unexpected state" into oc-dev
am:
aed0c10d52
Change-Id: I2197920ee7d6483276473129e74fd9527162dc0a
Philip P. Moltmann [Tue, 20 Jun 2017 15:42:13 +0000 (15:42 +0000)]
Merge "Correct lastId on onCreate with unexpected state" into oc-dev
Hugo Benichi [Tue, 20 Jun 2017 08:38:27 +0000 (08:38 +0000)]
Merge changes I4d2be5d9,I34706201 into oc-dr1-dev
* changes:
Better errors from unregisterNetworkCallback
CaptivePortalLogin correctly unregisters callbacks
TreeHugger Robot [Tue, 20 Jun 2017 06:06:07 +0000 (06:06 +0000)]
Merge "Make interface IP serving code set LinkProperties" into oc-dr1-dev
Josh Gao [Tue, 20 Jun 2017 04:30:07 +0000 (04:30 +0000)]
Merge "Hack around b/
36066697." into oc-dev
am:
e139434e3a
Change-Id: I422d2b73fc854047d1293919c25f0656df0842c9
TreeHugger Robot [Tue, 20 Jun 2017 04:24:08 +0000 (04:24 +0000)]
Merge "Hack around b/
36066697." into oc-dev
Erik Kline [Mon, 12 Jun 2017 09:20:08 +0000 (18:20 +0900)]
Make interface IP serving code set LinkProperties
Additionally, clean up awkward IPv6TetheringInterfaceServices
instantiation mechanics. In future, this class will be absorbed
by TetherInterfaceStateMachine (prior to its renaming to IpServer).
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
29337859
Bug:
32163131
Merged-In: I8b15edbf04c10cd9429da079c6b79352a6740b3b
Merged-In: I39a1744a7fa9b91e3b607429c79f39578e9bde19
Merged-In: I753ab701f2109c0972816724e73119dc1dbc4dca
Change-Id: Ib620e3df182f9f8e2c019aae1cd8981eb0b29376
(cherry picked from commit
dd4d5820344205085c19dc142aec252ea9ac220b)
Mathieu Chartier [Tue, 20 Jun 2017 01:42:57 +0000 (18:42 -0700)]
Disable activity leak detection by default for userdebug
Causes too many GCs and related slowdowns.
Verified that assistant launch from holding down home button is now
faster than N.
Test: make and flash
Bug:
62769566
Change-Id: Ib0c1f7a45831b241d3376d1e56db3c6937913b1b
Jakub Pawlowski [Tue, 20 Jun 2017 01:47:01 +0000 (01:47 +0000)]
Merge "Remove legacy advertiser from map after it's no longer used" into oc-dev
am:
271e0aa02a
Change-Id: I9e8645c808d1b1cbee242e8a953be93fbf71e4e1
TreeHugger Robot [Tue, 20 Jun 2017 01:38:36 +0000 (01:38 +0000)]
Merge "Remove legacy advertiser from map after it's no longer used" into oc-dev
Adam Lesinski [Tue, 20 Jun 2017 01:11:19 +0000 (01:11 +0000)]
Merge "Fix potential race in Theme creation" into oc-dev
am:
b0a5fd0384
Change-Id: I964d23b0daad2326989ece5f8ffc086b6286cb44
Adam Lesinski [Tue, 20 Jun 2017 01:07:06 +0000 (01:07 +0000)]
Merge "Fix potential race in Theme creation" into oc-dev
Hugo Benichi [Sat, 17 Jun 2017 04:14:12 +0000 (13:14 +0900)]
Better errors from unregisterNetworkCallback
This patch changes the validation of unregisterNetworkCallback in
ConnectivityManager so that the caller can better distinguish the case
of a callback that was never registered from the case of a callback that
has already been unregistered.
Bug:
62497809
Test: runtest frameworks-net passes
Merged-In: I58eda22725dd4e67dc4b64207e38cf482032df10
(cherry picked from commit
605b295011be74c786a2eef586d31ccb07160422)
Change-Id: I4d2be5d9037cfec03218b702d707f50808ee0694
Hugo Benichi [Sat, 17 Jun 2017 03:47:33 +0000 (12:47 +0900)]
CaptivePortalLogin correctly unregisters callbacks
The NetworkCallback registered by the CaptivePortalLogin activity in
onCreate was unregistered in both onDestroy() and done(). In addition
done() can be called concurrently from different places (from the
webview, from the captive portal test probe, from the activity menu),
resulting in incorrectly unregistering the callback more than once.
This patch fixes the lifecycle management of the NetworkCallback
registered by the CaptivePortalLogin activity so that it is unregistered
once only in onDestroy.
In addition the done() method is made robust against multiple calls and
becomes a no-op after the first call. This avoids multiple calls
to CaptivePortal for the same captive portal.
Bug:
62497809
Test: tested manually with captive portal setup in the office
Merged-In: I77fbeb55cf91d3b44e91d2fecb800dae40279652
(cherry pick from commit
31c176d91068934f5b79125afa3b5ce0f44dbe8f)
Change-Id: I34706201395ed5ddba11d12cc75c357e371d1920
TreeHugger Robot [Tue, 20 Jun 2017 01:00:16 +0000 (01:00 +0000)]
Merge "BT device renaming: move edit icon and add metrics proto" into oc-dr1-dev
Eugene Susla [Tue, 20 Jun 2017 00:27:23 +0000 (17:27 -0700)]
[Companion] Fix notification access dialog being in new task
Fixes:
62678460
Test: Tap recents while the dialog is shown and ensure it's not in a
separate task
Change-Id: I0572ddc84d76643ac8a373939273c221ff20676f