git.osdn.net Git - android-x86/frameworks-base.git/log

(root) / android-x86 / frameworks-base.git / log

Erik Kline [Tue, 20 Jun 2017 15:12:39 +0000 (15:12 +0000)]

resolve merge conflicts of 9e6b6e2a58d4 to oc-dev-plus-aosp am: b912c50b19
am: 0cec17209e

Change-Id: I542e013aa19fefd3443588c9a81ee59cd669ab6f

commit | commitdiff | tree

Erik Kline [Tue, 20 Jun 2017 15:05:23 +0000 (15:05 +0000)]

resolve merge conflicts of 9e6b6e2a58d4 to oc-dev-plus-aosp
am: b912c50b19

Change-Id: I973bdc5b540cce66a9713cebfd5071ad4a4b0a08

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Erik Kline [Tue, 20 Jun 2017 11:01:13 +0000 (11:01 +0000)]

Merge "Create a TetherInterfaceStateMachine when told the interface name."

commit | commitdiff | tree

Hugo Benichi [Tue, 20 Jun 2017 09:05:25 +0000 (09:05 +0000)]

resolve merge conflicts of 48bc4c1f420d to stage-aosp-master am: ca0c91b9f1 am: a111068342 -s ours
am: 5347490663

Change-Id: Ibd6c9ef859dcc8b48b632206c59d419ccfed1933

commit | commitdiff | tree

Hugo Benichi [Tue, 20 Jun 2017 08:53:58 +0000 (08:53 +0000)]

Merge changes I4d2be5d9,I34706201 into oc-dr1-dev am: c649a9978a -s ours
am: 073299c325 -s ours

Change-Id: I8dfc0da75cede32a4161760eeca34e84dd81c406

commit | commitdiff | tree

Hugo Benichi [Tue, 20 Jun 2017 08:53:53 +0000 (08:53 +0000)]

resolve merge conflicts of 48bc4c1f420d to stage-aosp-master am: ca0c91b9f1
am: a111068342 -s ours

Change-Id: I018561953dbf2290522b11e09aa3ab04cd9df814

commit | commitdiff | tree

Hugo Benichi [Tue, 20 Jun 2017 08:45:56 +0000 (08:45 +0000)]

Merge changes I4d2be5d9,I34706201 into oc-dr1-dev
am: c649a9978a -s ours

Change-Id: I576c2ff37bcf2885f0b126b9d66a3d3d23974146

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Erik Kline [Tue, 20 Jun 2017 06:17:44 +0000 (06:17 +0000)]

Merge "Make interface IP serving code set LinkProperties" into oc-dr1-dev am: e20bfea3d7 -s ours
am: 077d5b9027 -s ours

Change-Id: Ibd8e6405812b863253e965e0bc89c6d9e39f3612

commit | commitdiff | tree

Erik Kline [Tue, 20 Jun 2017 06:10:43 +0000 (06:10 +0000)]

Merge "Make interface IP serving code set LinkProperties" into oc-dr1-dev
am: e20bfea3d7 -s ours

Change-Id: I22b127879df9469fd63140d3b4466e859028eac0

commit | commitdiff | tree

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

commit | commitdiff | tree

Hugo Benichi [Tue, 20 Jun 2017 05:33:36 +0000 (05:33 +0000)]

Merge "Better errors from unregisterNetworkCallback" am: 04e89ad631 am: ca6ebb0f39 am: 6531ea25cd
am: 6210be1000

Change-Id: Ifeb8f83e9db3b7950d2d3ca533ca863823442a78

commit | commitdiff | tree

Hugo Benichi [Tue, 20 Jun 2017 05:26:40 +0000 (05:26 +0000)]

Merge "Better errors from unregisterNetworkCallback" am: 04e89ad631 am: ca6ebb0f39
am: 6531ea25cd

Change-Id: Ia959388c875c22e56f5f2867f33a7329ce4b3535

commit | commitdiff | tree

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

commit | commitdiff | tree

Hugo Benichi [Tue, 20 Jun 2017 05:12:39 +0000 (05:12 +0000)]

Merge "Better errors from unregisterNetworkCallback"
am: 04e89ad631

Change-Id: Icbd68ff14db55c6546c7de6353774a3622b32f9e

commit | commitdiff | tree

Hugo Benichi [Tue, 20 Jun 2017 05:04:01 +0000 (05:04 +0000)]

Merge "CaptivePortalLogin correctly unregisters callbacks"

commit | commitdiff | tree

Hugo Benichi [Tue, 20 Jun 2017 05:03:22 +0000 (05:03 +0000)]

