Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
117,604 Commits 3 Branches 0 Tags
813c8e45d95ca87b3bc90e4b166edab9c07c9dfb
Commit Graph

35479 Commits

Author SHA1 Message Date
Zhijun He
813c8e45d9 am 2c31cf7c: am 549a9590: am 58216c26: Camera2: return CaptureResult.STATISTICS_FACES 
* commit '2c31cf7cc4d7fca56e5277df932b4e8ce671935d':
  Camera2: return CaptureResult.STATISTICS_FACES
 2013-10-15 10:20:45 -07:00
Zhijun He
2c31cf7cc4 am 549a9590: am 58216c26: Camera2: return CaptureResult.STATISTICS_FACES 
* commit '549a95902a20c8a96167215982c282264e47d3ed':
  Camera2: return CaptureResult.STATISTICS_FACES
 2013-10-15 10:18:44 -07:00
Zhijun He
58216c2650 Camera2: return CaptureResult.STATISTICS_FACES 
Changes included in this CL:

- remove the WAR for face detect mode null case.
- make the sanity check assert to warnings.
- make number of faces to be the minimal length of face metadata array length to
avoid out of bound access, since we relax the sanity check.

Bug: 11206459
Change-Id: Ifd9f7f79617039c1b3ad631f202b48076d775e09
 2013-10-15 07:46:53 -07:00
Torne (Richard Coles)
ccd0204e9d resolved conflicts for merge of f96b93e2 to master 
Change-Id: I28dbc39dde7bf5c8bb50cff0f6bc49a90c9c4dbe
 2013-10-15 14:04:16 +01:00
Torne (Richard Coles)
92dd5ada8a Resolved conflicts for merge of db931a3b to master 
Change-Id: I5d71df1e2272b8fc35e5f1e0346284704b9d62ff
 2013-10-15 13:48:58 +01:00
Eino-Ville Talvala
ac61e030e5 am c80477e7: am a7833f86: am bf9b087b: Merge "Camera2: Fix face rectangle coordinate mapping, and use Key.equals" into klp-dev 
* commit 'c80477e7124264ff0a61f7e972244be03fc20d42':
  Camera2: Fix face rectangle coordinate mapping, and use Key.equals
 2013-10-15 05:06:18 -07:00
Michael Jurka
38edc67481 am a0ce8c92: am a09c20a2: am a457211a: Merge "Fix getBuiltInWallpaper method" into klp-dev 
* commit 'a0ce8c92cfd06af14962bfba120bd176c936d4f0':
  Fix getBuiltInWallpaper method
 2013-10-15 05:05:42 -07:00
John Spurlock
b45bdac340 am 5a87a4e3: am 30408434: am f8033360: Merge "Give IMEs the entire screen to use for measuring purposes." into klp-dev 
* commit '5a87a4e3554872dced265ee32551656f0a9643ac':
  Give IMEs the entire screen to use for measuring purposes.
 2013-10-15 04:03:20 -07:00
Dianne Hackborn
06d6a7548e am 9aded5ab: am 827c5af0: am e49a107a: Merge "Fix issue #11223335: APR: Lots of failures in procstats due to..." into klp-dev 
* commit '9aded5abd65a2c69090abece37a7825a52ca3af0':
  Fix issue #11223335: APR: Lots of failures in procstats due to...
 2013-10-15 04:03:09 -07:00
Michael Jurka
4c0f91c863 am 7ec3a981: am 588bfeea: am f6f545f6: Merge "Fix the build" into klp-dev 
* commit '7ec3a981107c55b4a4fd4a7f984b2dfdffe5c281':
  Fix the build
 2013-10-15 04:03:02 -07:00
Michael Jurka
19c71ed7ab am 21bd2e5b: am a8b20cf8: am bcfc634d: Merge "Ensure URIs have content:// scheme in WPM" into klp-dev 
* commit '21bd2e5b0a8ccd065b8bbffb845159ce59640a9a':
  Ensure URIs have content:// scheme in WPM
 2013-10-15 04:02:55 -07:00
