Android Build Merger (Role)
efdfa4daae
Merge "Merge "Do not call onConfigurationChanged for appBound position changes." into oc-dr1-dev am: 33d4702a12 am: 69aac0a7b6" into oc-mr1-dev-plus-aosp
2017-07-31 18:56:43 +00:00
Bryce Lee
9821f406d1
Merge "Do not call onConfigurationChanged for appBound position changes." into oc-dr1-dev am: 33d4702a12
...
am: 69aac0a7b6
2017-07-31 18:54:47 +00:00
Bryce Lee
94795bcaf8
Merge "Do not call onConfigurationChanged for appBound position changes." into oc-dr1-dev am: 33d4702a12
...
am: 05865fb40a
2017-07-31 18:53:39 +00:00
Bryce Lee
05865fb40a
Merge "Do not call onConfigurationChanged for appBound position changes." into oc-dr1-dev
...
am: 33d4702a12
2017-07-31 18:46:20 +00:00
Bryce Lee
69aac0a7b6
Merge "Do not call onConfigurationChanged for appBound position changes." into oc-dr1-dev
...
am: 33d4702a12
2017-07-31 18:45:19 +00:00
Seigo Nonaka
0494dc5d17
Merge "Stop font loading with restricted context." into oc-mr1-dev
...
am: 06ba486a74
2017-07-31 18:36:49 +00:00
Bryce Lee
33d4702a12
Merge "Do not call onConfigurationChanged for appBound position changes." into oc-dr1-dev
2017-07-31 18:32:30 +00:00
TreeHugger Robot
06ba486a74
Merge "Stop font loading with restricted context." into oc-mr1-dev
2017-07-31 18:23:04 +00:00
Makoto Onuki
bc939bbe7c
Merge "Reduce duplicate strings due to the package cache." into oc-mr1-dev
...
am: bb77e6c689
2017-07-31 18:03:17 +00:00
TreeHugger Robot
bb77e6c689
Merge "Reduce duplicate strings due to the package cache." into oc-mr1-dev
2017-07-31 17:52:41 +00:00
Steven Moreland
8ca301dc61
SurfaceTexture.cpp: use proper nativehelper headers am: f53501098c am: a3ca9caf46
...
am: a862715976
2017-07-31 17:00:59 +00:00
Android Build Merger (Role)
f8a95c8c0c
Merge "Merge "WakeAndUnlock: Make sure blanking is never animated" into oc-dr1-dev am: cbab3edc3e am: 0cd8a31c12" into oc-mr1-dev-plus-aosp
2017-07-31 16:57:19 +00:00
Steven Moreland
a862715976
SurfaceTexture.cpp: use proper nativehelper headers am: f53501098c
...
am: a3ca9caf46
2017-07-31 16:55:02 +00:00
Adrian Roos
dca692c68f
Merge "WakeAndUnlock: Make sure blanking is never animated" into oc-dr1-dev am: cbab3edc3e
...
am: 3bc413bca8
2017-07-31 16:55:01 +00:00
Adrian Roos
66fb81fb95
Merge "WakeAndUnlock: Make sure blanking is never animated" into oc-dr1-dev am: cbab3edc3e
...
am: 0cd8a31c12
2017-07-31 16:54:59 +00:00
Adrian Roos
3bc413bca8
Merge "WakeAndUnlock: Make sure blanking is never animated" into oc-dr1-dev
...
am: cbab3edc3e
2017-07-31 16:48:44 +00:00
Adrian Roos
0cd8a31c12
Merge "WakeAndUnlock: Make sure blanking is never animated" into oc-dr1-dev
...
am: cbab3edc3e
2017-07-31 16:48:34 +00:00
Steven Moreland
a3ca9caf46
SurfaceTexture.cpp: use proper nativehelper headers
...
am: f53501098c
2017-07-31 16:48:25 +00:00
TreeHugger Robot
cbab3edc3e
Merge "WakeAndUnlock: Make sure blanking is never animated" into oc-dr1-dev
2017-07-31 16:43:07 +00:00
Steven Moreland
f53501098c
SurfaceTexture.cpp: use proper nativehelper headers
...
libnativehelper exports headers under nativehelper. These were
available before incorrectly as global headers in order to give
access to jni.h.
Test: SurfaceTexture.cpp finds headers
Bug: 63762847
Change-Id: I3ec1b888c226c2894649d9f9a8f8203891c1ab02
(cherry picked from commit 849252c469
2017-07-31 16:41:45 +00:00
Bryce Lee
658d984f04
Do not call onConfigurationChanged for appBound position changes.
...
Since appBounds encodes both dimensions and positions, movement will
cause a diff change. This happens in situations where the dimensions
stay constant, such as dragging a PiP window around.
To avoid flooding the client side with configuration changes, this CL
checks whether the new configuration is equivalent to the existing
configuration with the exception of the position of the appBounds
before sending to the registered callbacks.
Change-Id: I8fbc94458fd9ed3b39494c3587f25e704ec02a7d
Fixes: 63927944
Test: bit FrameworksServicesTests:com.android.server.wm.AppBoundsTests
Test: go/wm-smoke
2017-07-31 08:46:00 -07:00
Selim Gurun
e8315ab4d7
Merge "Update documentation for Whitelist API" into oc-mr1-dev
...
am: a30ec5ff4c
2017-07-31 14:35:22 +00:00
Selim Gurun
a30ec5ff4c
Merge "Update documentation for Whitelist API" into oc-mr1-dev
2017-07-31 14:27:52 +00:00
Adrian Roos
e06956e5cd
WakeAndUnlock: Make sure blanking is never animated
...
Fixes an issue where instead of immediately blanking the screen upon
authenticating via fingerprint we animated to blank because another
animating transition was requested at the same time.
Change-Id: I141079c0d4de1776c8328057d364eeb0964eebaf
Fixes: 64080116
Test: Unlock via fingerprint a lot. Verify no flicker.
2017-07-31 15:56:24 +02:00
Neil Fuller
2d196d97f6
Merge "Remove redundant TODOs from PackageTracker" am: 01d686b85e am: b65356709e am: 452dcfce41
...
am: 9fadf818c6
2017-07-31 13:29:53 +00:00
Neil Fuller
9fadf818c6
Merge "Remove redundant TODOs from PackageTracker" am: 01d686b85e am: b65356709e
...
am: 452dcfce41
2017-07-31 13:21:41 +00:00
Neil Fuller
452dcfce41
Merge "Remove redundant TODOs from PackageTracker" am: 01d686b85e
...
am: b65356709e
2017-07-31 13:06:44 +00:00
Neil Fuller
b65356709e
Merge "Remove redundant TODOs from PackageTracker"
...
am: 01d686b85e
2017-07-31 13:00:50 +00:00
Neil Fuller
01d686b85e
Merge "Remove redundant TODOs from PackageTracker"
2017-07-31 12:51:05 +00:00
Android Build Merger (Role)
ea3602d912
Merge "Merge "AOD: When prox covered disable touch during pulse instead of aborting" into oc-dr1-dev am: 3cace2a148 am: 86e49f224c" into oc-mr1-dev-plus-aosp
2017-07-31 12:44:38 +00:00
Adrian Roos
5b69ea4b1a
Merge "AOD: When prox covered disable touch during pulse instead of aborting" into oc-dr1-dev am: 3cace2a148
...
am: 86e49f224c
2017-07-31 12:42:17 +00:00
Adrian Roos
1ad4226687
Merge "AOD: When prox covered disable touch during pulse instead of aborting" into oc-dr1-dev am: 3cace2a148
...
am: 13b17b2990
2017-07-31 12:42:13 +00:00
Adrian Roos
86e49f224c
Merge "AOD: When prox covered disable touch during pulse instead of aborting" into oc-dr1-dev
...
am: 3cace2a148
2017-07-31 12:36:21 +00:00
Adrian Roos
13b17b2990
Merge "AOD: When prox covered disable touch during pulse instead of aborting" into oc-dr1-dev
...
am: 3cace2a148
2017-07-31 12:36:20 +00:00
Adrian Roos
3cace2a148
Merge "AOD: When prox covered disable touch during pulse instead of aborting" into oc-dr1-dev
2017-07-31 12:29:44 +00:00
Yohei Yukawa
5eca35d4a0
Merge "Remove a compat hack SurfaceView#setWindowType()" into oc-mr1-dev
...
am: f678eaad89
2017-07-31 07:15:26 +00:00
TreeHugger Robot
f678eaad89
Merge "Remove a compat hack SurfaceView#setWindowType()" into oc-mr1-dev
2017-07-31 07:08:08 +00:00
Bill Yi
fdcf37ea65
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 273bb516ad -s ours
...
am: b10ffae3cb
2017-07-31 06:15:13 +00:00
Bill Yi
609ab0e930
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 273bb516ad -s ours
...
am: 9640d57039
2017-07-31 06:12:15 +00:00
Bill Yi
b10ffae3cb
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: 273bb516ad
2017-07-31 06:06:17 +00:00
Bill Yi
c695304e37
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: 98a98d4cb9
2017-07-31 06:06:14 +00:00
Bill Yi
9640d57039
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: 273bb516ad
2017-07-31 06:06:13 +00:00
TreeHugger Robot
98a98d4cb9
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
2017-07-31 06:00:50 +00:00
TreeHugger Robot
273bb516ad
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
2017-07-31 05:59:57 +00:00
Yohei Yukawa
7a1ad6d97c
Remove a compat hack SurfaceView#setWindowType()
...
This CL logically reverts a compatibility hack I introduced [1] for
apps that had relied on @hide method SurfaceView#setWindowType(int).
[1]: I5217f6417a73690ae8a978754218b7b089070fdd
3b5011afc9
2017-07-30 20:54:08 -07:00
Hugo Benichi
ff07ff8e25
Merge "Logging improvements when NetworkCapabilities change" am: f60a38e152 am: bdfb4ee19c am: 88a572da7d -s ours
...
am: 5946442f8e
2017-07-31 02:13:17 +00:00
Hugo Benichi
5946442f8e
Merge "Logging improvements when NetworkCapabilities change" am: f60a38e152 am: bdfb4ee19c
...
am: 88a572da7d
2017-07-31 02:07:12 +00:00
Hugo Benichi
88a572da7d
Merge "Logging improvements when NetworkCapabilities change" am: f60a38e152
...
am: bdfb4ee19c
2017-07-31 01:58:33 +00:00
Hugo Benichi
bdfb4ee19c
Merge "Logging improvements when NetworkCapabilities change"
...
am: f60a38e152
2017-07-31 01:50:38 +00:00
pkanwar
5a2b73b288
Add string needed to support carrier wifi in UI.
...
am: bf7ceec031
2017-07-31 01:44:09 +00:00
