drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
188,869 Commits 1 Branch 0 Tags
Commit Graph

188869 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Reck
9d4efdf280 Revert "A bunch more cleanups" 
This reverts commit c294d128d03bc9a9982b273a82516c04583438cc.

Change-Id: Id1ebb236950f7c36c6d86e1dd95566d3a200748d
 2015-04-17 20:47:27 +00:00
John Reck
7809f835ca Revert "Move AssetAtlas off of SkBitmap*" 
This reverts commit 87ffb63d90fb6dd2689fe72dcb24fda9a6156220.

Change-Id: I92adfcee454a0a19020cdd9e96a134be0ee529aa
 2015-04-17 20:46:47 +00:00
John Reck
afbeb2c237 Merge "Revert "Remove Bitmap#getSkBitmap"" 2015-04-17 20:46:22 +00:00
John Reck
1ff961dd6d Revert "Remove Bitmap#getSkBitmap" 
This reverts commit 4bd981ec533a65e8dee053a0a709b484770b0a76.

Change-Id: I5c92cd955c6e70e197dc5cbc5dfeed8369a24a31
 2015-04-17 20:45:15 +00:00
Andy Hung
eaa388bc2c Merge "Add non-blocking writes to AudioTrack" 2015-04-17 20:38:24 +00:00
Jorim Jaggi
601462f23d Merge "Speedup unlock when authenticating with fingerprint" 2015-04-17 20:27:22 +00:00
Jorim Jaggi
f3b3bee129 Speedup unlock when authenticating with fingerprint 
Change-Id: Ib76ff7a2a42cf6fc77848ef799c2a13b77cfebb2
 2015-04-17 13:26:39 -07:00
Eino-Ville Talvala
7b4e887390 Merge changes from topics 'add-depth-capability', 'add-highresolution-level' 
* changes:
  Camera2: Add DEPTH_OUTPUT capability and DEPTH_DEPTH_IS_EXCLUSIVE field.
  Camera: Add HIGH_RESOLUTION hardware level.
 2015-04-17 20:22:43 +00:00
Andy Hung
e354f5d580 Merge "Add non-blocking reads to AudioRecord" 2015-04-17 19:51:36 +00:00
Dmitriy Ivanov
5e4b823aa0 am 34f0fd23: am a04b4302: am b0557ace: Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS" 
* commit '34f0fd239c456e4e064e4c14b768962292023800':
  Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS
 2015-04-17 19:47:51 +00:00
Andres Morales
e0a31c8bab Merge "Recover from dead GateKeeperService Binder" 2015-04-17 19:43:00 +00:00
Dmitriy Ivanov
34f0fd239c am a04b4302: am b0557ace: Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS" 
* commit 'a04b43020e1289e8b7b2501471740ace944f18d5':
  Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS
 2015-04-17 19:30:56 +00:00
Dmitriy Ivanov
a04b43020e am b0557ace: Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS" 
* commit 'b0557acebc7a47f6d8a3653c376165160fc68105':
  Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS
 2015-04-17 19:20:22 +00:00
Dmitriy Ivanov
b0557acebc Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS" 2015-04-17 19:01:42 +00:00
Dan Albert
1dfab471ed am a26c8371: am 5682a23e: am fef8bcf9: Merge "Explicitly use clang." 
* commit 'a26c83718004c7640827d86b0f6a0fdf33017751':
  Explicitly use clang.
 2015-04-17 18:50:41 +00:00
Dmitriy Ivanov
811b7266fd Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS 
It is no longer needed.

Change-Id: I1b5a58528507df35cc0792a18be5583e3605cbe0
 2015-04-17 11:50:29 -07:00
Dan Albert
a26c837180 am 5682a23e: am fef8bcf9: Merge "Explicitly use clang." 
* commit '5682a23ed41f50057887870f1aa9848b13a26190':
  Explicitly use clang.
 2015-04-17 18:42:44 +00:00
Alan Viverette
65aea84c5a Merge "Move date picker arrows out of SimpleMonthView" 2015-04-17 18:16:19 +00:00
Mady Mellor
62b5b02c4f Merge "Drag n drop for stylus" 2015-04-17 18:14:50 +00:00
Dan Albert
5682a23ed4 am fef8bcf9: Merge "Explicitly use clang." 
* commit 'fef8bcf92167fbfe06cfb4a18ddf12f272cae5f0':
  Explicitly use clang.
 2015-04-17 18:06:54 +00:00
Selim Cinek
ccc9b7f85c Merge "Fixed a crash on android tv with the new heads-up manager" 2015-04-17 18:03:29 +00:00
Selim Cinek
29fa89b41e Fixed a crash on android tv with the new heads-up manager 
Bug: 20282768
Change-Id: Ibb3dc879a2529c12f4d8ab6b031711363da93d37
 2015-04-17 11:02:33 -07:00
Rich Slogar
3e1cfe106a am fea8ddd4: am a9315dc1: am c1002dfc: am 71a616e0: am 203a4739: am 1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs 
* commit 'fea8ddd4c7a79cc68a96901f86cfa527bbd44fd0':
  docs: studio remove gradle tasks dialog
 2015-04-17 18:01:05 +00:00
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