Merge "Better errors from unregisterNetworkCallback"

commit | commitdiff | tree

Hugo Benichi [Tue, 20 Jun 2017 05:01:16 +0000 (05:01 +0000)]

Merge "DO NOT MERGE Instrument captive portal login activity" am: 778ade9073 -s ours am: 5da98a422d -s ours am: e3efe5d054 -s ours
am: 8dbe9aadc1 -s ours

Change-Id: I6356cdc775fa4fe6f98fff1e5720a9470df00f94

commit | commitdiff | tree

Hugo Benichi [Tue, 20 Jun 2017 04:55:19 +0000 (04:55 +0000)]

Merge "DO NOT MERGE Instrument captive portal login activity" am: 778ade9073 -s ours am: 5da98a422d -s ours
am: e3efe5d054 -s ours

Change-Id: I39e5302384530e81675560f81a8c41ee7325bbc3

commit | commitdiff | tree

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

commit | commitdiff | tree

Josh Gao [Tue, 20 Jun 2017 04:45:41 +0000 (04:45 +0000)]

Merge "Merge "Hack around b/36066697." into oc-dev am: e139434e3a am: 8effb089ed" into oc-dr1-dev-plus-aosp
am: 2cf5ed1173

Change-Id: Ic4f60b461ab04541db65c171c57775ab8b4c1217

commit | commitdiff | tree

Josh Gao [Tue, 20 Jun 2017 04:43:10 +0000 (04:43 +0000)]

Merge "Hack around b/36066697." into oc-dev am: e139434e3a am: 17d3fc2e68
am: 5966301234

Change-Id: Iaf3011a7b2f184660d0f25e93aa4cb0dfd778c85

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 20 Jun 2017 04:39:28 +0000 (04:39 +0000)]

Merge "Merge "Hack around b/36066697." into oc-dev am: e139434e3a am: 8effb089ed" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Josh Gao [Tue, 20 Jun 2017 04:38:38 +0000 (04:38 +0000)]

Merge "Hack around b/36066697." into oc-dev am: e139434e3a
am: 8effb089ed

Change-Id: I12e0f907251c9624ea630c0ce72b42f1a4b45438

commit | commitdiff | tree

Josh Gao [Tue, 20 Jun 2017 04:36:03 +0000 (04:36 +0000)]

Merge "Hack around b/36066697." into oc-dev am: e139434e3a
am: 17d3fc2e68

Change-Id: I341c785941c3860344aa053670db8f4a5da18dd6

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Tue, 20 Jun 2017 04:24:08 +0000 (04:24 +0000)]

Merge "Hack around b/36066697." into oc-dev

commit | commitdiff | tree

TreeHugger Robot [Tue, 20 Jun 2017 03:40:56 +0000 (03:40 +0000)]

Merge "Shorten the log in the netpolicy dump."

commit | commitdiff | tree

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)

commit | commitdiff | tree

Nate Fischer [Tue, 20 Jun 2017 03:01:33 +0000 (03:01 +0000)]

Merge "Add WebViewClient#onSafeBrowsingHit() API"

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Jun 2017 02:05:31 +0000 (19:05 -0700)]

Shorten the log in the netpolicy dump.

Test: bit FrameworksServicesTests:com.android.server.NetworkPolicyManagerServiceTest
Change-Id: I105326e733f2498e68b0552b45fec1ed0e8e3179

commit | commitdiff | tree

Jakub Pawlowski [Tue, 20 Jun 2017 02:05:56 +0000 (02:05 +0000)]

Merge "Merge "Remove legacy advertiser from map after it's no longer used" into oc-dev am: 271e0aa02a am: 50bad313e4" into oc-dr1-dev-plus-aosp
am: c027c017e2

Change-Id: I70ceaa225a9bcdffed6c7be1977f11795593a7cb

commit | commitdiff | tree

Jakub Pawlowski [Tue, 20 Jun 2017 01:59:54 +0000 (01:59 +0000)]

Merge "Remove legacy advertiser from map after it's no longer used" into oc-dev am: 271e0aa02a am: 4d813757c7
am: 3af7698c7e

Change-Id: Ie554f178d2d1033d0386d460544bdedcf6ff1f1e

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 20 Jun 2017 01:56:53 +0000 (01:56 +0000)]

Merge "Merge "Remove legacy advertiser from map after it's no longer used" into oc-dev am: 271e0aa02a am: 50bad313e4" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Jakub Pawlowski [Tue, 20 Jun 2017 01:54:51 +0000 (01:54 +0000)]

Merge "Remove legacy advertiser from map after it's no longer used" into oc-dev am: 271e0aa02a
am: 4d813757c7