Jeff Sharkey
91695305f2 am 881cde33: am 16c4b8c5: am ddf5a170: Merge "Relax user constraint on storage state." into klp-dev 
* commit '881cde33589859e23a0af0a08b3c59d2f90cfd10':
  Relax user constraint on storage state.
 2013-10-15 04:02:52 -07:00
Jeff Sharkey
d70d2d8ee3 am 25b99efb: am ac0cb359: am 8e656df0: Merge "Add extras to AFD, send orientation metadata." into klp-dev 
* commit '25b99efb3259c9f6d7bcdacd3cb2bafd6b1a0e63':
  Add extras to AFD, send orientation metadata.
 2013-10-15 04:02:48 -07:00
Martijn Coenen
a4b206952b am e7a81e7a: am 47936bb8: am 7d91cc97: Merge "NFC card emulation API docs." into klp-dev 
* commit 'e7a81e7a87dac9460eb8faa759d2c5086ccff523':
  NFC card emulation API docs.
 2013-10-15 04:02:41 -07:00
Adam Lesinski
e81f80ad94 am 04e2a47a: am 461f06f4: am 53a5e317: Merge "Wrap measurement optimization in targetSdk check" into klp-dev 
* commit '04e2a47ab72038672647a9994f19e1254c90413a':
  Wrap measurement optimization in targetSdk check
 2013-10-15 04:02:16 -07:00
Torne (Richard Coles)
f96b93e22c Resolved conflicts for merge of c5f742d4 to klp-dev-plus-aosp 
Change-Id: Ieeb9460a66ca761ae347fecff671ce54dfbc9cdf
 2013-10-15 11:49:09 +01:00
Torne (Richard Coles)
db931a3b2b am a1ba29ac: am d892afc8: Remove support for switching WebView. 
* commit 'a1ba29acc4a6709f74fb7fefdcdb66adc71c849a':
  Remove support for switching WebView.
 2013-10-15 03:41:34 -07:00
Torne (Richard Coles)
94c0057d67 Delete the old WebView. 
Delete all the Java classes used only by the old WebView implementation,
and also sections of common classes that were only needed for the old
WebView.

Bug: 10427705
Change-Id: I02549a71104b35d86d99058c71f43e054730ec7d
 2013-10-15 11:18:51 +01:00
Torne (Richard Coles)
d892afc88d Remove support for switching WebView. 
WebViewFactory remains as an abstraction layer, but will now always
creates Chromium WebView instances.

Bug: 10427705
Change-Id: I045e43eb35462567fecd29d04e7b61902baef547
 2013-10-15 11:18:50 +01:00
Eino-Ville Talvala
c80477e712 am a7833f86: am bf9b087b: Merge "Camera2: Fix face rectangle coordinate mapping, and use Key.equals" into klp-dev 
* commit 'a7833f861e303d9dea2cf54ceb519ff937f68367':
  Camera2: Fix face rectangle coordinate mapping, and use Key.equals
 2013-10-14 23:48:29 -07:00
Eino-Ville Talvala
bf9b087be0 Merge "Camera2: Fix face rectangle coordinate mapping, and use Key.equals" into klp-dev 2013-10-15 06:41:59 +00:00
Michael Jurka
a0ce8c92cf am a09c20a2: am a457211a: Merge "Fix getBuiltInWallpaper method" into klp-dev 
* commit 'a09c20a23038c1d77ae3d511da18a377572aed0c':
  Fix getBuiltInWallpaper method
 2013-10-14 20:57:22 -07:00
