OSDN Git Service
Paul Duffin [Wed, 21 Jun 2017 08:13:05 +0000 (08:13 +0000)]
Merge "Cleanup a.t.InstrumentationTestRunner" am:
9d5576e081
am:
66b8ef6615
Change-Id: I3ca3f23c2f8a741daf867aad08f57bac373e5d91
Paul Duffin [Wed, 21 Jun 2017 08:07:14 +0000 (08:07 +0000)]
Merge "Remove unused a.t.s.InstrumentationTestSuiteBuilder" am:
1935dce8eb
am:
a4d2464189
Change-Id: I88278d5cfd8fc3466cce39de3de54e34d67cbe0f
Paul Duffin [Wed, 21 Jun 2017 08:03:56 +0000 (08:03 +0000)]
Merge "Remove unused android.test.DatabaseTestUtils" am:
3724e7e5e9
am:
e6e0601862
Change-Id: I2c5e4c7af30893d9183ee35326814fcb4506d0e8
Paul Duffin [Wed, 21 Jun 2017 08:00:45 +0000 (08:00 +0000)]
Merge "Cleanup a.t.InstrumentationTestRunner"
am:
9d5576e081
Change-Id: I376079be6f5e56adf51fec62ed3f89969029c0a1
Paul Duffin [Wed, 21 Jun 2017 07:57:54 +0000 (07:57 +0000)]
Merge "Remove unused a.t.s.InstrumentationTestSuiteBuilder"
am:
1935dce8eb
Change-Id: If6e86d76bd8dfca6e91cc6eeda20cd1492980b1e
Paul Duffin [Wed, 21 Jun 2017 07:55:06 +0000 (07:55 +0000)]
Merge "Remove unused android.test.DatabaseTestUtils"
am:
3724e7e5e9
Change-Id: Iebf38b15aaae0317935fe00e07d00cf806ab5942
Paul Duffin [Wed, 21 Jun 2017 07:46:04 +0000 (07:46 +0000)]
Merge "Cleanup a.t.InstrumentationTestRunner"
Paul Duffin [Wed, 21 Jun 2017 07:46:02 +0000 (07:46 +0000)]
Merge "Remove unused a.t.s.InstrumentationTestSuiteBuilder"
Paul Duffin [Wed, 21 Jun 2017 07:46:00 +0000 (07:46 +0000)]
Merge "Remove unused android.test.DatabaseTestUtils"
Erik Kline [Wed, 21 Jun 2017 07:20:54 +0000 (07:20 +0000)]
Merge "Always allow Ethernet to be an upstream" am:
ecbe6fa147
am:
9cec380720
Change-Id: I97cc3c5ad7dcd4359c28e6aa817856a226a4f8cc
Erik Kline [Wed, 21 Jun 2017 07:13:46 +0000 (07:13 +0000)]
Merge "Always allow Ethernet to be an upstream"
am:
ecbe6fa147
Change-Id: Ic9fd4bfd6ba7ecc00552019f804b87bc203ea98a
Treehugger Robot [Wed, 21 Jun 2017 07:06:47 +0000 (07:06 +0000)]
Merge "Always allow Ethernet to be an upstream"
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
Change-Id: Ie61d1358f73d518de23f6ca48ca2765ca14a1067
Felipe Leme [Wed, 21 Jun 2017 04:02:25 +0000 (04:02 +0000)]
Merge changes from topics 'bug_62802026_take_2', 'bug_62802026' into oc-dev
am:
4f7fd183eb
Change-Id: Id26a5cdd53035eb94d4de3c0acf4378268b24c2e
Felipe Leme [Wed, 21 Jun 2017 04:00:28 +0000 (04:00 +0000)]
Fixed how FillEventHistory is reset and clarified javadoc.
am:
2e30c6f371
Change-Id: Ib4722f448f977e79d6d9dd8e3132db7167e91b03
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.
Dianne Hackborn [Wed, 21 Jun 2017 02:02:48 +0000 (02:02 +0000)]
Merge "Small doc fix." into oc-dev
am:
0f98ddaa01
Change-Id: Ib0da1db5f79b054f3826e0b3b3d0d3e4716530f2
TreeHugger Robot [Wed, 21 Jun 2017 01:58:56 +0000 (01:58 +0000)]
Merge "Small doc fix." into oc-dev
Rob Carr [Wed, 21 Jun 2017 01:56:41 +0000 (01:56 +0000)]
Merge "SurfaceView: Fix positioning issue when toggling visibility." into oc-dev
am:
70f1565b55
Change-Id: Id6fa287aa7c7edb2fd59a3bcbeef2aade35961e7
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:19:42 +0000 (01:19 +0000)]
Merge "[DO NOT MERGE] Support native shared libs" into oc-dev
am:
324c41ba89
Change-Id: Ia774a4f3bd1af7c334b2844f87fa8850de48f2f7
Svetoslav Ganov [Wed, 21 Jun 2017 01:06:14 +0000 (01:06 +0000)]
Merge "[DO NOT MERGE] Support native shared libs" into oc-dev
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
Wale Ogunwale [Tue, 20 Jun 2017 23:29:56 +0000 (23:29 +0000)]
Merge "Added dumsys activity starter" into oc-dev
am:
ea0de895bb
Change-Id: I7212c30b68f1dbd76b9478975da2b4232eec5ee4
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:56:33 +0000 (22:56 +0000)]
Merge "Retrying the remoteview application on the ui thread" into oc-dev
am:
07b93779ba
Change-Id: I827a9c9d1ece9fec41200c03400bcdf88b248cce
Felipe Leme [Tue, 20 Jun 2017 22:46:50 +0000 (22:46 +0000)]
Merge "Removed deprecated, hidden method." into oc-dev
am:
17efecf48f
Change-Id: Ic78e1312a1230ef6765551c6104b3caba8ca6a08
Eugene Susla [Tue, 20 Jun 2017 22:44:46 +0000 (22:44 +0000)]
Merge "[Companion] Fix notification access dialog being in new task" into oc-dev
am:
2eacbac8c3
Change-Id: Ic1566785ba2efae73469729f70b43775af02e57c
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
Sujith Ramakrishnan [Tue, 20 Jun 2017 22:36:25 +0000 (22:36 +0000)]
Merge "Add a new flag to check if provisioning is completed on ATV" into oc-dev
am:
59c6385bf9
Change-Id: I61b688030f11cbe745dadd0a541d9196eb36d21c
TreeHugger Robot [Tue, 20 Jun 2017 22:31:17 +0000 (22:31 +0000)]
Merge "Removed deprecated, hidden method." into oc-dev
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: I191b285ed3785f9937c91162d3aa875a285cb51a
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
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
Mathieu Chartier [Tue, 20 Jun 2017 20:05:29 +0000 (20:05 +0000)]
Merge "Disable activity leak detection by default for userdebug" into oc-dev
am:
956ea5f09d
Change-Id: Iadacd64e92c1963b2417bad96838ba2c128ec8cb
Evan Laird [Tue, 20 Jun 2017 19:59:02 +0000 (19:59 +0000)]
Merge "Fix battery percent text not updating on Font size change" into oc-dev
am:
2ca91661f0
Change-Id: I26680deb22ded21d970cd213e20f6d96d7ae8cc3
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
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:41:53 +0000 (18:41 +0000)]
Merge "remove the lock-use for prunePrintService in case blocking main thread" into oc-dev
am:
c06746ce46 -s ours
Change-Id: Ide56fc37ebe8e06c6914e8212b232876d535f716
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:11:02 +0000 (18:11 +0000)]
Merge "Look on all displays if can't launch on a source secondary one" into oc-dev
am:
d883070267
Change-Id: I92bd1ad211fb97bf27fe34a8d1fe4c57c6c46d89
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:46:52 +0000 (17:46 +0000)]
Merge "Fix QS wifi accessibility announcements" into oc-dev
am:
accdadae9d
Change-Id: I9ffba74a945475525a60226ba4c106af9ca99579
Jason Monk [Tue, 20 Jun 2017 17:32:26 +0000 (17:32 +0000)]
Merge "Fix QS wifi accessibility announcements" into oc-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
Philip P. Moltmann [Tue, 20 Jun 2017 15:48:50 +0000 (15:48 +0000)]
Merge "Correct lastId on onCreate with unexpected state" into oc-dev
am:
aed0c10d52
Change-Id: I821aba22236152a8a0230a0db7a3710ad7731d12
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
Paul Duffin [Tue, 20 Jun 2017 15:05:46 +0000 (15:05 +0000)]
Merge "Remove unused a.t.InstrumentationCoreTestRunner" am:
1bfccadc81
am:
dfc6939ed5
Change-Id: I5ccdb58bbcde73a33bdce9b65d95aad2bf7b931f
Neil Fuller [Tue, 20 Jun 2017 15:02:37 +0000 (15:02 +0000)]
Merge "Track TimeZoneDistroInstaller method changes" am:
ba6b96d978
am:
7ab9d93fa4
Change-Id: I0388475b92a6b4f981d5027992af461f48181ab2
Paul Duffin [Tue, 20 Jun 2017 14:54:46 +0000 (14:54 +0000)]
Merge "Remove unused a.t.InstrumentationCoreTestRunner"
am:
1bfccadc81
Change-Id: Id624c17f7d5da6fa81cfac9a21726042b793c270
Treehugger Robot [Tue, 20 Jun 2017 14:44:57 +0000 (14:44 +0000)]
Merge "Remove unused a.t.InstrumentationCoreTestRunner"
Paul Duffin [Tue, 20 Jun 2017 13:41:20 +0000 (14:41 +0100)]
Cleanup a.t.InstrumentationTestRunner
ARGUMENT_TEST_CLASS, ARGUMENT_TEST_PACKAGE, ARGUMENT_TEST_SIZE_PREDICATE
and ARGUMENT_DELAY_MSEC were made package private because they are not
part of the API and are only used from within the same package.
The JavaDoc comment was changed to a multi-line comment because it is
not and should not be associated with any member.
Fixed a couple of minor JavaDoc issues.
Bug:
30188076
Test: make checkbuild
Change-Id: If28460aec2fd0080e0f5346a83abae393b7a9fb2
Paul Duffin [Tue, 20 Jun 2017 13:03:28 +0000 (14:03 +0100)]
Remove unused a.t.s.InstrumentationTestSuiteBuilder
Bug:
30188076
Test: make checkbuild
Change-Id: I30514123c077e6047227f888f5f1a20e71ee1988
Paul Duffin [Tue, 20 Jun 2017 10:05:25 +0000 (11:05 +0100)]
Remove unused a.t.InstrumentationCoreTestRunner
The only usage of this was in the unused
cts/tests/vm-tests-tf/AndroidManifest.xml which was deleted in
https://android-review.googlesource.com/#/c/418900/.
Bug:
30188076
Test: make checkbuild
Change-Id: I96f3586a7017f4cd14fa31207e0fff19c92f0de4
Erik Kline [Tue, 20 Jun 2017 12:18:31 +0000 (21:18 +0900)]
resolve merge conflicts of
9e6b6e2a58d4 to oc-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I2104ecf8102c8f9541ee2d3ce6589b0081db4fe3
Paul Duffin [Tue, 20 Jun 2017 13:00:03 +0000 (14:00 +0100)]
Remove unused android.test.DatabaseTestUtils
Bug:
30188076
Test: make checkbuild
Change-Id: I11b1a3b90b9d17af9278ec8b28483eee01b75e81
Neil Fuller [Tue, 20 Jun 2017 12:12:11 +0000 (12:12 +0000)]
Merge "Track TimeZoneDistroInstaller method changes"
am:
ba6b96d978
Change-Id: I9352872ceb2d11739a4372589f69bb473f3457d3
Treehugger Robot [Tue, 20 Jun 2017 12:06:29 +0000 (12:06 +0000)]
Merge "Track TimeZoneDistroInstaller method changes"
Erik Kline [Tue, 20 Jun 2017 11:12:00 +0000 (11:12 +0000)]
Merge "Create a TetherInterfaceStateMachine when told the interface name."
am:
51ee00785c
Change-Id: If79a096375e6b9665d5ba4aa0bcd9dbec6a8adab
Erik Kline [Tue, 20 Jun 2017 11:01:13 +0000 (11:01 +0000)]
Merge "Create a TetherInterfaceStateMachine when told the interface name."
Erik Kline [Tue, 20 Jun 2017 08:18:27 +0000 (17:18 +0900)]
Create a TetherInterfaceStateMachine when told the interface name.
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
32163131
Bug:
62343300
Change-Id: I93f3bdcf20dc4f03cd621d7ab6066344642550e3
Hugo Benichi [Tue, 20 Jun 2017 07:18:25 +0000 (07:18 +0000)]
resolve merge conflicts of
48bc4c1f420d to stage-aosp-master
am:
ca0c91b9f1
Change-Id: I941327a914d4a44e63a5f57fc0aa98d778fef949
Hugo Benichi [Tue, 20 Jun 2017 07:02:33 +0000 (16:02 +0900)]
resolve merge conflicts of
48bc4c1f420d to stage-aosp-master
Change-Id: I41889b0497463e8a63cf2d1e983e7e54298c5c2e
Hugo Benichi [Tue, 20 Jun 2017 05:19:46 +0000 (05:19 +0000)]
Merge "Better errors from unregisterNetworkCallback" am:
04e89ad631
am:
ca6ebb0f39
Change-Id: Ib380ee7c3fc85db353682ee7abfe97842eaeeb29
Hugo Benichi [Tue, 20 Jun 2017 05:12:39 +0000 (05:12 +0000)]
Merge "Better errors from unregisterNetworkCallback"
am:
04e89ad631
Change-Id: Icbd68ff14db55c6546c7de6353774a3622b32f9e
Hugo Benichi [Tue, 20 Jun 2017 05:04:01 +0000 (05:04 +0000)]
Merge "CaptivePortalLogin correctly unregisters callbacks"
Hugo Benichi [Tue, 20 Jun 2017 05:03:22 +0000 (05:03 +0000)]
Merge "Better errors from unregisterNetworkCallback"
Hugo Benichi [Tue, 20 Jun 2017 04:49:06 +0000 (04:49 +0000)]
Merge "DO NOT MERGE Instrument captive portal login activity" am:
778ade9073 -s ours
am:
5da98a422d -s ours
Change-Id: Iffdc9cae102d54672d55274a8cad582b3b6d5f6a
Josh Gao [Tue, 20 Jun 2017 04:31:40 +0000 (04:31 +0000)]
Merge "Hack around b/
36066697." into oc-dev
am:
e139434e3a
Change-Id: I97427d86074cea38ca6aa59264e98a5d81645830
TreeHugger Robot [Tue, 20 Jun 2017 04:24:08 +0000 (04:24 +0000)]
Merge "Hack around b/
36066697." into oc-dev
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:46:56 +0000 (01:46 +0000)]
Merge "Remove legacy advertiser from map after it's no longer used" into oc-dev
am:
271e0aa02a
Change-Id: Idddaa69cc89caaebcee0be1d4d27e28e2fd8ea51
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:20 +0000 (01:11 +0000)]
Merge "Fix potential race in Theme creation" into oc-dev
am:
b0a5fd0384
Change-Id: I9044d46d68f7fcb471f584d75225137c3b6f171b
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 [Tue, 20 Jun 2017 00:54:48 +0000 (00:54 +0000)]
Merge "DO NOT MERGE Instrument captive portal login activity"
am:
778ade9073 -s ours
Change-Id: Ie493a705d3c60958037b0128195ee4ac85329d8b
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
Hugo Benichi [Tue, 20 Jun 2017 00:47:55 +0000 (00:47 +0000)]
Merge "DO NOT MERGE Instrument captive portal login activity"
Felipe Leme [Tue, 20 Jun 2017 00:34:31 +0000 (00:34 +0000)]
Merge "Fixed updateAutofillValue() when mText is not set." into oc-dev
am:
4eaba84065
Change-Id: Ia00eb87f13de85ee652aa5cbab290dd98d817399
TreeHugger Robot [Tue, 20 Jun 2017 00:27:32 +0000 (00:27 +0000)]
Merge "Fixed updateAutofillValue() when mText is not set." into oc-dev
Dianne Hackborn [Tue, 20 Jun 2017 00:03:20 +0000 (00:03 +0000)]
Merge "Fix issue #
62787070: restart due to NPE in JobServiceContext..." into oc-dev
am:
fa791d5e97
Change-Id: Ib6d3357df726979e94a6e04a61c4152b91429f6c
Siarhei Vishniakou [Mon, 19 Jun 2017 23:58:04 +0000 (23:58 +0000)]
Merge "Revive DeadZone" into oc-dev
am:
b278424fa6
Change-Id: Ib4388b31d3b636826c428a89389585ae5b9cb25e
Philip P. Moltmann [Mon, 19 Jun 2017 19:57:13 +0000 (12:57 -0700)]
Correct lastId on onCreate with unexpected state
onCreate might be called with a state not produced by
onSaveInstanceState. In this case the last autofill ID is not set, so we
incorrectly restore it to NO_ID instead of LAST_APP_AUTOFILL_ID
Change-Id: Id40c06bf223c0e3c6235b2d50779e3f4532898b5
Fixes:
62296699
Test: cts-tradefed run cts-dev -m CtsAutoFillServiceTestCases
(cherry picked from commit
1266d08be53c6ee2494d18363092c68825ef449e)
TreeHugger Robot [Mon, 19 Jun 2017 23:50:23 +0000 (23:50 +0000)]
Merge "Fix issue #
62787070: restart due to NPE in JobServiceContext..." into oc-dev
Siarhei Vishniakou [Mon, 19 Jun 2017 23:47:48 +0000 (23:47 +0000)]
Merge "Revive DeadZone" into oc-dev
Chet Haase [Mon, 19 Jun 2017 23:39:54 +0000 (23:39 +0000)]
Merge "Make --no-window-animation flag apply to animators, too" into oc-dev
am:
c36e3e7fff
Change-Id: I8c16496b18d5aca4c570e45a000081790c16ac78
Jakub Pawlowski [Wed, 14 Jun 2017 01:59:07 +0000 (18:59 -0700)]
Remove legacy advertiser from map after it's no longer used
Test: manual
Bug:
62597369
Change-Id: Ief1e1b054f29b59b1ed72514b138d4f209f9847a
Wale Ogunwale [Mon, 19 Jun 2017 23:29:53 +0000 (23:29 +0000)]
Merge "Added back removed ctor from DisplayEventReceiver" into oc-dev
am:
113918f309
Change-Id: Iab45bb64e04cbddde6cd627763aab19b663aa919
TreeHugger Robot [Mon, 19 Jun 2017 23:29:04 +0000 (23:29 +0000)]
Merge "Make --no-window-animation flag apply to animators, too" into oc-dev
TreeHugger Robot [Mon, 19 Jun 2017 23:16:14 +0000 (23:16 +0000)]
Merge "Added back removed ctor from DisplayEventReceiver" into oc-dev
yangbingqian [Mon, 12 Jun 2017 14:45:50 +0000 (22:45 +0800)]
remove the lock-use for prunePrintService in case blocking main thread
As in the change: I4f4cdaba65132dc2ef054877cbb097b499a723f6
the lock object is removed when calling RemotePrintSpooler
and so as it in the method prunePrintService(). But in the
constructor of UserState, the mLock is still held when calling
prunePrintService(), it may also block the main thread
It is better to take it out of the synchronized block
Test: null
Fixes:
37481484
Change-Id: I21fe5380d5c6302f70e04eee7dac0050886ed4f0
Merged-In: I709b491d611dbcbf21a5fd493b879ed290dd0247
Signed-off-by: yangbingqian <yangbingqian@xiaomi.com>
Adam Lesinski [Mon, 12 Jun 2017 19:22:10 +0000 (12:22 -0700)]
Fix potential race in Theme creation
Bug:
38190555
Test: none
Change-Id: Id627bd6088dc469baffb1abb8310cd9e992996aa