OSDN Git Service
Android Build Merger (Role) [Tue, 1 Aug 2017 15:18:48 +0000 (15:18 +0000)]
Merge "Merge "power: gps: add gps read timeout" into cw-f-dev am:
33676dddbd am:
b5da08a276 am:
d88f4b723d am:
cd68805540" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 1 Aug 2017 15:17:25 +0000 (15:17 +0000)]
Merge "Merge "power: gps: add gps read timeout" into cw-f-dev am:
33676dddbd am:
b5da08a276 am:
d88f4b723d am:
5e76d54639" into oc-dr1-dev-plus-aosp
Maggie Lee [Tue, 1 Aug 2017 15:16:45 +0000 (15:16 +0000)]
Merge "power: gps: add gps read timeout" into cw-f-dev am:
33676dddbd am:
b5da08a276 am:
d88f4b723d
am:
cd68805540
Change-Id: Iaf585d7d9489cc35b834b6907232ad9dd3185ec7
Maggie Lee [Tue, 1 Aug 2017 15:14:56 +0000 (15:14 +0000)]
Merge "power: gps: add gps read timeout" into cw-f-dev am:
33676dddbd am:
b5da08a276 am:
d88f4b723d
am:
5e76d54639
Change-Id: Ia8c8aa458f3b8e57eaa7253fe87bad1efe5e23c9
Andriy Naborskyy [Tue, 1 Aug 2017 15:13:27 +0000 (15:13 +0000)]
Merge changes I49a76582,Iac4b75bc into cw-f-dev am:
f18599a15b am:
9295f58d26 am:
502986f72a
am:
5223106231
Change-Id: I87ec29fb8b0ec5f61841b0596f0628d1e6cb0c71
Hugo Benichi [Tue, 1 Aug 2017 15:12:15 +0000 (15:12 +0000)]
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am:
456b91561d -s ours am:
ff55799950 -s ours am:
17e2448c26 -s ours
am:
0dbabf02f2 -s ours
Change-Id: Ie1a18b001d85450f6458f33b75b0f2f3965a81a9
Andriy Naborskyy [Tue, 1 Aug 2017 15:04:35 +0000 (15:04 +0000)]
Merge changes I49a76582,Iac4b75bc into cw-f-dev am:
f18599a15b am:
9295f58d26 am:
502986f72a
am:
257910c493
Change-Id: I413cdc0d2075cbad6f5409318ad58e394733a5e3
Maggie Lee [Tue, 1 Aug 2017 15:03:39 +0000 (15:03 +0000)]
Merge "power: gps: add gps read timeout" into cw-f-dev am:
33676dddbd am:
b5da08a276
am:
d88f4b723d
Change-Id: I63d677df2353fff2d2e786e25b0dc416837f1581
Hugo Benichi [Tue, 1 Aug 2017 15:03:31 +0000 (15:03 +0000)]
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am:
456b91561d -s ours am:
ff55799950 -s ours am:
17e2448c26 -s ours
am:
7cf8e71e33 -s ours
Change-Id: Idf2184eb808068366384031694c7fa89fe49c8bb
Maggie Lee [Tue, 1 Aug 2017 15:02:00 +0000 (15:02 +0000)]
Merge "power: gps: add gps read timeout" into cw-f-dev am:
33676dddbd am:
b5da08a276
am:
d88f4b723d
Change-Id: I538ec037d1eb1b2ef8970d527a2d9aa53fd7fad8
Andriy Naborskyy [Tue, 1 Aug 2017 14:56:23 +0000 (14:56 +0000)]
Merge changes I49a76582,Iac4b75bc into cw-f-dev am:
f18599a15b am:
9295f58d26
am:
502986f72a
Change-Id: Ic615cfdefcf6a226c868e9203e74070e9000a931
Hugo Benichi [Tue, 1 Aug 2017 14:55:26 +0000 (14:55 +0000)]
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am:
456b91561d -s ours am:
ff55799950 -s ours
am:
17e2448c26 -s ours
Change-Id: Ia38655a26410e9ea78e394e5c59e052739f041a6
Andriy Naborskyy [Tue, 1 Aug 2017 14:52:13 +0000 (14:52 +0000)]
Merge changes I49a76582,Iac4b75bc into cw-f-dev am:
f18599a15b am:
9295f58d26
am:
502986f72a
Change-Id: Idae1def3c8dc80d7f5e3cd83438553cf099541a7
Hugo Benichi [Tue, 1 Aug 2017 14:50:36 +0000 (14:50 +0000)]
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am:
456b91561d -s ours am:
ff55799950 -s ours
am:
17e2448c26 -s ours
Change-Id: Idc2217a66f60caa783957fd6caeaafa1ff1615bc
Maggie Lee [Tue, 1 Aug 2017 14:47:57 +0000 (14:47 +0000)]
Merge "power: gps: add gps read timeout" into cw-f-dev am:
33676dddbd
am:
b5da08a276
Change-Id: I5d96dd73affe79880583347e32a95be8510a5462
Andriy Naborskyy [Tue, 1 Aug 2017 14:38:26 +0000 (14:38 +0000)]
Merge changes I49a76582,Iac4b75bc into cw-f-dev am:
f18599a15b
am:
9295f58d26
Change-Id: Ifd70690f5e275e89d59a15134427e2bcc91e67c7
Maggie Lee [Tue, 1 Aug 2017 14:37:40 +0000 (14:37 +0000)]
Merge "power: gps: add gps read timeout" into cw-f-dev
am:
33676dddbd
Change-Id: I7e3a779631c2de4a14521c8dac6d5b2d96ce1b29
Hugo Benichi [Tue, 1 Aug 2017 14:37:06 +0000 (14:37 +0000)]
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am:
456b91561d -s ours
am:
ff55799950 -s ours
Change-Id: I6d788c5b7cd5c6877799e5a3e0ad865996147b70
Maggie Lee [Tue, 1 Aug 2017 14:31:23 +0000 (14:31 +0000)]
Merge "power: gps: add gps read timeout" into cw-f-dev
Andriy Naborskyy [Tue, 1 Aug 2017 14:30:05 +0000 (14:30 +0000)]
Merge changes I49a76582,Iac4b75bc into cw-f-dev
am:
f18599a15b
Change-Id: Ib1f6b94a4970bbec28d6bbc7de8969c9d5d3975f
Hugo Benichi [Tue, 1 Aug 2017 14:30:02 +0000 (14:30 +0000)]
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler
am:
456b91561d -s ours
Change-Id: Ie54e0712dc83514ff3ddcd6cee1b0bd2e80c73ad
Andriy Naborskyy [Tue, 1 Aug 2017 14:16:30 +0000 (14:16 +0000)]
Merge changes I49a76582,Iac4b75bc into cw-f-dev
* changes:
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler
DO NOT MERGE ANYWHERE ConnectivityService: safer locking
Geoffrey Pitsch [Tue, 1 Aug 2017 14:08:36 +0000 (14:08 +0000)]
Merge "Disable AOD when accessibility color inversion is on." into oc-dr1-dev
am:
861b35e1df
Change-Id: I4ee3ad06138a66b47bca6e56fbbd0bd970d91e08
Geoffrey Pitsch [Tue, 1 Aug 2017 14:00:22 +0000 (14:00 +0000)]
Merge "Disable AOD when accessibility color inversion is on." into oc-dr1-dev
Bill Yi [Tue, 1 Aug 2017 07:41:01 +0000 (07:41 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
7eca0300b9 -s ours
Change-Id: I0a52d4ad04ee589d80dd34f218eba693097aa979
TreeHugger Robot [Tue, 1 Aug 2017 07:32:58 +0000 (07:32 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Yohei Yukawa [Tue, 1 Aug 2017 06:11:09 +0000 (06:11 +0000)]
Merge "Fine-tune the condition to hide IME switcher" into oc-dr1-dev
am:
dbd60cd6ee
Change-Id: I919a34c60181f4582992d4d7bf7838b66051b39d
Yohei Yukawa [Tue, 1 Aug 2017 06:01:20 +0000 (06:01 +0000)]
Merge "Fine-tune the condition to hide IME switcher" into oc-dr1-dev
Bill Yi [Tue, 1 Aug 2017 02:03:43 +0000 (19:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idd7fe75cda287243462dc045eff8f3ab2511bd47
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Tyler Freeman [Tue, 1 Aug 2017 01:59:43 +0000 (01:59 +0000)]
Merge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into cw-f-dev am:
a053eaa841 -s ours am:
65d806d043 -s ours am:
6b2d37ca25 -s ours
am:
a4f4b537cc -s ours
Change-Id: If1975f1c4897032e473da9c1ee67df8035d2d399
Tyler Freeman [Tue, 1 Aug 2017 01:53:40 +0000 (01:53 +0000)]
Merge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into cw-f-dev am:
a053eaa841 -s ours am:
65d806d043 -s ours am:
6b2d37ca25 -s ours
am:
1831989a6e -s ours
Change-Id: I73c6844270e95d54307335418f4bfd2a0098aade
Tyler Freeman [Tue, 1 Aug 2017 01:49:11 +0000 (01:49 +0000)]
Merge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into cw-f-dev am:
a053eaa841 -s ours am:
65d806d043 -s ours
am:
6b2d37ca25 -s ours
Change-Id: I4b52d3a68a38bb67cc67a99aad4f13ae6ae906bb
Tyler Freeman [Tue, 1 Aug 2017 01:41:18 +0000 (01:41 +0000)]
Merge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into cw-f-dev am:
a053eaa841 -s ours am:
65d806d043 -s ours
am:
6b2d37ca25 -s ours
Change-Id: I111a86ba53a48ab3db3e5211e86afc0a1d2a21e0
Tyler Freeman [Tue, 1 Aug 2017 01:33:44 +0000 (01:33 +0000)]
Merge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into cw-f-dev am:
a053eaa841 -s ours
am:
65d806d043 -s ours
Change-Id: Ie89e28aae64abfc833ed97748654d509cd52c07b
Tyler Freeman [Tue, 1 Aug 2017 01:24:08 +0000 (01:24 +0000)]
Merge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into cw-f-dev
am:
a053eaa841 -s ours
Change-Id: If8383edac561ad83edf182ee1c6e9687b180a1c2
Tyler Freeman [Tue, 1 Aug 2017 01:10:44 +0000 (01:10 +0000)]
Merge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into cw-f-dev
Meng Wang [Tue, 1 Aug 2017 00:36:58 +0000 (00:36 +0000)]
Merge "Show error code in WFC error notification." into oc-dr1-dev
am:
d2063214a5
Change-Id: I7c1980af1c877c7b3b4500daccb1226876c7e5bf
Meng Wang [Tue, 1 Aug 2017 00:35:42 +0000 (00:35 +0000)]
Merge "Remoe translations of values-mcc310-mnc260" into oc-dr1-dev
am:
0891411cfd
Change-Id: Id6972effd7feae66bdc7d53be08c832c14cc2d90
Meng Wang [Tue, 1 Aug 2017 00:28:12 +0000 (00:28 +0000)]
Merge "Show error code in WFC error notification." into oc-dr1-dev
Meng Wang [Tue, 1 Aug 2017 00:28:12 +0000 (00:28 +0000)]
Merge "Remoe translations of values-mcc310-mnc260" into oc-dr1-dev
z00208928 [Fri, 21 Jul 2017 14:26:29 +0000 (22:26 +0800)]
power: gps: add gps read timeout
During download gps file, if network is disconnected, it do not release wakelock
to prevent system to sleep and consume more power until network is connected.
So set gps read tiemout.
Bug:
33469278
Change-Id: I41adf137559d88f76d9da6f63585bfdefc3117b1
Signed-off-by: z00208928 <zhangwei519@huawei.com>
Yohei Yukawa [Mon, 31 Jul 2017 22:37:14 +0000 (15:37 -0700)]
Fine-tune the condition to hide IME switcher
This is a follow up CL to a previous CL [1] that aimed to avoid
redundant IME switcher icon/notification on the keyguard, which already
has a keyboard icon to show IME switcher.
What the previous attempt overlooked is that when some other window is
shown over the keyguard and accepting text input, then we instead may
want to show the IME switcher icon/notification in the system UI level
because such a window may or may not have the icon to show IME
switcher.
This CL addresses above case by checking whether the keyguard is also
occluded or not. Bug
64224022 is also filed to find any other better
solution to stop relying on the keyguard visibility.
[1]: Ibee9123f4a520e77f4baf8bdd3d75364ab451100
2c93efc9eb188532472edc9e0c3e1ab8121aa20d
Test: Manually done as follows
1. Enable multiple IMEs
2. Set a password to lockscreen
3. Lock screen
4. Make sure that IME switcher UI is not shown when typing
password on the keyguard (Bug
5858903 is still fixed)
5. Show any window that has EditText over the keyguard
6. Focus in to that EditText
7. Make sure that IME switcher UI is shown
Fixes:
63585213
Change-Id: I2ae7fc7676e5b64d8910dbc6833d3042e8d2329a
Eino-Ville Talvala [Mon, 31 Jul 2017 22:30:01 +0000 (22:30 +0000)]
Merge "Camera2: Release input surface on capture session close" into oc-dr1-dev
am:
06802167e5
Change-Id: I3370a3c8853d171b29856d2a94e7121e6a5ad1b5
Eino-Ville Talvala [Mon, 31 Jul 2017 22:21:40 +0000 (22:21 +0000)]
Merge "Camera2: Release input surface on capture session close" into oc-dr1-dev
Adam Lesinski [Mon, 31 Jul 2017 22:17:26 +0000 (22:17 +0000)]
Merge "Remove extraneous invalidate call that unregisters AssetManagers" into oc-dr1-dev
am:
defdb1fd70
Change-Id: I16587768d92201f8d4d083b70ae972cca47e8b5c
Adam Lesinski [Mon, 31 Jul 2017 22:08:30 +0000 (22:08 +0000)]
Merge "Remove extraneous invalidate call that unregisters AssetManagers" into oc-dr1-dev
Alex Sakhartchouk [Mon, 31 Jul 2017 21:48:24 +0000 (21:48 +0000)]
Merge "When exiting persistent vr, we should exit overall vr mode." into oc-dr1-dev
am:
34b2389fcf
Change-Id: Idfba4f8c58f302f40de4826f034914f430ab3382
TreeHugger Robot [Mon, 31 Jul 2017 21:43:44 +0000 (21:43 +0000)]
Merge "When exiting persistent vr, we should exit overall vr mode." into oc-dr1-dev
Stanley Tng [Tue, 18 Apr 2017 05:35:45 +0000 (22:35 -0700)]
DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)
There are intermittent issues where either the returned Bluetooth
MAC address to Java framework is uninitialized or this address update
arrives too late. This fix will do 2 things:
(1) Returns error when MAC address is unavailable in the native code.
(2) Updates the MAC address later by adding a new broadcast event.
Test: Check address for these cases: factory reset, system reboot, and
Bluetooth re-enable.
Bug:
36709382
Merged-In: I09720193e38fdf9139e1bb146f8e1847e2b65b1a
(cherry picked from commit
ad4d1d8e28618546953e75d4983335631feb6f2a)
Change-Id: Ifae3adf6e2aad1f0811c03d3114d1bd0452e7c23
Michal Karpinski [Mon, 31 Jul 2017 19:05:13 +0000 (19:05 +0000)]
Merge "Reintroduce the contract for random token to be non-negative" into oc-dr1-dev
am:
810c312a29
Change-Id: I4518f7a6317d3c01e37a47b19dee653ccff71502
Bryce Lee [Mon, 31 Jul 2017 18:55:39 +0000 (18:55 +0000)]
Merge "Allow foreground AppWindowToken to influence orientation." into oc-dr1-dev
am:
1fd7497f02
Change-Id: Ibc323f15a9a0bc6302ff105036964374c044b5e7
TreeHugger Robot [Mon, 31 Jul 2017 18:51:17 +0000 (18:51 +0000)]
Merge "Reintroduce the contract for random token to be non-negative" into oc-dr1-dev
Bryce Lee [Mon, 31 Jul 2017 18:46:20 +0000 (18:46 +0000)]
Merge "Do not call onConfigurationChanged for appBound position changes." into oc-dr1-dev
am:
33d4702a12
Change-Id: I990a3554730cc07440c7d4bc0236e0aeb00e2980
Bryce Lee [Mon, 31 Jul 2017 18:34:23 +0000 (18:34 +0000)]
Merge "Allow foreground AppWindowToken to influence orientation." into oc-dr1-dev
Bryce Lee [Mon, 31 Jul 2017 18:32:30 +0000 (18:32 +0000)]
Merge "Do not call onConfigurationChanged for appBound position changes." into oc-dr1-dev
Geoffrey Pitsch [Fri, 28 Jul 2017 19:07:39 +0000 (15:07 -0400)]
Disable AOD when accessibility color inversion is on.
White background drains too much to be always on.
Bug:
62918778
Test: Manual
Change-Id: I78b2f6a5951b108aff4f353dabe2493117032dce
Eino-Ville Talvala [Mon, 31 Jul 2017 16:57:15 +0000 (09:57 -0700)]
Camera2: Release input surface on capture session close
Per the documentation, the input surface of a reprocessable capture
session should be abandoned on the close of a session.
Actually implement this, to avoid unintentional leaks of buffers.
Test: Camera CTS passes
Bug:
38313948
Change-Id: Ia45c39ea925288a5082d6e722ff4b40c55971a37
Steven Moreland [Mon, 31 Jul 2017 16:55:02 +0000 (16:55 +0000)]
SurfaceTexture.cpp: use proper nativehelper headers am:
f53501098c
am:
a3ca9caf46
Change-Id: I0049a5ffd8f24cd7d77506c5515216a4bf15b218
Adrian Roos [Mon, 31 Jul 2017 16:48:44 +0000 (16:48 +0000)]
Merge "WakeAndUnlock: Make sure blanking is never animated" into oc-dr1-dev
am:
cbab3edc3e
Change-Id: I49d8dc5f8cdd470064c9450e6722a905a4d1b0ed
Steven Moreland [Mon, 31 Jul 2017 16:48:25 +0000 (16:48 +0000)]
SurfaceTexture.cpp: use proper nativehelper headers
am:
f53501098c
Change-Id: I2f4eb3fdbfe875d820e52136d8fb72b60e56b046
TreeHugger Robot [Mon, 31 Jul 2017 16:43:07 +0000 (16:43 +0000)]
Merge "WakeAndUnlock: Make sure blanking is never animated" into oc-dr1-dev
Steven Moreland [Fri, 28 Jul 2017 17:21:47 +0000 (10:21 -0700)]
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
849252c469396a759c394dc6382470a6a07d6587)
Bryce Lee [Fri, 28 Jul 2017 15:33:36 +0000 (08:33 -0700)]
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
Bryce Lee [Sat, 29 Jul 2017 03:48:43 +0000 (20:48 -0700)]
Allow foreground AppWindowToken to influence orientation.
It is possible for an activity to request an orientation after
finish has been called, causing the system orientation to be
re-evaluated. Since the activity is closing, it will no longer be
eligible to influence orientation. If another stack/task is brought
to the foreground, it will as well won't be able to participate
since it is not considered an opening app and won't be visible. As a
result, we set the orientation to unspecified, leading to the
foreground activity to be resumed in the wrong orientation.
This changelist addresses the issue by allowing an AppWindowToken to
participate in orientation calculations if it is not closing and is
on top of the wm hierarchy, regardless of its visibility.
Change-Id: I0f316d6d824398d084c7648cf2dc2c2d07b4410d
Fixes:
63982461
Fixes:
63513655
Test: bit FrameworksServicesTests:com.android.server.wm.AppWindowTokenTests#testGetOrientation
Test: go/wm-smoke
Adrian Roos [Mon, 31 Jul 2017 13:56:24 +0000 (15:56 +0200)]
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.
Neil Fuller [Mon, 31 Jul 2017 13:21:41 +0000 (13:21 +0000)]
Merge "Remove redundant TODOs from PackageTracker" am:
01d686b85e am:
b65356709e
am:
452dcfce41
Change-Id: I699962dee85ff318433004cd91f183c0630e3888
Neil Fuller [Mon, 31 Jul 2017 13:06:44 +0000 (13:06 +0000)]
Merge "Remove redundant TODOs from PackageTracker" am:
01d686b85e
am:
b65356709e
Change-Id: Icbc33207a154b566791210d6c6169235c139562a
Neil Fuller [Mon, 31 Jul 2017 13:00:50 +0000 (13:00 +0000)]
Merge "Remove redundant TODOs from PackageTracker"
am:
01d686b85e
Change-Id: If74fa1bcd6be188079de231e7903795ea7d0b5be
Neil Fuller [Mon, 31 Jul 2017 12:51:05 +0000 (12:51 +0000)]
Merge "Remove redundant TODOs from PackageTracker"
Adrian Roos [Mon, 31 Jul 2017 12:36:21 +0000 (12:36 +0000)]
Merge "AOD: When prox covered disable touch during pulse instead of aborting" into oc-dr1-dev
am:
3cace2a148
Change-Id: Ia30c3884751a44392efb843a2da41a0528162fa2
Adrian Roos [Mon, 31 Jul 2017 12:29:44 +0000 (12:29 +0000)]
Merge "AOD: When prox covered disable touch during pulse instead of aborting" into oc-dr1-dev
Bill Yi [Mon, 31 Jul 2017 06:06:17 +0000 (06:06 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
273bb516ad -s ours
Change-Id: I5b0b3e17d14a5d86a2b7296f385e947f30cd3332
TreeHugger Robot [Mon, 31 Jul 2017 05:59:57 +0000 (05:59 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Hugo Benichi [Mon, 31 Jul 2017 02:07:12 +0000 (02:07 +0000)]
Merge "Logging improvements when NetworkCapabilities change" am:
f60a38e152 am:
bdfb4ee19c
am:
88a572da7d -s ours
Change-Id: I5f6e3a2109236f30d0e09bde8a2c63b32e62f772
Hugo Benichi [Mon, 31 Jul 2017 01:58:33 +0000 (01:58 +0000)]
Merge "Logging improvements when NetworkCapabilities change" am:
f60a38e152
am:
bdfb4ee19c
Change-Id: Ie7f90ac6b8073e756ff14afcaac7ed291b165e87
Hugo Benichi [Mon, 31 Jul 2017 01:50:38 +0000 (01:50 +0000)]
Merge "Logging improvements when NetworkCapabilities change"
am:
f60a38e152
Change-Id: I886e39db8969eb1ac1dfe06c6f448e53a90fd92c
Treehugger Robot [Mon, 31 Jul 2017 01:38:29 +0000 (01:38 +0000)]
Merge "Logging improvements when NetworkCapabilities change"
Hugo Benichi [Tue, 25 Jul 2017 02:40:56 +0000 (11:40 +0900)]
Logging improvements when NetworkCapabilities change
This patch improves the wtf() logging in updateCapabilities to
better distinguish between the cases of a changed specifiers, changed
transports, or changed capabilities. The case of NOT_METERED being added
or removed is ignored.
Bug:
63326103
Test: runtest frameworks-net, runtest frameworks-wifi
Merged-In: I05c6e78891e1eac658f1cf883223af520a9a4f8f
Merged-In: I4f6cbc0adb461cef6610460daeba72ca38b8f10c
Merged-In: I165a8bbe8362100f1e2bb909459fb45b1c68d5ae
Merged-In: Iec6d92e9a3a12bab87c5adfaf17f776465077060
Merged-In: I633d6347a7f852c27c03fc96b36ca2a60f70c73c
Merged-In: I38739184fc0db105bfd3b4c02cce01e803739e5d
Merged-In: Ia58b877056e2442136cc8b145ac8f4e6560cfc2c
(cherry pick from commit
683ea489d302b494ab40c0d5dc97d352a59d8aa9)
Change-Id: Id32ca66068c8ff549627e8e8c0e50897ef928c58
Lucas Dupin [Sat, 29 Jul 2017 23:17:49 +0000 (23:17 +0000)]
Merge "Scrim opacity must satisfy GAR" into oc-dr1-dev
am:
f98facc3b8
Change-Id: I4c4eb814d8ea2152644665daf6fbd6eb28d81b06
TreeHugger Robot [Sat, 29 Jul 2017 23:08:04 +0000 (23:08 +0000)]
Merge "Scrim opacity must satisfy GAR" into oc-dr1-dev
Lucas Dupin [Sat, 29 Jul 2017 23:04:06 +0000 (23:04 +0000)]
Merge "Fix issue where clock inflation would fail" into oc-dr1-dev
am:
011ac1bb7c
Change-Id: If6aa57364f74e94f9460ef4190a9996fbdae600f
TreeHugger Robot [Sat, 29 Jul 2017 22:56:28 +0000 (22:56 +0000)]
Merge "Fix issue where clock inflation would fail" into oc-dr1-dev
Vinay Kalia [Sat, 29 Jul 2017 22:17:06 +0000 (22:17 +0000)]
Merge "Fix BLE scan leaks" into oc-dr1-dev
am:
604a4b7171
Change-Id: I65e4990a08cc59ce30ee6d987f13a0381b42e58f
TreeHugger Robot [Sat, 29 Jul 2017 22:08:36 +0000 (22:08 +0000)]
Merge "Fix BLE scan leaks" into oc-dr1-dev
Steven Moreland [Sat, 29 Jul 2017 20:06:25 +0000 (20:06 +0000)]
Merge "SurfaceTexture.cpp: use proper nativehelper headers" into oc-dev-plus-aosp
am:
124acec8ad
Change-Id: I1b9f55ed3661a440b89a7820bf4d1b9c66f240af
TreeHugger Robot [Sat, 29 Jul 2017 19:58:54 +0000 (19:58 +0000)]
Merge "SurfaceTexture.cpp: use proper nativehelper headers" into oc-dev-plus-aosp
Android Build Merger (Role) [Sat, 29 Jul 2017 16:16:01 +0000 (16:16 +0000)]
Merge "Merge "Add a missing null check" into oc-dev am:
101fca656d am:
d56b01e022" into oc-dr1-dev-plus-aosp
Jeff Sharkey [Sat, 29 Jul 2017 16:14:03 +0000 (16:14 +0000)]
Merge "Add a missing null check" into oc-dev am:
101fca656d
am:
d56b01e022
Change-Id: I48191b693fac40513b670c711afea568eafe1ebf
Jeff Sharkey [Sat, 29 Jul 2017 16:11:32 +0000 (16:11 +0000)]
Merge "Add a missing null check" into oc-dev am:
101fca656d
am:
ea99954804
Change-Id: I3c81e5f426d6f4e41914b5f35803dd35ccc47710
Jeff Sharkey [Sat, 29 Jul 2017 16:04:02 +0000 (16:04 +0000)]
Merge "Add a missing null check" into oc-dev
am:
101fca656d
Change-Id: Iab72d9b62042ab5ceb0d32425b43796d3bdeb1ca
Jeff Sharkey [Sat, 29 Jul 2017 16:04:02 +0000 (16:04 +0000)]
Merge "Add a missing null check" into oc-dev
am:
101fca656d
Change-Id: Ifa868b17837796dec93c93119260a92f4241f624
Jeff Sharkey [Sat, 29 Jul 2017 15:56:14 +0000 (15:56 +0000)]
Merge "Add a missing null check" into oc-dev
Sundeep Ghuman [Sat, 29 Jul 2017 09:17:11 +0000 (09:17 +0000)]
Merge "Force update wifi QS when opening." into oc-dr1-dev
am:
0e9d9420e3
Change-Id: Ic6539fa0efc794ac9787e116b6d962c6b5149635
TreeHugger Robot [Sat, 29 Jul 2017 09:10:12 +0000 (09:10 +0000)]
Merge "Force update wifi QS when opening." into oc-dr1-dev
Android Build Merger (Role) [Sat, 29 Jul 2017 03:13:30 +0000 (03:13 +0000)]
Merge "DO NOT MERGE ANYWHERE: Add a wakelock timeout when downloading xtra data for GNSS. am:
a763fdba09 -s ours am:
452b8f2bd3 -s ours am:
f173b2a4c3 -s ours am:
43712e248c -s ours" into oc-dr1-dev-plus-aosp
Wei Wang [Sat, 29 Jul 2017 03:07:41 +0000 (03:07 +0000)]
DO NOT MERGE ANYWHERE: Add a wakelock timeout when downloading xtra data for GNSS. am:
a763fdba09 -s ours am:
452b8f2bd3 -s ours am:
f173b2a4c3 -s ours
am:
a473117706 -s ours
Change-Id: Idc4b406c712d5dd2ff3a8f7b0444ef459ddf1d50
Wei Wang [Sat, 29 Jul 2017 03:07:38 +0000 (03:07 +0000)]
DO NOT MERGE ANYWHERE: Add a wakelock timeout when downloading xtra data for GNSS. am:
a763fdba09 -s ours am:
452b8f2bd3 -s ours am:
f173b2a4c3 -s ours
am:
43712e248c -s ours
Change-Id: I755991391b8c7af5d5c90d5d24362ae6a50e45ea
Wei Wang [Sat, 29 Jul 2017 03:00:11 +0000 (03:00 +0000)]
DO NOT MERGE ANYWHERE: Add a wakelock timeout when downloading xtra data for GNSS. am:
a763fdba09 -s ours am:
452b8f2bd3 -s ours
am:
f173b2a4c3 -s ours
Change-Id: Id129412a62ee25b95853d664371d6a1b46bda1b0
Wei Wang [Sat, 29 Jul 2017 03:00:09 +0000 (03:00 +0000)]
DO NOT MERGE ANYWHERE: Add a wakelock timeout when downloading xtra data for GNSS. am:
a763fdba09 -s ours am:
452b8f2bd3 -s ours
am:
f173b2a4c3 -s ours
Change-Id: Id1cfb56bffc9bcf477d209efbd3f1eb19aee08d2
Wei Wang [Sat, 29 Jul 2017 02:52:46 +0000 (02:52 +0000)]
DO NOT MERGE ANYWHERE: Add a wakelock timeout when downloading xtra data for GNSS. am:
a763fdba09 -s ours
am:
452b8f2bd3 -s ours
Change-Id: Iaee8bab95acf6490e468d1a0df66b6aea6e61398