199405 Commits

Author SHA1 Message Date
David Friedman
311f8eeee0 am ed54f60a: Merge "Docs: Updating, clarifying Debug-over-WiFi instructions. Bug: 21371836" into mnc-preview-docs
* commit 'ed54f60ae4d57ed1e9cc963fc3baf5de91d51c53':
  Docs: Updating, clarifying Debug-over-WiFi instructions. Bug: 21371836
2015-08-19 22:31:15 +00:00
Tyler Gunn
a656260310 am 1e9bfc64: Fix incorrect android.telecom.Call.Details equality check.
* commit '1e9bfc6461d3fe5455c9d7a21414ec66695b5798':
  Fix incorrect android.telecom.Call.Details equality check.
2015-08-19 22:29:51 +00:00
David Friedman
ed54f60ae4 Merge "Docs: Updating, clarifying Debug-over-WiFi instructions. Bug: 21371836" into mnc-preview-docs 2015-08-19 22:21:41 +00:00
David Friedman
aee78937e4 Docs: Updating, clarifying Debug-over-WiFi instructions.
Bug: 21371836

Change-Id: Ieef63c416c85f778e4b00ef08b434040709c2493
2015-08-19 15:19:18 -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
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
Tyler Gunn
1e9bfc6461 Fix incorrect android.telecom.Call.Details equality check.
The the android.telecom.Call.Details class provides its own equals
implementation.  Recently added in M is to also check if the mExtras
and mIntentExtras are different.  Unfortunately, Bundles do not implement
equals.  As a result when Telecom calls are parceled and sent to the
InCallServices, this means that the internalUpdate method will always
assume that the Details of a call have changed, even if they have not.
This was causing a LOT of extra calls to onUpdate in the InCall UI (2x the
amount).  Although there is still room for improvement in the number of
callbacks from Telecom, this fix prevents a pretty significant regression
on that front.

Bug: 23218195
Change-Id: I128e996faf60376ed3df1dc848a97c4a7b0482ee
2015-08-19 20:52:13 +00:00
Adrian Roos
06a86644cc Merge "Fix wakelock leak for dozing" into mnc-dr-dev 2015-08-19 20:50:04 +00:00
Lorenzo Colitti
11e84bde9e Merge "Don't mark NetworkRequests restricted when they don't have restricted caps" into mnc-dev 2015-08-19 20:48:31 +00:00
Chien-Yu Chen
c3aa7f3a75 Merge "Camera2: Handle surface size change" into mnc-dr-dev 2015-08-19 20:40:11 +00:00
Amith Yamasani
e1df482c17 am e3de6c5d: Merge "Fix crashes when removing work profile" into mnc-dev
* commit 'e3de6c5df5a94e627c5ee0f188cbb066233a3dd0':
  Fix crashes when removing work profile
2015-08-19 20:19:28 +00:00
Jorim Jaggi
5fb4b98bdd Fix wakelock leak for dozing
Bug: 23344235
Change-Id: I7f4233cfe15bdd3e8cc5f01a70707bdde9fc1737
2015-08-19 13:14:28 -07:00
Amith Yamasani
e3de6c5df5 Merge "Fix crashes when removing work profile" into mnc-dev 2015-08-19 20:10:30 +00:00
Dianne Hackborn
5c577bab3b am 29cd8808: Merge "Fix issue #23326715: Clarify --checkin/-c options in batterystats" into mnc-dev
* commit '29cd880890825ce15a1b2da977bcb1796db6f4e3':
  Fix issue #23326715: Clarify --checkin/-c options in batterystats
2015-08-19 18:31:20 +00:00
Dianne Hackborn
29cd880890 Merge "Fix issue #23326715: Clarify --checkin/-c options in batterystats" into mnc-dev 2015-08-19 18:25:29 +00:00
Geoff Mendal
399237f825 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-08-19 16:15:00 +00:00
Zhentao Sun
f2f0114848 Merge "Launched camera in the correct user." into mnc-dr-dev 2015-08-19 16:12:25 +00:00
Geoff Mendal
79fd5c4559 Import translations. DO NOT MERGE
Change-Id: Ibf82892f48ab6cc0b5aa3eb2460859afa8e44332
Auto-generated-cl: translation import
2015-08-19 11:00:52 -05:00
Sebastien Hertz
18089ceb71 Allow debugging only for apps forked from zygote DO NOT MERGE
When starting the runtime from app_process, we only pass JDWP options
if starting zygote. It prevents from opening a JDWP connection in
non-zygote programs while Android apps (forked from zygote) remain
debuggable.

Bug: 23050463