Change-Id: I1e9b8c713440aee1f4154554a9eb53665b7dab19

commit | commitdiff | tree

Jakub Pawlowski [Tue, 20 Jun 2017 01:54:51 +0000 (01:54 +0000)]

Merge "Remove legacy advertiser from map after it's no longer used" into oc-dev am: 271e0aa02a
am: 50bad313e4

Change-Id: I71c4dae7d7955a8676cec1d669dc2375fdcc03a0

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Adam Lesinski [Tue, 20 Jun 2017 01:27:35 +0000 (01:27 +0000)]

Merge "Fix potential race in Theme creation" into oc-dev am: b0a5fd0384 am: cfedad3c2f
am: 052b05f106

Change-Id: If6039a1870d44538e5d3c643d0c83766b1e8bcce

commit | commitdiff | tree

Adam Lesinski [Tue, 20 Jun 2017 01:23:49 +0000 (01:23 +0000)]

Merge "Fix potential race in Theme creation" into oc-dev am: b0a5fd0384 am: 185285592f
am: 4c07134a32

Change-Id: I425a1f59b1f08cee1afaa5f5ba1394deb6bb3b23

commit | commitdiff | tree

Adam Lesinski [Tue, 20 Jun 2017 01:22:35 +0000 (01:22 +0000)]

Merge "Fix potential race in Theme creation" into oc-dev am: b0a5fd0384
am: cfedad3c2f

Change-Id: I109d983b5fbcbbb7433ffc6cb00770211b25bbd1

commit | commitdiff | tree

Adam Lesinski [Tue, 20 Jun 2017 01:17:49 +0000 (01:17 +0000)]

Merge "Fix potential race in Theme creation" into oc-dev am: b0a5fd0384
am: 185285592f

Change-Id: I080662459cbf6eeca9c4d6e4e80459efcbf83258

commit | commitdiff | tree

Antony Sargent [Tue, 20 Jun 2017 01:15:08 +0000 (01:15 +0000)]

Merge "BT device renaming: move edit icon and add metrics proto" into oc-dr1-dev am: a4c07d7c09
am: 416b76b11d

Change-Id: Iec59deb3310c76ec7588bc8e21a46106048ec0d4

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Antony Sargent [Tue, 20 Jun 2017 01:07:31 +0000 (01:07 +0000)]

Merge "BT device renaming: move edit icon and add metrics proto" into oc-dr1-dev
am: a4c07d7c09

Change-Id: I5d2cb4923bc6b3e9bdcfbab0e7d4b55d9e312f32

commit | commitdiff | tree

Adam Lesinski [Tue, 20 Jun 2017 01:07:06 +0000 (01:07 +0000)]

Merge "Fix potential race in Theme creation" into oc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Felipe Leme [Tue, 20 Jun 2017 00:51:10 +0000 (00:51 +0000)]

Merge "Merge "Fixed updateAutofillValue() when mText is not set." into oc-dev am: 4eaba84065 am: 51ed7f4e6b" into oc-dr1-dev-plus-aosp
am: ee2e32af01

Change-Id: I95ec6a9141b270d15ae3ff240ddcd0122b1d103d

commit | commitdiff | tree

Felipe Leme [Tue, 20 Jun 2017 00:48:15 +0000 (00:48 +0000)]

Merge "Fixed updateAutofillValue() when mText is not set." into oc-dev am: 4eaba84065 am: b7e80c9350
am: 26474a4043

Change-Id: I7180414c0296c45852c63710021d8edc8ee11e83

commit | commitdiff | tree

Hugo Benichi [Tue, 20 Jun 2017 00:47:55 +0000 (00:47 +0000)]

Merge "DO NOT MERGE Instrument captive portal login activity"

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 20 Jun 2017 00:42:46 +0000 (00:42 +0000)]

Merge "Merge "Fixed updateAutofillValue() when mText is not set." into oc-dev am: 4eaba84065 am: 51ed7f4e6b" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Felipe Leme [Tue, 20 Jun 2017 00:41:56 +0000 (00:41 +0000)]

Merge "Fixed updateAutofillValue() when mText is not set." into oc-dev am: 4eaba84065
am: 51ed7f4e6b

Change-Id: Ia73ca585d85b071d77b1cd6efe31d1fcf8ce5381

commit | commitdiff | tree

Felipe Leme [Tue, 20 Jun 2017 00:40:26 +0000 (00:40 +0000)]

Merge "Fixed updateAutofillValue() when mText is not set." into oc-dev am: 4eaba84065
am: b7e80c9350

