Daniel Estrada Alva
28fa6705bd
am e4d61989: am f440fe06: am 8ff73b59: Merge "Cherry-pick: Add callback-based support for HW Activity Recognition." into mnc-dr-dev
...
* commit 'e4d61989aebaee02b8b83f229418e7744278633f':
Cherry-pick: Add callback-based support for HW Activity Recognition.
2015-08-26 17:56:18 +00:00
Daniel Estrada Alva
f440fe06f5
am 8ff73b59: Merge "Cherry-pick: Add callback-based support for HW Activity Recognition." into mnc-dr-dev
...
* commit '8ff73b596e7c59f32a3f0df503ae8a9e5adbced5':
Cherry-pick: Add callback-based support for HW Activity Recognition.
2015-08-26 17:37:15 +00:00
Daniel Estrada Alva
8ff73b596e
Merge "Cherry-pick: Add callback-based support for HW Activity Recognition." into mnc-dr-dev
2015-08-26 17:30:09 +00:00
Eino-Ville Talvala
d9a24b1b90
am d7f3dfb7: am cd05509a: am 6393275f: am 2bf7b98a: Merge "Camera2: Remove filtering for non-BURST_CAPTURE-capable devices" into mnc-dev
...
* commit 'd7f3dfb7c8f40308a95a56f90ef7a1157897cce6':
Camera2: Remove filtering for non-BURST_CAPTURE-capable devices
2015-08-24 23:38:17 +00:00
Eino-Ville Talvala
cd05509a81
am 6393275f: am 2bf7b98a: Merge "Camera2: Remove filtering for non-BURST_CAPTURE-capable devices" into mnc-dev
...
* commit '6393275f5f8daa2d14dbc3fbd6511a78978999cd':
Camera2: Remove filtering for non-BURST_CAPTURE-capable devices
2015-08-24 23:21:16 +00:00
Eino-Ville Talvala
6393275f5f
am 2bf7b98a: Merge "Camera2: Remove filtering for non-BURST_CAPTURE-capable devices" into mnc-dev
...
* commit '2bf7b98a2ade8b3fe25143fa9ef94f2266a908dd':
Camera2: Remove filtering for non-BURST_CAPTURE-capable devices
2015-08-24 23:12:16 +00:00
Eino-Ville Talvala
2bf7b98a2a
Merge "Camera2: Remove filtering for non-BURST_CAPTURE-capable devices" into mnc-dev
2015-08-24 23:08:00 +00:00
Eino-Ville Talvala
e3f5483977
Camera2: Remove filtering for non-BURST_CAPTURE-capable devices
...
Devices that do not support the BURST_CAPTURE capability do not
get the split resolution lists. However, one spot in the stream
configuration map enumeration did not guard against this properly.
As a result, the category of devices that are not-BURST-CAPABLE and
do list resolutions that operate at a 'slow' (<= 20fps) rates cause
an assert to fire from an apparently-inconsistent size list.
Guard the filtering correctly, to correctly support such
devices.
Bug: 23489536
Change-Id: Ib026f6555c69b7fac0cd1ea5027d598644cd8701
2015-08-24 14:08:58 -07:00
Eino-Ville Talvala
f76d558bb0
am 93826c7e: am f2c5ce5d: am a42cf680: Merge "Camera: Add support for notifying NFC stack when camera is active" into mnc-dr-dev
...
* commit '93826c7ebd3d5c6d6372a8bc6050d276727f7464':
Camera: Add support for notifying NFC stack when camera is active
2015-08-24 19:42:49 +00:00
Eino-Ville Talvala
f2c5ce5db1
am a42cf680: Merge "Camera: Add support for notifying NFC stack when camera is active" into mnc-dr-dev
...
* commit 'a42cf680a57e73eb4ed874bb78b7f47c6d5d76d3':
Camera: Add support for notifying NFC stack when camera is active
2015-08-24 19:27:42 +00:00
Eino-Ville Talvala
a42cf680a5
Merge "Camera: Add support for notifying NFC stack when camera is active" into mnc-dr-dev
2015-08-24 19:22:04 +00:00
destradaa
e1a5144a1d
Cherry-pick: Add callback-based support for HW Activity Recognition.
...
Add a callback-based mechanism for GmsCore to connect to Hardware Activity
Recognition. This allows GmsCore to stop polling to identify if the Android
platform supports the functionality or not.
Bug: 17112184
Change-Id: I8f9459cbd15eecd70f6919c6551e6f7a663c732f
2015-08-24 11:43:27 -07:00
Eino-Ville Talvala
8c0104ef9f
am b5a913f9: am f99eba07: am ec2efb9c: am 08b12dfb: Merge "Camera2: Legacy: Lock down surface sizes before creating EGL surfaces" into mnc-dev
...
* commit 'b5a913f9e264b79f5c714d4a590a44dac2ed2cf2':
Camera2: Legacy: Lock down surface sizes before creating EGL surfaces
2015-08-22 06:00:44 +00:00
Eino-Ville Talvala
f99eba07c0
am ec2efb9c: am 08b12dfb: Merge "Camera2: Legacy: Lock down surface sizes before creating EGL surfaces" into mnc-dev
...
* commit 'ec2efb9cac57f0cd6c371422114a37c5c9791ec8':
Camera2: Legacy: Lock down surface sizes before creating EGL surfaces
2015-08-22 05:45:46 +00:00
Eino-Ville Talvala
ec2efb9cac
am 08b12dfb: Merge "Camera2: Legacy: Lock down surface sizes before creating EGL surfaces" into mnc-dev
...
* commit '08b12dfba630659601972f0d857b6580fdae4313':
Camera2: Legacy: Lock down surface sizes before creating EGL surfaces
2015-08-22 05:38:01 +00:00
Eino-Ville Talvala
08b12dfba6
Merge "Camera2: Legacy: Lock down surface sizes before creating EGL surfaces" into mnc-dev
2015-08-22 05:33:26 +00:00
Eino-Ville Talvala
cf620038f4
am 68f46013: am 00ca835d: am e5b4c3d5: am a7dde2e8: Merge "Camera: Fix depth documentation issues" into mnc-dev
...
* commit '68f460130c64669070211ec121b7cd8fe659f286':
Camera: Fix depth documentation issues
2015-08-22 00:52:06 +00:00
Eino-Ville Talvala
2e3215c9f6
Camera: Add support for notifying NFC stack when camera is active
...
On some devices, NFC full poll operation and camera operation
interfere. Add a system property ro.camera.notify_nfc. When set to >
0, the NFC adapter will be notified to disable polling whenever the
camera is active.
Bug: 23393557
Change-Id: I7e22018900970cbbd3d34bd8b3974e0b1cc98a8d
2015-08-21 17:41:47 -07:00
Fyodor Kupolov
09dbd46af8
am 037281d4: am 563f974d: am d7cdbd4d: am e6c64508: Merge "Fixed a typo in convertRestrictionsToBundle JavaDoc" into mnc-dev
...
* commit '037281d4a9a22fa55b643e785ff32144cfa61591':
Fixed a typo in convertRestrictionsToBundle JavaDoc
2015-08-22 00:41:08 +00:00
Jim Miller
e271d91e5f
am 7225af94: am c66a0db2: am 1bbc2750: am 74d9c2aa: Merge "Fix type-o in FingerprintManager documentation" into mnc-dev
...
* commit '7225af947233f506d40500ab30a8c93bd1a603a5':
Fix type-o in FingerprintManager documentation
2015-08-22 00:40:58 +00:00
Adrian Roos
bcc26c0201
am 69fd61cb: am a8bbebd4: am b5e47228: Add StrongAuthTracker
...
* commit '69fd61cb9a487e5993098c93113d86c4fb32c304':
Add StrongAuthTracker
2015-08-22 00:40:47 +00:00
Eino-Ville Talvala
00ca835d89
am e5b4c3d5: am a7dde2e8: Merge "Camera: Fix depth documentation issues" into mnc-dev
...
* commit 'e5b4c3d5f329ee830c46f92deef23be1dfbead80':
Camera: Fix depth documentation issues
2015-08-22 00:33:47 +00:00
Eino-Ville Talvala
e5b4c3d5f3
am a7dde2e8: Merge "Camera: Fix depth documentation issues" into mnc-dev
...
* commit 'a7dde2e89ec9a8c0ce5460d4f57d1e561f16520f':
Camera: Fix depth documentation issues
2015-08-22 00:25:38 +00:00
Fyodor Kupolov
563f974d97
am d7cdbd4d: am e6c64508: Merge "Fixed a typo in convertRestrictionsToBundle JavaDoc" into mnc-dev
...
* commit 'd7cdbd4d812f3d3501c37b7242a7038298c7ee14':
Fixed a typo in convertRestrictionsToBundle JavaDoc
2015-08-22 00:17:44 +00:00
Jim Miller
c66a0db280
am 1bbc2750: am 74d9c2aa: Merge "Fix type-o in FingerprintManager documentation" into mnc-dev
...
* commit '1bbc2750bb58f397a0195540d50c44400c381441':
Fix type-o in FingerprintManager documentation
2015-08-22 00:17:22 +00:00
Adrian Roos
a8bbebd426
am b5e47228: Add StrongAuthTracker
...
* commit 'b5e4722891e7bbf2fffcd995af02838667a3abab':
Add StrongAuthTracker
2015-08-22 00:16:48 +00:00
Eino-Ville Talvala
a7dde2e89e
Merge "Camera: Fix depth documentation issues" into mnc-dev
2015-08-22 00:14:13 +00:00
Eino-Ville Talvala
315bc09715
Camera2: Legacy: Lock down surface sizes before creating EGL surfaces
...
This ensures that sizes don't change after being initially inspected,
and/or stale size information isn't reused incorrectly.
Bug: 22092273
Change-Id: I5b26ea53977da4c1412e476d06d94aa791846393
2015-08-21 16:31:58 -07:00
Fyodor Kupolov
d7cdbd4d81
am e6c64508: Merge "Fixed a typo in convertRestrictionsToBundle JavaDoc" into mnc-dev
...
* commit 'e6c64508aba566b5bd4ac9cd87a07358b13f5a06':
Fixed a typo in convertRestrictionsToBundle JavaDoc
2015-08-21 23:12:43 +00:00
Fyodor Kupolov
e6c64508ab
Merge "Fixed a typo in convertRestrictionsToBundle JavaDoc" into mnc-dev
2015-08-21 23:04:09 +00:00
Jim Miller
1bbc2750bb
am 74d9c2aa: Merge "Fix type-o in FingerprintManager documentation" into mnc-dev
...
* commit '74d9c2aad1bcd52933a8dba7752b28e9aef1902d':
Fix type-o in FingerprintManager documentation
2015-08-21 22:11:30 +00:00
Jim Miller
74d9c2aad1
Merge "Fix type-o in FingerprintManager documentation" into mnc-dev
2015-08-21 21:59:51 +00:00
Adrian Roos
b5e4722891
Add StrongAuthTracker
...
Bug: 22846469
Bug: 22115393
Change-Id: I6ef5322d02e540fc043e7f20d3aabf595ce7c224
2015-08-21 13:28:00 -07:00
Fyodor Kupolov
7d35fc3898
Fixed a typo in convertRestrictionsToBundle JavaDoc
...
Bug: 23408097
Change-Id: Ie06c33aa7b9a953dec645d1763e27dcb506764f0
2015-08-21 11:25:55 -07:00
Fyodor Kupolov
9125dbbf93
am 1ffb592e: am 78985f3f: am ea57b592: am 1773ded8: Merge "Fixed key comparison in equals method" into mnc-dev
...
* commit '1ffb592e0b0bf68e2d1db13712dc1c9810507140':
Fixed key comparison in equals method
2015-08-20 20:19:36 +00:00
Fyodor Kupolov
78985f3fb5
am ea57b592: am 1773ded8: Merge "Fixed key comparison in equals method" into mnc-dev
...
* commit 'ea57b59222571e7e82d8b628e86b4ff0bdbe3f49':
Fixed key comparison in equals method
2015-08-20 20:02:42 +00:00
Fyodor Kupolov
ea57b59222
am 1773ded8: Merge "Fixed key comparison in equals method" into mnc-dev
...
* commit '1773ded84684593f459b19f3271d471b38f14f85':
Fixed key comparison in equals method
2015-08-20 19:53:29 +00:00
Fyodor Kupolov
1af7a83939
Fixed key comparison in equals method
...
Bug: 23376695
Change-Id: Ie4bd55a88f5f86fd8de7b087d0a5f1755951e90d
2015-08-20 10:24:14 -07:00
Jim Miller
5f69ca3be3
Fix type-o in FingerprintManager documentation
...
Fixes bug 23274133
Change-Id: I15607d0e64c0b11d36d0e0d47ea88c42101e4dde
2015-08-20 05:06:36 +00:00
Jeff Sharkey
39c4962580
am e6983e87: am cd6ba412: am bbb5717d: am f3ad1eab: Merge "Pass underlying volume UUID to StorageVolume." into mnc-dev
...
* commit 'e6983e877888dd51abe090b75fa568a64e9fc16e':
Pass underlying volume UUID to StorageVolume.
2015-08-20 01:57:52 +00:00
Jeff Sharkey
cd6ba4120c
am bbb5717d: am f3ad1eab: Merge "Pass underlying volume UUID to StorageVolume." into mnc-dev
...
* commit 'bbb5717dee12ec37e0fcc6c186e1f80b9890e987':
Pass underlying volume UUID to StorageVolume.
2015-08-20 01:44:05 +00:00
Jeff Sharkey
bbb5717dee
am f3ad1eab: Merge "Pass underlying volume UUID to StorageVolume." into mnc-dev
...
* commit 'f3ad1eabc1fa5252165bfe1516690d1026507f0a':
Pass underlying volume UUID to StorageVolume.
2015-08-20 01:33:59 +00:00
Jeff Sharkey
f3ad1eabc1
Merge "Pass underlying volume UUID to StorageVolume." into mnc-dev
2015-08-20 01:28:30 +00:00
Eino-Ville Talvala
abf0b8b0a8
Camera: Fix depth documentation issues
...
- Correct spelling of quaternion
- LENS_INTRINSIC_CALIBRATION and LENS_RADIAL_DISTORTION were not
linkifying correctly
Bug: 23360503
Change-Id: I9c5acc0087d7115548b75ccfa1bc1eb1866557b2
2015-08-19 16:21:15 -07:00
Jeff Sharkey
8e2ea2a9f1
Pass underlying volume UUID to StorageVolume.
...
To help MediaProvider uniquely identify storage devices, pass through
the UUID of the underlying private storage volume.
Bug: 23329611
Change-Id: I22ee7ea98fcb208d7797310acb3396a3f074f09b
2015-08-19 14:16:05 -07:00
Lorenzo Colitti
a5bfd73ab6
am ab5e962e: am d7121f56: am 0257c82f: am 11e84bde: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into mnc-dev
...
* commit 'ab5e962e1dd05799980342757edd8e83f4a76a8e':
Don't mark NetworkRequests restricted when they don't have restricted caps
2015-08-19 21:15:22 +00:00
Chien-Yu Chen
84551d61fd
am 6fdab993: am 86d86c2e: am c3aa7f3a: Merge "Camera2: Handle surface size change" into mnc-dr-dev
...
* commit '6fdab993919a1784676782ad1c67068a7f8a7fdc':
Camera2: Handle surface size change
2015-08-19 21:02:37 +00:00
Lorenzo Colitti
d7121f5651
am 0257c82f: am 11e84bde: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into mnc-dev
...
* commit '0257c82fa122243e97e4a1f4ef4bc4b8c21bd692':
Don't mark NetworkRequests restricted when they don't have restricted caps
2015-08-19 21:01:33 +00:00
Lorenzo Colitti
0257c82fa1
am 11e84bde: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into mnc-dev
...
* commit '11e84bde9e98cb4b777a67208989d259883e9375':
Don't mark NetworkRequests restricted when they don't have restricted caps
2015-08-19 20:54:48 +00:00
Chien-Yu Chen
86d86c2e7c
am c3aa7f3a: Merge "Camera2: Handle surface size change" into mnc-dr-dev
...
* commit 'c3aa7f3a7564f36db58d8a9a5470fd64f6fa282b':
Camera2: Handle surface size change
2015-08-19 20:48:27 +00:00