Michael Jurka
a457211af5 Merge "Fix getBuiltInWallpaper method" into klp-dev 2013-10-15 03:49:13 +00:00
Michael Jurka
0539153e77 Fix getBuiltInWallpaper method 2013-10-14 20:45:02 -07:00
John Spurlock
5a87a4e355 am 30408434: am f8033360: Merge "Give IMEs the entire screen to use for measuring purposes." into klp-dev 
* commit '30408434d3c04efa2b4a18838f9dfe0b5760f4ef':
  Give IMEs the entire screen to use for measuring purposes.
 2013-10-14 19:02:03 -07:00
Dianne Hackborn
9aded5abd6 am 827c5af0: am e49a107a: Merge "Fix issue #11223335: APR: Lots of failures in procstats due to..." into klp-dev 
* commit '827c5af02de29424ea80f1ccfe525e681d0b74f0':
  Fix issue #11223335: APR: Lots of failures in procstats due to...
 2013-10-14 19:01:55 -07:00
Michael Jurka
7ec3a98110 am 588bfeea: am f6f545f6: Merge "Fix the build" into klp-dev 
* commit '588bfeeaad627985163c8bcd76d4815b1ebce13a':
  Fix the build
 2013-10-14 19:01:47 -07:00
Michael Jurka
21bd2e5b0a am a8b20cf8: am bcfc634d: Merge "Ensure URIs have content:// scheme in WPM" into klp-dev 
* commit 'a8b20cf801f841511979f440ab05b4f93a9c8ecb':
  Ensure URIs have content:// scheme in WPM
 2013-10-14 19:01:38 -07:00
Jeff Sharkey
881cde3358 am 16c4b8c5: am ddf5a170: Merge "Relax user constraint on storage state." into klp-dev 
* commit '16c4b8c5999b4365bde5ad7c2f00337cee988dab':
  Relax user constraint on storage state.
 2013-10-14 19:01:30 -07:00
Jeff Sharkey
25b99efb32 am ac0cb359: am 8e656df0: Merge "Add extras to AFD, send orientation metadata." into klp-dev 
* commit 'ac0cb3591a637533c1f0329fd00a621fbe1fd997':
  Add extras to AFD, send orientation metadata.
 2013-10-14 19:00:51 -07:00
Martijn Coenen
e7a81e7a87 am 47936bb8: am 7d91cc97: Merge "NFC card emulation API docs." into klp-dev 
* commit '47936bb8f5192496b8007009f8732a9d7194b2ac':
  NFC card emulation API docs.
 2013-10-14 19:00:44 -07:00
Adam Lesinski
04e2a47ab7 am 461f06f4: am 53a5e317: Merge "Wrap measurement optimization in targetSdk check" into klp-dev 
* commit '461f06f4037849d5075d947852306bafdf0e949c':
  Wrap measurement optimization in targetSdk check
 2013-10-14 19:00:28 -07:00
John Spurlock
f803336028 Merge "Give IMEs the entire screen to use for measuring purposes." into klp-dev 2013-10-15 01:27:42 +00:00
Eino-Ville Talvala
615b75f335 Camera2: Fix face rectangle coordinate mapping, and use Key.equals 
- Faces are reported differently from other rectangles, so the mapping
  has to be specialized for them

- Use Key.equals for key comparison.

Bug: 11206459
Change-Id: I9a2a408dad981c2911048191ec30977020953146
 2013-10-14 18:20:43 -07:00
John Spurlock
f8508272ad Give IMEs the entire screen to use for measuring purposes. 
IMEs recently gained the ability to layout out under the nav bar,
but our core measuring logic does not give height=WRAP_CONTENT windows
the entire screen height when computing desired window height.

Since IMEs can be identified by type, let them use the entire screen
height for measuring purposes, to properly handle the cases where
space is constrained, making that unaccounted-for nav bar height
important.

Bug:11215678
Change-Id: I1d0b73454c0c629e7d669b9de70641c7e8c4d333
 2013-10-14 21:06:52 -04:00