Change-Id: Ib6724e4d13dc9a0e29605513addd7c2f1591c3cc

commit | commitdiff | tree

Felipe Leme [Tue, 20 Jun 2017 00:36:12 +0000 (00:36 +0000)]

Merge "Fixed updateAutofillValue() when mText is not set." into oc-dev
am: 4eaba84065

Change-Id: I7603a791f8c149799a0adf9e0fe735483ce1be1a

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Tue, 20 Jun 2017 00:27:32 +0000 (00:27 +0000)]

Merge "Fixed updateAutofillValue() when mText is not set." into oc-dev

commit | commitdiff | tree

Dianne Hackborn [Tue, 20 Jun 2017 00:24:47 +0000 (00:24 +0000)]

Merge "Merge "Fix issue #62787070: restart due to NPE in JobServiceContext..." into oc-dev am: fa791d5e97 am: 3049791af6" into oc-dr1-dev-plus-aosp
am: 5a4f1bda89

Change-Id: Ib2b8faa2635d1dcccab49ecfcae9d8adf72bbe81

commit | commitdiff | tree

Dianne Hackborn [Tue, 20 Jun 2017 00:22:01 +0000 (00:22 +0000)]

Merge "Fix issue #62787070: restart due to NPE in JobServiceContext..." into oc-dev am: fa791d5e97 am: 93ae16db0f
am: 8d993ed1ed

Change-Id: Iea94adf289131ba919a7e56510fe407753a02764

commit | commitdiff | tree

Siarhei Vishniakou [Tue, 20 Jun 2017 00:19:44 +0000 (00:19 +0000)]

Merge "Merge "Revive DeadZone" into oc-dev am: b278424fa6 am: d37884a528" into oc-dr1-dev-plus-aosp
am: 4168e14a6b

Change-Id: If26d2208661b0438007f6e66ff3d3f0da37dbbc1

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 20 Jun 2017 00:15:17 +0000 (00:15 +0000)]

Merge "Merge "Fix issue #62787070: restart due to NPE in JobServiceContext..." into oc-dev am: fa791d5e97 am: 3049791af6" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Dianne Hackborn [Tue, 20 Jun 2017 00:13:15 +0000 (00:13 +0000)]

Merge "Fix issue #62787070: restart due to NPE in JobServiceContext..." into oc-dev am: fa791d5e97
am: 93ae16db0f

Change-Id: Iee3991ada4a776ce2f63853e3da49f5c712f06c3

commit | commitdiff | tree

Dianne Hackborn [Tue, 20 Jun 2017 00:13:03 +0000 (00:13 +0000)]

Merge "Fix issue #62787070: restart due to NPE in JobServiceContext..." into oc-dev am: fa791d5e97
am: 3049791af6

Change-Id: I365ad8998a11579b50f4a6b6b1ec3ec5f2e416d1

commit | commitdiff | tree

Siarhei Vishniakou [Tue, 20 Jun 2017 00:11:45 +0000 (00:11 +0000)]

Merge "Revive DeadZone" into oc-dev am: b278424fa6 am: 305fe47d65
am: d5c0ef9467

Change-Id: Iec82102d862097ef3242da9103996afe94f0909c

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 20 Jun 2017 00:09:01 +0000 (00:09 +0000)]

Merge "Merge "Revive DeadZone" into oc-dev am: b278424fa6 am: d37884a528" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Chet Haase [Tue, 20 Jun 2017 00:07:47 +0000 (00:07 +0000)]

Merge "Merge "Make --no-window-animation flag apply to animators, too" into oc-dev am: c36e3e7fff am: 97f7dbb004" into oc-dr1-dev-plus-aosp
am: 794296e7fd

Change-Id: I0bd0829f96cd8e47c81ea62e4ed2509f11a13213

commit | commitdiff | tree

Siarhei Vishniakou [Tue, 20 Jun 2017 00:06:11 +0000 (00:06 +0000)]

Merge "Revive DeadZone" into oc-dev am: b278424fa6
am: d37884a528

Change-Id: I4d9fcbd97aa09d15d8cd8b1f9ab515c3c53be077

commit | commitdiff | tree

Siarhei Vishniakou [Tue, 20 Jun 2017 00:06:08 +0000 (00:06 +0000)]

Merge "Revive DeadZone" into oc-dev am: b278424fa6
am: 305fe47d65

Change-Id: I1402412d130edc9ad32cc60c030c92711a487b96

commit | commitdiff | tree

Dianne Hackborn [Tue, 20 Jun 2017 00:03:54 +0000 (00:03 +0000)]

Merge "Fix issue #62787070: restart due to NPE in JobServiceContext..." into oc-dev
am: fa791d5e97

