Adam Lesinski
69e17f59f8
am da43a3aa: Merge "BatteryStats: Start using cpu power from kernel" into mnc-dr-dev
...
* commit 'da43a3aacaba069e79f1dbfa491f6bc0b6f7fa95':
BatteryStats: Start using cpu power from kernel
2015-08-31 19:13:39 +00:00
Adam Lesinski
da43a3aaca
Merge "BatteryStats: Start using cpu power from kernel" into mnc-dr-dev
2015-08-31 19:04:46 +00:00
Robert Greenwalt
77d02900d8
am 5799f428: am e3bcde94: Merge "Reduce CONNECTIVITY_CHANGE bcasts" into mnc-dev
...
* commit '5799f428063cec8f0b85cdff41185e0725b19b74':
Reduce CONNECTIVITY_CHANGE bcasts
2015-08-28 21:47:20 +00:00
Robert Greenwalt
5799f42806
am e3bcde94: Merge "Reduce CONNECTIVITY_CHANGE bcasts" into mnc-dev
...
* commit 'e3bcde94caf8440d5e3958a340b3d276d03f7691':
Reduce CONNECTIVITY_CHANGE bcasts
2015-08-28 21:36:39 +00:00
Jorim Jaggi
e3238e53de
am b774e554: Optimize fp touch to wake: Shortcut for report next draw
...
* commit 'b774e554f32fd65cac30b43d1cf679403ef4af82':
Optimize fp touch to wake: Shortcut for report next draw
2015-08-28 20:19:31 +00:00
Jorim Jaggi
b774e554f3
Optimize fp touch to wake: Shortcut for report next draw
...
When telling window manager that Keyguard window is in the correct
state for a fp-touch-to-wake sequence, it takes more than 1 frame at
the moment because the signal that WM is waiting for the next draw
is delayed by one frame because it is posted at the end of the
runnable queue.
To correctly fix this, we should post it at the beginning at the
queue, but this is way too risky this late. Instead, add a isolated
SysUI hack to report it faster.
Bug: 23401557
Change-Id: Icf64101e27611c7c01d108123021b22186f1e70c
2015-08-28 20:07:35 +00:00
Robert Greenwalt
74ab4fae90
Reduce CONNECTIVITY_CHANGE bcasts
...
If an app uses the new api (requestNetwork) to bring up MMS, don't
mark it as a legacy request. This was done because the messaging
service had to use a combination of new API and old
(requestRouteToHost) due to api problems. This has been resolved
so don't mark these as legacy requests anymore.
The general stuff is still in for other types due to lack of testing
time but this should be removed altogether in the future.
bug:23350688
Change-Id: I41c27efb253c39d8af1357ae7916ed5315c716db
2015-08-28 12:37:54 -07:00
Ashish Sharma
7c388b0f73
am ffa3d040: am 3883e72a: Merge "BatteryStats: Bump checkin version" into mnc-dev
...
* commit 'ffa3d0408f9c3ffb5ab3ee45ef6c466d795fb2c8':
BatteryStats: Bump checkin version
2015-08-27 23:34:04 +00:00
Ashish Sharma
ffa3d0408f
am 3883e72a: Merge "BatteryStats: Bump checkin version" into mnc-dev
...
* commit '3883e72aeda7dcc5f76eba7ad2e95ad2cb041687':
BatteryStats: Bump checkin version
2015-08-27 23:28:22 +00:00
Ashish Sharma
3883e72aed
Merge "BatteryStats: Bump checkin version" into mnc-dev
2015-08-27 23:21:16 +00:00
Daniel Estrada Alva
243095c9ca
am 47ee2ecf: Merge "Disable AR HW when client binder dies." into mnc-dr-dev
...
* commit '47ee2ecf82958f211c775a4125968fbf505fe594':
Disable AR HW when client binder dies.
2015-08-26 21:19:53 +00:00
Daniel Estrada Alva
47ee2ecf82
Merge "Disable AR HW when client binder dies." into mnc-dr-dev
2015-08-26 21:09:50 +00:00
Alan Viverette
12874d2de4
am b9b57225: am 95137857: Merge "Avoid NPE when getPositionForView() is called on detached view" into mnc-dev
...
* commit 'b9b57225c28cdec5a8b7c2a6353f40a66010c0ed':
Avoid NPE when getPositionForView() is called on detached view
2015-08-26 20:56:42 +00:00
Alan Viverette
b9b57225c2
am 95137857: Merge "Avoid NPE when getPositionForView() is called on detached view" into mnc-dev
...
* commit '9513785715e2325ee3a3269fbfe7b1f4409eff5c':
Avoid NPE when getPositionForView() is called on detached view
2015-08-26 20:45:26 +00:00
Alan Viverette
9513785715
Merge "Avoid NPE when getPositionForView() is called on detached view" into mnc-dev
2015-08-26 20:38:53 +00:00
Alan Viverette
898c7045e0
Avoid NPE when getPositionForView() is called on detached view
...
Bug: 23557674
Change-Id: I76cb5f06081b2ac4c8f535df8d1a0aee17d2bb20
2015-08-26 15:22:09 -04:00
Chien-Yu Chen
aebc3cce3c
am fd059b34: am e4c3ff2f: Merge "Camera: Update for reprocess session" into mnc-dev
...
* commit 'fd059b34fa81552934a194f845f114d1d89f87db':
Camera: Update for reprocess session
2015-08-26 19:15:49 +00:00
Chien-Yu Chen
fd059b34fa
am e4c3ff2f: Merge "Camera: Update for reprocess session" into mnc-dev
...
* commit 'e4c3ff2f50dd8126bee379dd3b078ecf36d6a294':
Camera: Update for reprocess session
2015-08-26 19:07:52 +00:00
Chien-Yu Chen
e4c3ff2f50
Merge "Camera: Update for reprocess session" into mnc-dev
2015-08-26 18:56:15 +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
Chien-Yu Chen
e90c6d0ad2
Camera: Update for reprocess session
...
Document that some devices may not support submitting multiple
outputs in a single reprocess capture requests. Remove the
guaranteed reprocess session configurations that are less common
and may not be supported by all devices.
Bug: 23422291
Change-Id: I1c869612e9a83ef480113ca2628f68511a150b64
2015-08-25 11:58:21 -07: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
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
destradaa
614612edb5
Disable AR HW when client binder dies.
...
Ensure that activities are unregistered from AR HW when the client's
binder dies. This clean up is required to prevent AR HW to keep active
when there are no clients listening for events.
Bug: 19894637
Change-Id: Iccd609cf1d2d4a4453c7a96cb8645b61639c3234
2015-08-24 11:02:52 -07: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
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
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
Adam Lesinski
ab7672d45a
BatteryStats: Start using cpu power from kernel
...
This allows us to stop using approximate methods of attributing
cpu frequency time across apps and to use a more precise kernel
method that is aware of the time spent by a process on a given core
at a given frequency.
Bug:22773176
Change-Id: I3c34365fa8c73204f178a5610423901b13453d06
2015-08-21 16:46:14 -07: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
Adam Lesinski
bb5ac7976d
BatteryStats: Bump checkin version
...
Bug:23391894
Change-Id: I2af980531e07b106cc560c877fa128bbd9c2f18e
2015-08-20 16:44:37 -07: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