Dianne Hackborn
e49a107a24 Merge "Fix issue #11223335: APR: Lots of failures in procstats due to..." into klp-dev 2013-10-15 01:00:07 +00:00
Michael Jurka
f6f545f6a7 Merge "Fix the build" into klp-dev 2013-10-15 00:42:52 +00:00
Michael Jurka
5d1893bafb Fix the build 2013-10-14 17:40:27 -07:00
Michael Jurka
bcfc634db9 Merge "Ensure URIs have content:// scheme in WPM" into klp-dev 2013-10-15 00:27:50 +00:00
Jeff Sharkey
ddf5a170d5 Merge "Relax user constraint on storage state." into klp-dev 2013-10-15 00:25:23 +00:00
Dianne Hackborn
878deb3c7b Fix issue #11223335: APR: Lots of failures in procstats due to... 
...bad cleanup of crashing processes

We now have a special path for crashing processes, to silently
clean up their state.

Also some tweaks to Log/Slog.wtf to get better stack crawl
summaries in APR.

Change-Id: Ieced26989907a6e7615b6fa033813fced78d7474
 2013-10-14 17:15:40 -07:00
Jeff Sharkey
8e656df092 Merge "Add extras to AFD, send orientation metadata." into klp-dev 2013-10-15 00:00:20 +00:00
Adam Lesinski
bba72d13af Ensure URIs have content:// scheme in WPM 
getCropAndSetWallpaperIntent should only accept URIs with
the content:// scheme, so that the receiving application
doesn't crash opening a file it can't access.

bug:11173560
Change-Id: I855496633b646373db757e9d8e6e425568103b8b
 2013-10-14 16:51:56 -07:00
Jeff Sharkey
a6d1999529 Relax user constraint on storage state. 
Otherwise we wtf() when called various places in the system.

Bug: 11223886
Change-Id: I514d28603db02e3debd4af1cf20049af0c7399f4
 2013-10-14 16:43:42 -07:00
Martijn Coenen
7d91cc97d7 Merge "NFC card emulation API docs." into klp-dev 2013-10-14 23:30:21 +00:00
Jeff Sharkey
c1c8f3f97d Add extras to AFD, send orientation metadata. 
AssetFileDescriptor augments a ParcelFileDescriptor with details
about how it should be interpreted, so extend it to support a Bundle
of extras.  Then use these extras to share thumbnail orientation
metadata.

The raw image data of EXIF thumbnails matches the orientation of
the enclosing image, but the thumbnail data doesn't repeat the EXIF
flags.  This meant that receivers of openDocumentThumbnail() would
get an image that needed to be transformed, but without enough
context to actually transform it.

Instead of transforming and recompressing the image on the fly on
the provider side, send a transformation hint that the receiver
side can interpret.

Bug: 11205688
Change-Id: Ibc5a7ad002377a55e6ffcb5ac5c8829841002e06
 2013-10-14 15:28:19 -07:00
Kenny Root
183cd0ca64 am 7a2f4ae1: am 69779458: am 7878883e: Merge "Remove direct reference to X509CertImpl" 
* commit '7a2f4ae13223bb804417e9ce3294b22bd9bda49a':
  Remove direct reference to X509CertImpl
 2013-10-14 14:07:05 -07:00
Kenny Root
7a2f4ae132 am 69779458: am 7878883e: Merge "Remove direct reference to X509CertImpl" 
* commit '69779458aeef3fa9d9c6f54487784cf558c850e8':
  Remove direct reference to X509CertImpl
 2013-10-14 14:04:55 -07:00
Kenny Root
69779458ae am 7878883e: Merge "Remove direct reference to X509CertImpl" 
* commit '7878883ed922f17c930c0d40588f62acf73f9a9c':
  Remove direct reference to X509CertImpl
 2013-10-14 14:02:52 -07:00
Kenny Root
27e549428e Remove direct reference to X509CertImpl 
This should use the system default X.509 certificate provider.

Change-Id: Ibdfd800a9d10f9dc566a360401efe7c3dc6cef5d
 2013-10-14 13:39:43 -07:00