Change-Id: I399fdbe691b4d8a70fbc671e8f32fa842247d9df

commit | commitdiff | tree

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

commit | commitdiff | tree

Chet Haase [Tue, 20 Jun 2017 00:03:08 +0000 (00:03 +0000)]

Merge "Make --no-window-animation flag apply to animators, too" into oc-dev am: c36e3e7fff am: 972734f592
am: 470105042e

Change-Id: Iabf6f31f4bf9c3e7ed382d19ac2c93c29fbd2651

commit | commitdiff | tree

Wale Ogunwale [Tue, 20 Jun 2017 00:01:00 +0000 (00:01 +0000)]

Merge "Merge "Added back removed ctor from DisplayEventReceiver" into oc-dev am: 113918f309 am: 22765d383a" into oc-dr1-dev-plus-aosp
am: 1947c0a8fb

Change-Id: I1519583d4633c5da41a9e70587c815012a096162

commit | commitdiff | tree

Siarhei Vishniakou [Mon, 19 Jun 2017 23:59:46 +0000 (23:59 +0000)]

Merge "Revive DeadZone" into oc-dev
am: b278424fa6

Change-Id: I5a06302eaad1e955aaea6ae8d2785c0b12e53cc4

commit | commitdiff | tree

Siarhei Vishniakou [Mon, 19 Jun 2017 23:58:04 +0000 (23:58 +0000)]

Merge "Revive DeadZone" into oc-dev
am: b278424fa6

Change-Id: Ib4388b31d3b636826c428a89389585ae5b9cb25e

commit | commitdiff | tree

Wale Ogunwale [Mon, 19 Jun 2017 23:57:42 +0000 (23:57 +0000)]

Merge "Added back removed ctor from DisplayEventReceiver" into oc-dev am: 113918f309 am: f4dc128aa2
am: c8f7cb6be7

Change-Id: I8355dfd4c6c3adb2fd34a01fb4a9b828f735788f

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 19 Jun 2017 23:49:25 +0000 (23:49 +0000)]

Merge "Merge "Make --no-window-animation flag apply to animators, too" into oc-dev am: c36e3e7fff am: 97f7dbb004" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Siarhei Vishniakou [Mon, 19 Jun 2017 23:47:48 +0000 (23:47 +0000)]

Merge "Revive DeadZone" into oc-dev

commit | commitdiff | tree

Chet Haase [Mon, 19 Jun 2017 23:47:17 +0000 (23:47 +0000)]

Merge "Make --no-window-animation flag apply to animators, too" into oc-dev am: c36e3e7fff
am: 972734f592

Change-Id: I02666e4918b849cf4bcc119a61b4b693825dabe2

commit | commitdiff | tree

Chet Haase [Mon, 19 Jun 2017 23:46:53 +0000 (23:46 +0000)]

Merge "Make --no-window-animation flag apply to animators, too" into oc-dev am: c36e3e7fff
am: 97f7dbb004

Change-Id: I8ad8f455a430b7230f9f83dc5b0967db4a540e87

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 19 Jun 2017 23:43:42 +0000 (23:43 +0000)]

Merge "Merge "Added back removed ctor from DisplayEventReceiver" into oc-dev am: 113918f309 am: 22765d383a" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Wale Ogunwale [Mon, 19 Jun 2017 23:41:36 +0000 (23:41 +0000)]

Merge "Added back removed ctor from DisplayEventReceiver" into oc-dev am: 113918f309
am: 22765d383a

Change-Id: I78669da1158fca8ca7276aeb0a09715d4452d737

commit | commitdiff | tree

Chet Haase [Mon, 19 Jun 2017 23:39:58 +0000 (23:39 +0000)]

Merge "Make --no-window-animation flag apply to animators, too" into oc-dev
am: c36e3e7fff

Change-Id: Ic680329647398f52a0d28633aa209e37556c1e31

commit | commitdiff | tree

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

commit | commitdiff | tree

Wale Ogunwale [Mon, 19 Jun 2017 23:39:48 +0000 (23:39 +0000)]

Merge "Added back removed ctor from DisplayEventReceiver" into oc-dev am: 113918f309
am: f4dc128aa2

Change-Id: I52603e6bff98472c5dc6e6e5308d6beb76e7780e

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Wale Ogunwale [Mon, 19 Jun 2017 23:27:57 +0000 (23:27 +0000)]

Merge "Added back removed ctor from DisplayEventReceiver" into oc-dev
am: 113918f309

Change-Id: I655721c29b22da375742628a9e7b8b3075b2dd27