(cherry picked from commit 7a09b8322cab26d6e3da1362d3c74964ae66b5d4)

Change-Id: I2400ecc8aea7579c43300efccf288b69f70eef53
2015-08-19 17:12:34 +02:00
Paul Jensen
aae613d961 Don't mark NetworkRequests restricted when they don't have restricted caps
Requests without NET_CAPABILITIES_INTERNET and just the default network
capabilities should not be marked restricted.  Without this fix apps
can hit permissions exceptions if they inadvertently make requests
without NET_CAPABILITIES_INTERNET.

Bug:23164917
Change-Id: I4c7136821315bcb05dfc42ffbc505a5d4f6109e6
2015-08-19 11:08:38 -04:00
Geoff Mendal
81d99d4783 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-08-19 14:07:13 +00:00
Geoff Mendal
31a96b3716 Import translations. DO NOT MERGE
Change-Id: I13d19cb68c1b7b7880e2168e621c377c2b750b1b
Auto-generated-cl: translation import
2015-08-19 07:02:46 -07:00
Geoff Mendal
c2e81a0c2d Import translations. DO NOT MERGE
Change-Id: Ifd3cfe65e9a82e21d6a1611368dcbe9d6dfee829
Auto-generated-cl: translation import
2015-08-19 06:53:44 -07:00
Sebastien Hertz
ff8dc21278 Allow debugging only for apps forked from zygote
When starting the runtime from app_process, we only pass JDWP options
if starting zygote. It prevents from opening a JDWP connection in
non-zygote programs while Android apps (forked from zygote) remain
debuggable.

Bug: 23050463

(cherry picked from commit 7a09b8322cab26d6e3da1362d3c74964ae66b5d4)

Change-Id: Ib5b6d3bc4d45389993c3c54226df5a7b72479d19
2015-08-19 11:25:56 +02:00
Jorim Jaggi
b960e75e52 am 8b8fa3e9: Fix SysUI crash when no metadata is provided
* commit '8b8fa3e934e3ddf01790e647b4401dc88b24bf67':
  Fix SysUI crash when no metadata is provided
2015-08-19 02:20:10 +00:00
Jorim Jaggi
8b8fa3e934 Fix SysUI crash when no metadata is provided
Bug: 23327474
Change-Id: I4903c0812c9677e1b31e1f645e3d6f1a03150c38
2015-08-19 01:34:33 +00:00
Jorim Jaggi
27c1a728c8 am f610bd78: Fix race conditions for camera prewarm service
* commit 'f610bd78b2cf574faa197ed9f21128ac7795a407':
  Fix race conditions for camera prewarm service
2015-08-19 01:08:27 +00:00
Jorim Jaggi
0835f33a4d Merge "Improve motion for wake-and-unlocking while pulsing" into mnc-dr-dev 2015-08-19 01:04:58 +00:00
Jorim Jaggi
394686efbb Merge "Fix race condition for doze mode and wake-and-unlocking" into mnc-dr-dev 2015-08-19 01:04:54 +00:00
Jorim Jaggi
83eb6bb5d8 Improve motion for wake-and-unlocking while pulsing
- Move all fingerprint related to logic in on central class in
SystemUI that knows all the state of the UI so there is exactly ONE
place in which we decide what to do when we acquire a fingerprint.
- When pulsing and we get a valid finger, we fade the contents of the
Keyguard out and fade the scrim out almost the same way as we would do
in a normal wake-and-unlock sequence.
- Hide shadows while dozing, so we don't see the artifacts when we fade
the dozed Keyguard out.

Bug: 23225107
Change-Id: I82f78e61f2530cf7d507ade80f6f0a340c082567
2015-08-18 17:57:10 -07:00
Chris Craik
892768fb3e am 0b804542: Merge "Constrain drawBitmap matrix-to-rect optimization" into mnc-dev
* commit '0b8045425ff58f992046ff2be35bc91001dabf7b':
  Constrain drawBitmap matrix-to-rect optimization
2015-08-19 00:54:00 +00:00
Tenghui Zhu
df23f37105 am c9ecc985: Merge "Add some bookmarks to plugin-for-gradle page" into mnc-dev
* commit 'c9ecc985947462e3032fdd3b1c6abc0d5b5b1084':
  Add some bookmarks to plugin-for-gradle page
2015-08-19 00:53:52 +00:00
Quddus Chong
f17a4f4257 am 54bdb2e7: Merge "docs: Updated hardware system images for M." into mnc-dev
* commit '54bdb2e732de98ae2829101570dc29970e377fa3':
  docs: Updated hardware system images for M.
