Rich Slogar
56a38d46ac
am 58befba6: am 124c4025: am 1252b4b8: am 61dd1dfd: am 684f3aa2: am efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs
...
* commit '58befba6ac88b4216cac43f97a456d1119dcb972':
docs: hierarchyviewer updates
2015-04-17 18:00:53 +00:00
Jim Miller
34424f2c5f
Merge "Clean up message dispatch in FingerprintService"
2015-04-17 17:57:10 +00:00
Jeff Sharkey
3397b6803d
Merge "Avoid deadlock when FSTRIM requested at boot."
2015-04-17 17:55:05 +00:00
Jeff Sharkey
1783f149c7
Avoid deadlock when FSTRIM requested at boot.
...
When PackageManager decides that FSTRIM is required at boot, we
can end up in deadlock. Work around this for now by kicking the
requested FSTRIM can down the road for a few seconds until we're
connected to vold.
Bug: 20228019
Change-Id: I47e422e618d99e59aed8a8b79227821a3012eb9f
2015-04-17 10:53:19 -07:00
Eino-Ville Talvala
0b7b03b35f
Camera2: Add DEPTH_OUTPUT capability and DEPTH_DEPTH_IS_EXCLUSIVE field.
...
- Define DEPTH_OUTPUT capability and its requirements.
- Add DEPTH_IS_EXCLUSIVE to support devices that cannot produce color and depth
for the same capture.
Change-Id: I6e511b7b8625907d9fc751fe8a73a443edeeb2ab
2015-04-17 10:52:42 -07:00
Eino-Ville Talvala
86ea32a68c
Camera: Add HIGH_RESOLUTION hardware level.
...
For camera devices that support very high resolutions, add
a level that allows for those resolutions to operate at lower
capture rates, while ensuring that a reasonable resolution is
still available for high-rate capture.
Change-Id: I4a0d904504ac8a976bd02fba89b238048d55a268
2015-04-17 10:52:41 -07:00
Rich Slogar
fea8ddd4c7
am a9315dc1: am c1002dfc: am 71a616e0: am 203a4739: am 1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs
...
* commit 'a9315dc16c6b6f8d3fa79a272b0c714e8e8b2655':
docs: studio remove gradle tasks dialog
2015-04-17 17:49:44 +00:00
Rich Slogar
58befba6ac
am 124c4025: am 1252b4b8: am 61dd1dfd: am 684f3aa2: am efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs
...
* commit '124c40252dcb500d4f099548088367dc15ef3152':
docs: hierarchyviewer updates
2015-04-17 17:49:38 +00:00
Dan Albert
fef8bcf921
Merge "Explicitly use clang."
2015-04-17 17:43:36 +00:00
Dan Albert
b9f6b0eec3
Explicitly use clang.
...
This was implicitly enabled by using ASAN.
Change-Id: I562402a8191e2a3ab3eefd43860fbe7c58d441d8
2015-04-17 10:40:48 -07:00
Alan Viverette
78bf1d329a
Move date picker arrows out of SimpleMonthView
...
Also fixes incorrect docs in Drawable.
Bug: 20188255
Change-Id: I01c8563f734d9c1dad1e149bee80c651981e469f
2015-04-17 10:39:22 -07:00
Rich Slogar
a9315dc16c
am c1002dfc: am 71a616e0: am 203a4739: am 1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs
...
* commit 'c1002dfc52ec2827d24b6c4722a47abbb99b7f16':
docs: studio remove gradle tasks dialog
2015-04-17 17:37:51 +00:00
Rich Slogar
124c40252d
am 1252b4b8: am 61dd1dfd: am 684f3aa2: am efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs
...
* commit '1252b4b8694a69150b79ecfd801ed62c6929edf3':
docs: hierarchyviewer updates
2015-04-17 17:37:45 +00:00
Rich Slogar
c1002dfc52
am 71a616e0: am 203a4739: am 1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs
...
* commit '71a616e05065e39a5a13b483b031a2040dc52eda':
docs: studio remove gradle tasks dialog
2015-04-17 17:27:13 +00:00
Rich Slogar
1252b4b869
am 61dd1dfd: am 684f3aa2: am efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs
...
* commit '61dd1dfda1e3f9d2c58a5d1719818b66134cadb9':
docs: hierarchyviewer updates
2015-04-17 17:27:07 +00:00
Rich Slogar
71a616e050
am 203a4739: am 1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs
...
* commit '203a47395dfc17ba9e9b6b46c65bfbde002312f6':
docs: studio remove gradle tasks dialog
2015-04-17 17:14:48 +00:00
Rich Slogar
61dd1dfda1
am 684f3aa2: am efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs
...
* commit '684f3aa264e678affc1b33b27602493c96ee7eac':
docs: hierarchyviewer updates
2015-04-17 17:14:43 +00:00
Chris Craik
66b4139d6a
Hide transient view API
...
bug:18621099
Change-Id: I25f64bc50bbbcf9fbbd8a4cdf81cacb61fa256f0
2015-04-17 10:09:05 -07:00
Rich Slogar
203a47395d
am 1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs
...
* commit '1fcc6bd854f6e152cf8796a4a70965e350c3bdcf':
docs: studio remove gradle tasks dialog
2015-04-17 17:03:04 +00:00
Rich Slogar
684f3aa264
am efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs
...
* commit 'efe861a4a7081da795fe6a0843308ca7cef26277':
docs: hierarchyviewer updates
2015-04-17 17:02:59 +00:00
Rich Slogar
1fcc6bd854
Merge "docs: studio remove gradle tasks dialog" into lmp-docs
2015-04-17 16:53:34 +00:00
Rich Slogar
efe861a4a7
Merge "docs: hierarchyviewer updates" into lmp-docs
2015-04-17 16:52:45 +00:00
Wen ZHANG
fedd63165d
Merge "Set REQUIRE_PASSWORD_TO_DECRYPT to false when insecure screen lock is enabled"
2015-04-17 16:41:27 +00:00
Michael Wright
fd25459a52
Merge "Rename affine transformation configuration change to be consistent."
2015-04-17 16:38:53 +00:00
Olawale Ogunwale
5c75f0fbe3
am 2051bded: am 53e2c6ec: am c0c8d198: Merge "[ActivityManager] Fix activity always visible."
...
* commit '2051bded279f2d81e89b2a3731d1ba164ff9054a':
[ActivityManager] Fix activity always visible.
2015-04-17 16:36:02 +00:00
Andres Morales
301ea44992
Recover from dead GateKeeperService Binder
...
Change-Id: Ie25b46225a88fd59e6426a338bb94152d2c1b302
2015-04-17 09:35:57 -07:00
Wale Ogunwale
f645f9420c
Merge "Fail early when starting a background user activity."
2015-04-17 16:28:24 +00:00
Olawale Ogunwale
2051bded27
am 53e2c6ec: am c0c8d198: Merge "[ActivityManager] Fix activity always visible."
...
* commit '53e2c6ec87e6969b5f0db2ab92a9fa133317bd29':
[ActivityManager] Fix activity always visible.
2015-04-17 16:23:40 +00:00
Tony Mantler
991465c655
Merge "Add PermissionsInfo to SettingsLib"
2015-04-17 16:13:39 +00:00
Olawale Ogunwale
53e2c6ec87
am c0c8d198: Merge "[ActivityManager] Fix activity always visible."
...
* commit 'c0c8d1983c5d7c9bc9469944a9d46856aff95ab9':
[ActivityManager] Fix activity always visible.
2015-04-17 16:13:03 +00:00
Olawale Ogunwale
c0c8d1983c
Merge "[ActivityManager] Fix activity always visible."
2015-04-17 15:50:48 +00:00
Wale Ogunwale
0bd2aa7603
Fail early when starting a background user activity.
...
If it shouldn't be displayed for all users.
Bug: 13507605
Change-Id: I8fe8e5a98759c1ca058cc7d222817f6d580ffa11
2015-04-17 08:37:56 -07:00
Chet Haase
8a2c92c834
Merge "Add transient views to ViewGroup"
2015-04-17 12:34:11 +00:00
Tom Hudson
9543c0be95
Merge "Fix offset of composeLayerRegion"
2015-04-17 12:02:48 +00:00
Abodunrinwa Toki
103d48ec09
Change FloatingToolbar window layout type.
...
Floating toolbar is now rendered as TYPE_APPLICATION_ABOVE_SUB_PANEL.
This causes the FloatingToolbar to be rendered in a layer above
the text selection handles (at layer TYPE_APPLICATION_SUB_PANEL.)
Bug: 20135562
Change-Id: I1484b3493bf4cd98c679eb222270c53daa46cdf4
2015-04-17 07:58:37 +00:00
Martijn Coenen
4598c375df
am 14e24b4b: am cb477625: am e386f7f5: Merge "Expose peer LLCP version in NDEF callbacks."
...
* commit '14e24b4b4495484c05f38cab1b5b3ae8443394a6':
Expose peer LLCP version in NDEF callbacks.
2015-04-17 07:47:00 +00:00
Martijn Coenen
14e24b4b44
am cb477625: am e386f7f5: Merge "Expose peer LLCP version in NDEF callbacks."
...
* commit 'cb4776254c92e4b8c05e2bd60e730aa76b55358f':
Expose peer LLCP version in NDEF callbacks.
2015-04-17 07:37:47 +00:00
Martijn Coenen
cb4776254c
am e386f7f5: Merge "Expose peer LLCP version in NDEF callbacks."
...
* commit 'e386f7f5108e9c2aa7547394f23d5936d7993cfe':
Expose peer LLCP version in NDEF callbacks.
2015-04-17 07:25:27 +00:00
Andy Hung
4aacc903e3
Add non-blocking writes to AudioTrack
...
Change-Id: I4ff47c2851be1b085f4e758f67e391932371027d
2015-04-17 00:16:17 -07:00
Martijn Coenen
e386f7f510
Merge "Expose peer LLCP version in NDEF callbacks."
2015-04-17 07:02:59 +00:00
Andy Hung
0e9e2f3724
Add non-blocking reads to AudioRecord
...
Change-Id: I63d5345129f197f96f9a13696996071c96551efe
2015-04-16 23:57:13 -07:00
Adrian Roos
e57818a20e
Merge "Allow dismissing Keyguard from TrustAgentService"
2015-04-17 02:44:09 +00:00
Filip Gruszczynski
54ce1cafb0
am cba75f31: am 47e743b9: am 4544b927: Hold a wake lock while dozing when wallpaper draws.
...
* commit 'cba75f315967bba103805046b122e9a58687b85d':
Hold a wake lock while dozing when wallpaper draws.
2015-04-17 02:09:40 +00:00
Ryosuke Matsuuchi
19a7b54619
doc: Add Korean version of DAC/distribute/ page.
...
Bug: 20204101
Change-Id: I5a4795dd03ca4f904c26ce6138eb98d085dd3deb
2015-04-17 10:57:31 +09:00
Adam Lesinski
a4766050c5
Merge "Report WiFi and Bluetooth energy collection in checkin stats"
2015-04-17 01:54:19 +00:00
Jim Miller
1304137918
Clean up message dispatch in FingerprintService
...
This fixes several issues that were causing missing events in
enrollment and authentication.
Bug 20271180
Change-Id: Ic1c8ab35145de4d29d60238ef8ee71443a882348
2015-04-16 18:45:05 -07:00
Adam Lesinski
e283d33fed
Report WiFi and Bluetooth energy collection in checkin stats
...
Also removed some legacy bluetooth energy collection
that was never invoked.
Also fixed an issue with Wifi scan power estimation.
Bluetooth energy recording is still disabled as strange results
are still reported.
Change-Id: Iafa37eba285fd933ff221116b14af260e904fa4f
2015-04-16 18:44:30 -07:00
Andres Morales
e4e13b4a97
Merge "Clear secure user ID and notify keystore when lock is cleared"
2015-04-17 01:34:57 +00:00
Filip Gruszczynski
cba75f3159
am 47e743b9: am 4544b927: Hold a wake lock while dozing when wallpaper draws.
...
* commit '47e743b9e276d89ded2b9c50af61db2ce5529706':
Hold a wake lock while dozing when wallpaper draws.
2015-04-17 01:20:09 +00:00
Ben Kwa
d58d954a15
Enable the copy feature.
...
Change-Id: Ie0636895f2b2fe6550eb68042295daf76bbbd7fe
2015-04-16 18:17:25 -07:00