OSDN Git Service
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
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
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
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
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
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
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: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
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
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
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
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
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:11:19 +0000 (01:11 +0000)]
Merge "Fix potential race in Theme creation" into oc-dev
am:
b0a5fd0384
Change-Id: I964d23b0daad2326989ece5f8ffc086b6286cb44
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
Adam Lesinski [Tue, 20 Jun 2017 01:07:06 +0000 (01:07 +0000)]
Merge "Fix potential race in Theme creation" into oc-dev
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
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
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
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
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
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
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
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: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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Siarhei Vishniakou [Mon, 19 Jun 2017 23:59:46 +0000 (23:59 +0000)]
Merge "Revive DeadZone" into oc-dev
am:
b278424fa6
Change-Id: I5a06302eaad1e955aaea6ae8d2785c0b12e53cc4
Siarhei Vishniakou [Mon, 19 Jun 2017 23:58:04 +0000 (23:58 +0000)]
Merge "Revive DeadZone" into oc-dev
am:
b278424fa6
Change-Id: Ib4388b31d3b636826c428a89389585ae5b9cb25e
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
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
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
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: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
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
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
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
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
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
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
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
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
TreeHugger Robot [Mon, 19 Jun 2017 23:16:14 +0000 (23:16 +0000)]
Merge "Added back removed ctor from DisplayEventReceiver" into oc-dev
Fan Zhang [Mon, 19 Jun 2017 22:44:25 +0000 (22:44 +0000)]
Merge "Add logging constant for wifi tether setting page." into oc-dr1-dev am:
610e7400d7
am:
6cc1c80e48
Change-Id: I221d526de6a10db8171c97d4d185f58e0564f0e7
Antony Sargent [Fri, 16 Jun 2017 18:50:13 +0000 (11:50 -0700)]
BT device renaming: move edit icon and add metrics proto
On the bluetooth device details page, we need to have a dialog for editing
the display name of a paired device. This change moves the icon we need for
the menu item that launches the dialoge from SystemUI to SettingsLib (so we
can then use it in packages/apps/Settings), and also adds a metrics proto
entry to be used when the dialog is opened.
Bug:
62535241
Test: should be covered by existing tests
Change-Id: I63973e59cbd2eeac9bea04f66588f4e0b0254785
Fan Zhang [Mon, 19 Jun 2017 22:39:35 +0000 (22:39 +0000)]
Merge "Add logging constant for wifi tether setting page." into oc-dr1-dev
am:
610e7400d7
Change-Id: I23b56c2abf0108fbc197777eb209ec6eb29c5fce
Andreas Huber [Mon, 19 Jun 2017 22:38:30 +0000 (22:38 +0000)]
Merge "Add an extra level of indirection to make sure that native IHwBinder" am:
b6dde12ef0 am:
e7191f50b5 am:
0cf0b39360
am:
55e11802c5
Change-Id: I9f25941250c6e8a10d75aad9ca4549d2f1439fad
Eugene Susla [Mon, 19 Jun 2017 22:29:51 +0000 (22:29 +0000)]
Merge "Merge "[Companion] Fix NPE in associate" into oc-dev am:
ba003a97f8 am:
5cb26b76ff" into oc-dr1-dev-plus-aosp
am:
0698755ca0
Change-Id: Idebce0cb669bd8971f84c563a4326648e093db3c
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
TreeHugger Robot [Mon, 19 Jun 2017 22:27:47 +0000 (22:27 +0000)]
Merge "Add logging constant for wifi tether setting page." into oc-dr1-dev
Eugene Susla [Mon, 19 Jun 2017 22:27:29 +0000 (22:27 +0000)]
Merge "[Companion] Fix NPE in associate" into oc-dev am:
ba003a97f8 am:
c675cf85a7
am:
57f0a63099
Change-Id: I0aaa661d72101214e10f5af7db3736a915a93a33
Andreas Huber [Mon, 19 Jun 2017 22:26:46 +0000 (22:26 +0000)]
Merge "Add an extra level of indirection to make sure that native IHwBinder" am:
b6dde12ef0 am:
e7191f50b5
am:
0cf0b39360
Change-Id: Id47548cd4209bd7d4d0ede478fd5372d31c22a36
TreeHugger Robot [Mon, 19 Jun 2017 22:22:26 +0000 (22:22 +0000)]
Merge "Don't lock database when token is read from customToken cache in AccountManagerService."
Andreas Huber [Mon, 19 Jun 2017 22:19:55 +0000 (22:19 +0000)]
Merge "Add an extra level of indirection to make sure that native IHwBinder" am:
b6dde12ef0
am:
e7191f50b5
Change-Id: If9c376697a638523f6b691fa37d9cfb73fc8e20d
TreeHugger Robot [Mon, 19 Jun 2017 22:17:53 +0000 (22:17 +0000)]
Merge "Correct lastId on onCreate with unexpected state"
Android Build Merger (Role) [Mon, 19 Jun 2017 22:16:35 +0000 (22:16 +0000)]
Merge "Merge "[Companion] Fix NPE in associate" into oc-dev am:
ba003a97f8 am:
5cb26b76ff" into oc-dr1-dev-plus-aosp
Eugene Susla [Mon, 19 Jun 2017 22:13:51 +0000 (22:13 +0000)]
Merge "[Companion] Fix NPE in associate" into oc-dev am:
ba003a97f8
am:
5cb26b76ff
Change-Id: Ie3c2e7154357a51b4947c807347650456297d81d
Eugene Susla [Mon, 19 Jun 2017 22:13:44 +0000 (22:13 +0000)]
Merge "[Companion] Fix NPE in associate" into oc-dev am:
ba003a97f8
am:
c675cf85a7
Change-Id: Id86e6703dfc57705b361adf66da9f852498b32ea
Andreas Huber [Mon, 19 Jun 2017 22:07:45 +0000 (22:07 +0000)]
Merge "Add an extra level of indirection to make sure that native IHwBinder"
am:
b6dde12ef0
Change-Id: I342d0d1a09ed1677b7619df7df033471b48c937a
TreeHugger Robot [Mon, 19 Jun 2017 22:03:05 +0000 (22:03 +0000)]
Merge "AAPT2: Read config from disk"
Eugene Susla [Mon, 19 Jun 2017 22:02:14 +0000 (22:02 +0000)]
Merge "[Companion] Fix NPE in associate" into oc-dev
am:
ba003a97f8
Change-Id: Ib65cfee5e317b03ce57dc4cc695241dc62aaf282
Eugene Susla [Mon, 19 Jun 2017 22:02:13 +0000 (22:02 +0000)]
Merge "[Companion] Fix NPE in associate" into oc-dev
am:
ba003a97f8
Change-Id: I690b6d88bcce507d7fbae855cd9939616ac86212
Treehugger Robot [Mon, 19 Jun 2017 21:55:04 +0000 (21:55 +0000)]
Merge "Add an extra level of indirection to make sure that native IHwBinder"
TreeHugger Robot [Mon, 19 Jun 2017 21:52:14 +0000 (21:52 +0000)]
Merge "[Companion] Fix NPE in associate" into oc-dev
Vladislav Kaznacheev [Mon, 19 Jun 2017 21:40:13 +0000 (21:40 +0000)]
Merge "Merge "Do not update currently open tooltip." into oc-dev am:
139dbe5c1c am:
2102c3211c" into oc-dr1-dev-plus-aosp
am:
33fee82777
Change-Id: I5650f26634c5dbeecea485782d9451315f96bcaf
Vladislav Kaznacheev [Mon, 19 Jun 2017 21:37:31 +0000 (21:37 +0000)]
Merge "Do not update currently open tooltip." into oc-dev am:
139dbe5c1c am:
3fd4215760
am:
6063096518
Change-Id: I5e7b6742544a5db4266e95be0ce01830ea62cd92
Dianne Hackborn [Mon, 19 Jun 2017 21:24:51 +0000 (14:24 -0700)]
Fix issue #
62787070: restart due to NPE in JobServiceContext...
...handleOpTimeoutLocked
Don't try to print the running job if it is null.
Also, the timeout message should be scheduled with the actually
running job it is for, so we can ignore it if we happen to
dispatch one after the job is over.
Test: bit CtsJobSchedulerTestCases:*
Change-Id: I7bc55f55da645a9e116d3f0ee02f2ee115383ea9
Android Build Merger (Role) [Mon, 19 Jun 2017 21:26:50 +0000 (21:26 +0000)]
Merge "Merge "Do not update currently open tooltip." into oc-dev am:
139dbe5c1c am:
2102c3211c" into oc-dr1-dev-plus-aosp
Vladislav Kaznacheev [Mon, 19 Jun 2017 21:24:53 +0000 (21:24 +0000)]
Merge "Do not update currently open tooltip." into oc-dev am:
139dbe5c1c
am:
2102c3211c
Change-Id: I9b58eaa8864140423fbc498b6a32f9ca01082a32
Vladislav Kaznacheev [Mon, 19 Jun 2017 21:24:11 +0000 (21:24 +0000)]
Merge "Do not update currently open tooltip." into oc-dev am:
139dbe5c1c
am:
3fd4215760
Change-Id: I4b9674e73830462bbe9288ebfa1bbac89af860b3
Romain Guy [Mon, 19 Jun 2017 21:14:29 +0000 (21:14 +0000)]
Merge "Merge "Add support for RGBA_F16 readbacks" into oc-dr1-dev am:
43e02a3ec5" into oc-dr1-dev-plus-aosp
am:
375206c86d
Change-Id: I920cea7cedfd1a91ce7cdaf8d89c3ad45884b030
Vladislav Kaznacheev [Mon, 19 Jun 2017 21:12:45 +0000 (21:12 +0000)]
Merge "Do not update currently open tooltip." into oc-dev
am:
139dbe5c1c
Change-Id: Ia3fc1f16e71a4a12a0a84704b7ca7a9d2ec33514
Vladislav Kaznacheev [Mon, 19 Jun 2017 21:12:41 +0000 (21:12 +0000)]
Merge "Do not update currently open tooltip." into oc-dev
am:
139dbe5c1c
Change-Id: Ia0b5b2c7ee9dc8a0cc975562de350ac0ff4a0449
Dan Sandler [Mon, 19 Jun 2017 21:11:58 +0000 (21:11 +0000)]
Merge "Merge "Reduce no-op notification log messages." into oc-dev am:
5e3fb57af8 am:
1ba4f0e1da" into oc-dr1-dev-plus-aosp
am:
3a2b90da20
Change-Id: I1665e5bc17bfdf9f14260b27613c968ac30fb311
Dan Sandler [Mon, 19 Jun 2017 21:07:18 +0000 (21:07 +0000)]
Merge "Reduce no-op notification log messages." into oc-dev am:
5e3fb57af8 am:
0346448a46
am:
1f2194c838
Change-Id: Id354e4e5868240ce87fabd57747b98381aef81f4
Siarhei Vishniakou [Sat, 3 Jun 2017 00:20:34 +0000 (17:20 -0700)]
Revive DeadZone
Override dispatchTouchEvent for the root FrameLayout
of NavigationBar to process ACTION_OUTSIDE MotionEvents
and dispatch directly to DeadZone to keep track of the
most recent outside tap.
Clarified documentation of ACTION_OUTSIDE behaviour.
Bug:
37552674
Test: open IME, tap any key, then quickly tap on top half
of the home button. The home button tap is ignored
and device does not go to homescreen.
Change-Id: Icb5cf6c76959f3514b8b94c09e38cc5434f31b23
TreeHugger Robot [Mon, 19 Jun 2017 21:01:42 +0000 (21:01 +0000)]
Merge "Do not update currently open tooltip." into oc-dev
Android Build Merger (Role) [Mon, 19 Jun 2017 21:00:56 +0000 (21:00 +0000)]
Merge "Merge "Add support for RGBA_F16 readbacks" into oc-dr1-dev am:
43e02a3ec5" into oc-dr1-dev-plus-aosp
Romain Guy [Mon, 19 Jun 2017 21:00:04 +0000 (21:00 +0000)]
Merge "Add support for RGBA_F16 readbacks" into oc-dr1-dev
am:
43e02a3ec5
Change-Id: I074555de516f6c59cd09db9cff8ece870b640844
Android Build Merger (Role) [Mon, 19 Jun 2017 20:59:35 +0000 (20:59 +0000)]
Merge "Merge "Reduce no-op notification log messages." into oc-dev am:
5e3fb57af8 am:
1ba4f0e1da" into oc-dr1-dev-plus-aosp
Dan Sandler [Mon, 19 Jun 2017 20:58:43 +0000 (20:58 +0000)]
Merge "Reduce no-op notification log messages." into oc-dev am:
5e3fb57af8
am:
1ba4f0e1da
Change-Id: I1b6fcf9847da63820c8a038ab6b13ed7b89da0d2
Dan Sandler [Mon, 19 Jun 2017 20:56:24 +0000 (20:56 +0000)]
Merge "Reduce no-op notification log messages." into oc-dev am:
5e3fb57af8
am:
0346448a46
Change-Id: Ib361e9e63dae3b0f163f800af8995762070d8c60
Wale Ogunwale [Mon, 19 Jun 2017 20:53:32 +0000 (13:53 -0700)]
Added back removed ctor from DisplayEventReceiver
...because some app can't help but access hidden APIs...
Test: builds
Change-Id: Ia1d4a71b46a53b44e3ebe5844e446009785a90ac
Fixes:
62719884
Hall Liu [Mon, 19 Jun 2017 20:53:17 +0000 (20:53 +0000)]
Merge changes from topics 'embms-init-fix', 'embms-download-2' am:
e601160a96 am:
d974296f8c am:
b5475ab595
am:
1a47b93423
Change-Id: Ic67525d9ffe4074f981bb2832ddc9226ce19e5e2
OSDN Git Service