2015-08-19 00:53:39 +00:00
Adam Lesinski
bda9b324c8 am 886e7a63: Merge "Change default cellular activity timeout to 10" into mnc-dev
* commit '886e7a63b122a30c69c663d32e3e5f880a07593e':
  Change default cellular activity timeout to 10
2015-08-19 00:53:35 +00:00
Jorim Jaggi
ee2cfe48d4 Only call authenticate when we are not listening yet
Bug: 23304421
Change-Id: I5c589ba8992039ca995138d7d74abd123b911a5c
2015-08-19 00:51:23 +00:00
Dianne Hackborn
865b79b43b Fix issue #23326715: Clarify --checkin/-c options in batterystats
Change-Id: I3f026447ba7c6d2c3f9ef065269c31a78cf73512
2015-08-18 17:33:00 -07:00
Zhentao Sun
4354a05f85 Launched camera in the correct user.
Fixed b/23325974.
The camera was always launched in the device owner's profile. Now it can
work with secondary users.

Change-Id: I826b341a7e73a9dd603dd5df7aa31bfaf4d440c4
2015-08-18 17:05:37 -07:00
Jorim Jaggi
f610bd78b2 Fix race conditions for camera prewarm service
When the unbind request came in before the service was actually
bound, we dropped the unbind request because mPrewarmBound was still
false. Fix that by tracking whether a bind is pending and if a unbind
event comes in during that time, set another flag to unbind it
directly again when the service is actually bound. In addition, don't
allow binding again if any of the previous events are still pending.

Bug: 23143748
Change-Id: I2b8ace86e35479a9848668a3462a2ce687835413
2015-08-19 00:01:45 +00:00
Chris Craik
0b8045425f Merge "Constrain drawBitmap matrix-to-rect optimization" into mnc-dev 2015-08-18 23:51:11 +00:00
Amith Yamasani
236b2b5d28 Fix crashes when removing work profile
This isn't specific to work profile. When multiple user
deletions happen in sequence, a race causes a dying user
to lose permissions prematurely. This fix delays removal of
user state until the user is completely cleaned up and all the
processes have been killed.

Bug: 23178833
Change-Id: I1636bc2022416359a25f19a3f65d113c05289cd3
2015-08-18 16:48:55 -07:00
Tenghui Zhu
c9ecc98594 Merge "Add some bookmarks to plugin-for-gradle page" into mnc-dev 2015-08-18 23:13:12 +00:00
Jim Miller
bea9d7b94c Merge "Reset fingerprint lockout timer when strong auth is used." into mnc-dr-dev 2015-08-18 23:12:18 +00:00
Chien-Yu Chen
828adbba24 Camera2: Handle surface size change
When comparing if two OutputConfigurations are equal, also check
the width, height, format, dataspace when the output configurations
were created. With this, CameraDeviceImpl knows that the surface has
changed sizes and will reconfigure the stream.

Bug: 12250682
Change-Id: Ie5965d242b2017b87a76d26cdc2f6b700082e002
2015-08-18 16:06:54 -07:00
Quddus Chong
54bdb2e732 Merge "docs: Updated hardware system images for M." into mnc-dev 2015-08-18 22:03:21 +00:00
Chris Craik
e688bf7203 Constrain drawBitmap matrix-to-rect optimization
bug:22962165

Optimization is not valid if matrix would flip image.

Change-Id: Ieee42390517bd3466b7d94596f0fbbe192ab757e
2015-08-18 14:53:47 -07:00
Quddus Chong
3166cc869e docs: Updated hardware system images for M.
Change-Id: Ied1658cd2c3052e4c6cf23aa18b65b291d03dbc6
2015-08-18 14:43:33 -07:00
Adam Lesinski
886e7a63b1 Merge "Change default cellular activity timeout to 10" into mnc-dev 2015-08-18 20:43:34 +00:00
Jorim Jaggi
358fcc795e Do not start with a black frame in bootanimation
Bug: 23128307
Change-Id: I0ec044f983c1c30960be046e43a882c63205dc5f
2015-08-18 20:26:47 +00:00
Jim Miller
33a5c80773 resolved conflicts for merge of 448216e7 to mnc-dr-dev
Change-Id: Ic83b34ab6114e2ffe6e08961eaea07110efc5cc5
2015-08-18 13:07:25 -07:00
Jim Miller
e0507bbbf9 Reset fingerprint lockout timer when strong auth is used.
Fixes bug 22565462

Change-Id: I4842877839845e7fe103396d8ca8104928568c04
2015-08-18 13:01:31 -07:00