Fyodor Kupolov
8fa408caae
Merge "List column names in the error message" into oc-mr1-dev
...
am: 2729912a35
2017-08-01 00:45:33 +00:00
TreeHugger Robot
2729912a35
Merge "List column names in the error message" into oc-mr1-dev
2017-08-01 00:36:49 +00:00
Fyodor Kupolov
7ca3d4ef1f
Merge "Added setIdleConnectionTimeout method" into oc-mr1-dev
...
am: 82f289a4b4
2017-08-01 00:06:04 +00:00
Fyodor Kupolov
82f289a4b4
Merge "Added setIdleConnectionTimeout method" into oc-mr1-dev
2017-07-31 23:56:02 +00:00
Android Build Merger (Role)
9b32f47017
Merge "Merge "Camera2: Release input surface on capture session close" into oc-dr1-dev am: 06802167e5 am: 6f1422711b" into oc-mr1-dev-plus-aosp
2017-07-31 22:46:17 +00:00
Eino-Ville Talvala
27266fc5a3
Merge "Camera2: Release input surface on capture session close" into oc-dr1-dev am: 06802167e5
...
am: 6f1422711b
2017-07-31 22:43:30 +00:00
Eino-Ville Talvala
6e61ca09cd
Merge "Camera2: Release input surface on capture session close" into oc-dr1-dev am: 06802167e5
...
am: 102e9a7e3b
2017-07-31 22:40:50 +00:00
Adam Lesinski
a25fe81cc4
Merge "Remove extraneous invalidate call that unregisters AssetManagers" into oc-dr1-dev am: defdb1fd70
...
am: 630faa085a
2017-07-31 22:32:13 +00:00
Eino-Ville Talvala
102e9a7e3b
Merge "Camera2: Release input surface on capture session close" into oc-dr1-dev
...
am: 06802167e5
2017-07-31 22:30:01 +00:00
Eino-Ville Talvala
6f1422711b
Merge "Camera2: Release input surface on capture session close" into oc-dr1-dev
...
am: 06802167e5
2017-07-31 22:30:01 +00:00
Adam Lesinski
4733bcaa76
Merge "Remove extraneous invalidate call that unregisters AssetManagers" into oc-dr1-dev am: defdb1fd70
...
am: 80454c2c88
2017-07-31 22:23:54 +00:00
Eino-Ville Talvala
06802167e5
Merge "Camera2: Release input surface on capture session close" into oc-dr1-dev
2017-07-31 22:21:40 +00:00
Adam Lesinski
80454c2c88
Merge "Remove extraneous invalidate call that unregisters AssetManagers" into oc-dr1-dev
...
am: defdb1fd70
2017-07-31 22:17:27 +00:00
Adam Lesinski
630faa085a
Merge "Remove extraneous invalidate call that unregisters AssetManagers" into oc-dr1-dev
...
am: defdb1fd70
2017-07-31 22:17:26 +00:00
Adam Lesinski
defdb1fd70
Merge "Remove extraneous invalidate call that unregisters AssetManagers" into oc-dr1-dev
2017-07-31 22:08:30 +00:00
Android Build Merger (Role)
01ed7167f9
Merge "Merge "When exiting persistent vr, we should exit overall vr mode." into oc-dr1-dev am: 34b2389fcf am: 9a554952db" into oc-mr1-dev-plus-aosp
2017-07-31 21:57:52 +00:00
Alex Sakhartchouk
151b4654e2
Merge "When exiting persistent vr, we should exit overall vr mode." into oc-dr1-dev am: 34b2389fcf
...
am: 9a554952db
2017-07-31 21:55:06 +00:00
Alex Sakhartchouk
5b82f76982
Merge "When exiting persistent vr, we should exit overall vr mode." into oc-dr1-dev am: 34b2389fcf
...
am: 73b51ac40d
2017-07-31 21:54:56 +00:00
Alex Sakhartchouk
9a554952db
Merge "When exiting persistent vr, we should exit overall vr mode." into oc-dr1-dev
...
am: 34b2389fcf
2017-07-31 21:48:28 +00:00
Alex Sakhartchouk
73b51ac40d
Merge "When exiting persistent vr, we should exit overall vr mode." into oc-dr1-dev
...
am: 34b2389fcf
2017-07-31 21:48:24 +00:00
TreeHugger Robot
34b2389fcf
Merge "When exiting persistent vr, we should exit overall vr mode." into oc-dr1-dev
2017-07-31 21:43:44 +00:00
Android Build Merger (Role)
e0b04bc3e8
Merge "Merge "Reintroduce the contract for random token to be non-negative" into oc-dr1-dev am: 810c312a29 am: 86271b573a" into oc-mr1-dev-plus-aosp
2017-07-31 19:17:09 +00:00
Android Build Merger (Role)
71dd68bdec
Merge "Merge "Reintroduce the contract for random token to be non-negative" into oc-dr1-dev am: 810c312a29 am: c2e30cd5c9" into oc-mr1-dev-plus-aosp
2017-07-31 19:16:50 +00:00
Michal Karpinski
19071e526a
Merge "Reintroduce the contract for random token to be non-negative" into oc-dr1-dev am: 810c312a29
...
am: 86271b573a
2017-07-31 19:15:07 +00:00
Michal Karpinski
30d7eb9f1c
Merge "Reintroduce the contract for random token to be non-negative" into oc-dr1-dev am: 810c312a29
...
am: c2e30cd5c9
2017-07-31 19:14:16 +00:00
Android Build Merger (Role)
384fa74812
Merge "Merge "Allow foreground AppWindowToken to influence orientation." into oc-dr1-dev am: 1fd7497f02 am: c71e73863e" into oc-mr1-dev-plus-aosp
2017-07-31 19:13:22 +00:00
Bryce Lee
30543e4442
Merge "Allow foreground AppWindowToken to influence orientation." into oc-dr1-dev am: 1fd7497f02
...
am: c71e73863e
2017-07-31 19:11:28 +00:00
Eugene Susla
cbc1fb637a
Merge "[Companion] Fix NPE due to looking up view btoo soon" into oc-mr1-dev
...
am: 978b8e1842
2017-07-31 19:10:40 +00:00
Bryce Lee
2c931c9e98
Merge "Allow foreground AppWindowToken to influence orientation." into oc-dr1-dev am: 1fd7497f02
...
am: 343d82adf6
2017-07-31 19:07:16 +00:00
Michal Karpinski
86271b573a
Merge "Reintroduce the contract for random token to be non-negative" into oc-dr1-dev
...
am: 810c312a29
2017-07-31 19:05:13 +00:00
Michal Karpinski
c2e30cd5c9
Merge "Reintroduce the contract for random token to be non-negative" into oc-dr1-dev
...
am: 810c312a29
2017-07-31 19:03:13 +00:00
TreeHugger Robot
978b8e1842
Merge "[Companion] Fix NPE due to looking up view btoo soon" into oc-mr1-dev
2017-07-31 18:59:52 +00:00
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
c71e73863e
Merge "Allow foreground AppWindowToken to influence orientation." into oc-dr1-dev
...
am: 1fd7497f02
2017-07-31 18:55:39 +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
TreeHugger Robot
810c312a29
Merge "Reintroduce the contract for random token to be non-negative" into oc-dr1-dev
2017-07-31 18:51:17 +00:00
Bryce Lee
343d82adf6
Merge "Allow foreground AppWindowToken to influence orientation." into oc-dr1-dev
...
am: 1fd7497f02
2017-07-31 18:50:32 +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
1fd7497f02
Merge "Allow foreground AppWindowToken to influence orientation." into oc-dr1-dev
2017-07-31 18:34:23 +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
Fyodor Kupolov
cf97b6b7f7
Added setIdleConnectionTimeout method
...
It allows apps to set time SQLite connection is allowed to be idle
before it is closed and removed from the pool.
Test: manual + DatabaseGeneralTest
Bug: 63398887
Change-Id: Ie09eeb4dc2b9e52ba67d9355b1f9bd869b148613
2017-07-31 11:05:57 -07: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
Eino-Ville Talvala
3b594bfe33
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
2017-07-31 10:09:59 -07: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
