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

199335 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Tim Kilbourn
2ad9449969 Merge "Use init to write usb typec props." into mnc-dr-dev 2015-08-18 19:54:46 +00:00
Roozbeh Pournader
579283647e am 53c38c88: Merge "Revert "Create a special CONSTRAINED font bucket in frameworks."" into mnc-dev 
* commit '53c38c8819e2497f8272e7615d34aaa4ae052adf':
  Revert "Create a special CONSTRAINED font bucket in frameworks."
 2015-08-18 19:37:16 +00:00
Jim Miller
448216e7b8 Merge "Revert "Disable fingerprint when remotely reset by DPM"" into mnc-dev 2015-08-18 19:32:01 +00:00
Roozbeh Pournader
53c38c8819 Merge "Revert "Create a special CONSTRAINED font bucket in frameworks."" into mnc-dev 2015-08-18 19:29:47 +00:00
Roozbeh Pournader
bbf0c88e6c Revert "Create a special CONSTRAINED font bucket in frameworks." 
This reverts commit 9e21eced5efacd605036be599d96974964deb09b.

Bug: 22929087
 2015-08-18 12:17:13 -07:00
Adam Lesinski
ed6160d299 Change default cellular activity timeout to 10 
LTE radios take 10 seconds to power down, so we should set the
activity timeout to 10 seconds.

Bug:23294704
Change-Id: I7478b77f134b0fe2d82e39acd5c370add12735ca
 2015-08-18 11:47:07 -07:00
Dianne Hackborn
4439dcdc39 am af75c17b: Fix issue #23270878: NPE in UsageStatsService while running UserManagementTest 
* commit 'af75c17bca8b2f017e254131393cd72e2fe7c6e8':
  Fix issue #23270878: NPE in UsageStatsService while running UserManagementTest
 2015-08-18 18:33:25 +00:00
Dianne Hackborn
af75c17bca Fix issue #23270878: NPE in UsageStatsService while running UserManagementTest 
Change-Id: I34d4fcdc103b3a6ea5c4ed78895f2fe18597237a
 2015-08-18 11:08:10 -07:00
Sebastien Hertz
e9de1b4cef am 9a010d0a: Merge "Allow debugging only for apps forked from zygote" into mnc-dev 
* commit '9a010d0a4157f97870bc38bd3dd0a8f4fd18a172':
  Allow debugging only for apps forked from zygote
 2015-08-18 07:50:06 +00:00
Sebastien Hertz
9a010d0a41 Merge "Allow debugging only for apps forked from zygote" into mnc-dev 2015-08-18 07:41:50 +00:00
Joe Fernandez
d294dc437d am 96695d2f: Merge "docs: App link doc update for M Preview 3" into mnc-dev 
* commit '96695d2f5961cbfac2d5c5ea6a7c03612991d5fb':
  docs: App link doc update for M Preview 3
 2015-08-18 07:28:31 +00:00
Joe Fernandez
96695d2f59 Merge "docs: App link doc update for M Preview 3" into mnc-dev 2015-08-18 07:23:35 +00:00
Joe Fernandez
94fc625cf1 docs: App link doc update for M Preview 3 
Change-Id: I9a8843bb2209f9ac12d5d0946dda1e3bdd6f1947
 2015-08-18 00:14:14 -07:00
David Friedman
5f89ce649c am 3e40a27e: Merge "Docs: Fixing files that didn\'t merge properly from mnc-preview-docs" into mnc-dev 
* commit '3e40a27eaca9e82398f7dc59006c14e56de7cc43':
  Docs: Fixing files that didn't merge properly from mnc-preview-docs
 2015-08-18 04:54:58 +00:00
David Friedman
3e40a27eac Merge "Docs: Fixing files that didn't merge properly from mnc-preview-docs" into mnc-dev 2015-08-18 04:50:23 +00:00
Jorim Jaggi
007f0e8f20 Fix race condition for doze mode and wake-and-unlocking 
When pulse was about to turn on and at the same time we were starting
a wake-and-unlock sequence, there was jank because the scrim handling
was not correct anymore. Now, abort the pulse when we are wake-and-
unlocking so we don't see flickering with the scrims anymore.

Bug: 23217476
Change-Id: I331f513b68fb1832b4372d3e2e518b31b556a43c
 2015-08-17 19:21:42 -07:00
Filip Gruszczynski
eb2f302d11 am 610008c0: Merge "Clear old clip rect when creating new surface." into mnc-dev 
* commit '610008c0ebf5ea4556b4825eac521b2b16f1a66c':
  Clear old clip rect when creating new surface.
 2015-08-18 02:12:47 +00:00
Filip Gruszczynski
610008c0eb Merge "Clear old clip rect when creating new surface." into mnc-dev 2015-08-18 02:04:57 +00:00