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

197461 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
c7a607496a am d3719ab0: Merge "Better handling of storage paths." into mnc-dev 
* commit 'd3719ab07a0ba66c019979ce19c45b77c4aae92e':
  Better handling of storage paths.
 2015-07-14 21:18:26 +00:00
Chien-Yu Chen
951e2633eb am 6eec00ec: Merge "Camera: Reconnect after camera service crashes" into mnc-dev 
* commit '6eec00ecf456b8a24487828b6f515cccc465cc1a':
  Camera: Reconnect after camera service crashes
 2015-07-14 21:18:22 +00:00
Jorim Jaggi
4cfdcf5b05 Touch, wake and unlock 
- Add onFingerprintAcquired, so Keyguard can grab a wakelock to prevent
the device from sleeping.
- If we get a successful fingerprint, wake the device up, immediately
dismiss the keyguard and tell PWM that we kicked off our frame that
will represent the correct state.
- PWM then waits for this frame to be drawn, and then turns on the
screen, which results in unlocking directly to the previsouly
opened app.

Bug: 21855614
Change-Id: I0c43bcc9d334b509632704fb0c123ab3351edff2
 2015-07-14 21:05:26 +00:00
Jeff Sharkey
d3719ab07a Merge "Better handling of storage paths." into mnc-dev 2015-07-14 20:53:16 +00:00
Chien-Yu Chen
6eec00ecf4 Merge "Camera: Reconnect after camera service crashes" into mnc-dev 2015-07-14 20:48:56 +00:00
Julia Reynolds
a05e7ac245 am 5cf30c60: Merge "Pass wifi ap state through to tile when receiver triggered." into mnc-dev 
* commit '5cf30c608f21a9685310e6cf7d5970c8b7fb36c8':
  Pass wifi ap state through to tile when receiver triggered.
 2015-07-14 20:30:36 +00:00
Andrew Solovay
90adb81b6c am 353886b2: am e67416ec: am 4859a612: Merge "docs: Clarified how to find out when a switch is toggled" into mnc-preview-docs 
* commit '353886b2dd1d6751d83469ddd3eb01dd0039231e':
  docs: Clarified how to find out when a switch is toggled
 2015-07-14 20:30:31 +00:00
Jason Monk
41904c99c2 am fb973240: Merge "Fix status bar bt accessibility message" into mnc-dev 
* commit 'fb9732409a5f419ec00ba7b76de94bbcbd971936':
  Fix status bar bt accessibility message
 2015-07-14 20:30:27 +00:00
Jason Monk
a754215576 am 2061049d: Merge "Move wifi accessibility strings to SettingsLib" into mnc-dev 
* commit '2061049d69390a7f4ace9b37bb983ebbb4caa678':
  Move wifi accessibility strings to SettingsLib
 2015-07-14 20:30:24 +00:00
Julia Reynolds
5cf30c608f Merge "Pass wifi ap state through to tile when receiver triggered." into mnc-dev 2015-07-14 20:23:50 +00:00
Andrew Solovay
353886b2dd am e67416ec: am 4859a612: Merge "docs: Clarified how to find out when a switch is toggled" into mnc-preview-docs 
* commit 'e67416eccc6092e2fce3619b2244deda36fabd26':
  docs: Clarified how to find out when a switch is toggled
 2015-07-14 20:22:59 +00:00
Adam Lesinski
ba7e39d53a am 92a3914f: Merge "BatteryStats: Remove uid_cputime Slog.wtf for high cpu times" into mnc-dev 
* commit '92a3914fb353b725646a96185d1c1daaf3977e7b':
  BatteryStats: Remove uid_cputime Slog.wtf for high cpu times
 2015-07-14 20:22:44 +00:00
Jason Monk
fb9732409a Merge "Fix status bar bt accessibility message" into mnc-dev 2015-07-14 20:21:08 +00:00
Jason Monk
2061049d69 Merge "Move wifi accessibility strings to SettingsLib" into mnc-dev 2015-07-14 20:20:36 +00:00
Jason Monk
1aa3282d12 Fix status bar bt accessibility message 
Use the same description for both QS and status bar.

Bug: 20345203
Change-Id: I5789c1385d2240e1ad426a008e6e2192885ddc2b
 2015-07-14 16:10:32 -04:00
Adam Lesinski
92a3914fb3 Merge "BatteryStats: Remove uid_cputime Slog.wtf for high cpu times" into mnc-dev 2015-07-14 20:08:43 +00:00
Jeff Sharkey
983294596e Better handling of storage paths. 
Give more details about why we failed to create storage paths, and
search for underlying volumes using canonical paths.

Bug: 22135060
Change-Id: I75d3584403ece310438b05f5b9fe72d94c9096c6
 2015-07-14 13:08:22 -07:00
Andrew Solovay
e67416eccc am 4859a612: Merge "docs: Clarified how to find out when a switch is toggled" into mnc-preview-docs 
* commit '4859a6125bcf967cf97339b19f30d9788b971e02':
  docs: Clarified how to find out when a switch is toggled
 2015-07-14 20:08:00 +00:00
Andrew Solovay
4859a6125b Merge "docs: Clarified how to find out when a switch is toggled" into mnc-preview-docs 2015-07-14 19:59:07 +00:00
Svetoslav
ddae5f1e58 am 8b6d5b6b: Merge "Clear binder id when determining external storage state" into mnc-dev 
* commit '8b6d5b6b6ac3c363ad7aa36873dec1701d33de1e':
  Clear binder id when determining external storage state
 2015-07-14 19:51:25 +00:00
Dan Sandler
50e79b9fd0 am 66cc6bb6: Merge "Allow notification strings to be unredacted in dump output." into mnc-dev 
* commit '66cc6bb65eac220a01b6a300cf64f1035a0463af':
  Allow notification strings to be unredacted in dump output.
 2015-07-14 19:51:20 +00:00
Svetoslav
8b6d5b6b6a Merge "Clear binder id when determining external storage state" into mnc-dev 2015-07-14 19:39:16 +00:00
Dan Sandler
66cc6bb65e Merge "Allow notification strings to be unredacted in dump output." into mnc-dev 2015-07-14 19:38:16 +00:00
Adrian Roos
9c013a2117 Merge "Show charging speed on Keyguard" into mnc-dr-dev 2015-07-14 19:17:07 +00:00
Svetoslav
d72fc63aae am 46d1864c: Merge "Make get_accounts a runtime permissions again" into mnc-dev 
* commit '46d1864ceee7229cd7fe7bac80226c930539861d':
  Make get_accounts a runtime permissions again
 2015-07-14 18:52:21 +00:00
Svetoslav
46d1864cee Merge "Make get_accounts a runtime permissions again" into mnc-dev 2015-07-14 18:42:08 +00:00
Selim Cinek
92c2755099 am f5adce87: Merge "Removed logging for the empty keyguard" into mnc-dev 
* commit 'f5adce87581bd3b7e8fd2846a85dbbf8c0dca939':
  Removed logging for the empty keyguard
 2015-07-14 18:36:57 +00:00
Adam Lesinski
67eea87e0d BatteryStats: Remove uid_cputime Slog.wtf for high cpu times 
High cpu times are expected as multiple cores can be running at the
same time, so comparing against the time between samples is incorrect.

I am reasonable certain that the values we see now are correct, so disabling this
check. However, checking for negative values (overflows) is still enabled and
will remain enabled because there is no case where we will be ok with negative deltas.

Bug:22461683
Change-Id: If9c7cdbb75ceaed059d1e0f4dd83cfdd3e021a93
 2015-07-14 11:33:53 -07:00
Svetoslav
38c3dbb209 Clear binder id when determining external storage state 
bug:22472435

Change-Id: I5badd51cb9fb2244395880eb1bbff8f4aa0abb8c
 2015-07-14 11:30:10 -07:00
Selim Cinek
f5adce8758 Merge "Removed logging for the empty keyguard" into mnc-dev 2015-07-14 18:27:59 +00:00
Adrian Roos
7b04311d88 Show charging speed on Keyguard 
Bug: 8099739
Change-Id: I2e5c21dd7ec028ce47fb03ab71e74f7fccaa9e36
 2015-07-14 18:22:39 +00:00
Amit Mahajan
336f18ba28 am 51b4e97a: Merge "Add checks for READ_PRIVILEGED_PHONE_STATE." into mnc-dev 
* commit '51b4e97ae42fb789b7d1c9d4134ddaa7e2b27b11':
  Add checks for READ_PRIVILEGED_PHONE_STATE.
 2015-07-14 18:12:59 +00:00
Amit Mahajan
51b4e97ae4 Merge "Add checks for READ_PRIVILEGED_PHONE_STATE." into mnc-dev 2015-07-14 17:59:20 +00:00
Julia Reynolds
b8a46a6c77 Pass wifi ap state through to tile when receiver triggered. 
Bug: 22450078
Change-Id: I9b339aa2238a7427291bfdc2ef6aab58dcdb5cf3
 2015-07-14 13:56:03 -04:00
Jason Monk
5086a970e7 am fe03a84b: Merge "Fix QS labels on language change" into mnc-dev 
* commit 'fe03a84bc6d59e9b09029cfa8800bd9ef8d85d18':
  Fix QS labels on language change
 2015-07-14 17:49:29 +00:00
Jason Monk
fe03a84bc6 Merge "Fix QS labels on language change" into mnc-dev 2015-07-14 17:40:23 +00:00
Marco Nelissen
c56668eb22 am 3ced9617: Merge "Use original path if translated path doesn\'t exist" into mnc-dev 
* commit '3ced96178b1b132705e773736cbb707a3a0cd951':
  Use original path if translated path doesn't exist
 2015-07-14 17:36:07 +00:00
Craig Lafayette
d86ab3c539 am 2f0116fa: Merge "Prevent null allowableAccounts from crashing" into mnc-dev 
* commit '2f0116fa3ab2153188e43e87b194afae7e4efb81':
  Prevent null allowableAccounts from crashing
 2015-07-14 17:36:02 +00:00
Chris Craik
e2a5c184e3 am 941bcedb: Merge "Fix unsafety in SkiaShader storage, and texture unit accounting" into mnc-dev 
* commit '941bcedb4c03832cd54225217697c7b8cba6e07c':
  Fix unsafety in SkiaShader storage, and texture unit accounting
 2015-07-14 17:35:50 +00:00
Jason Monk
f05ca67ce4 Move wifi accessibility strings to SettingsLib 
Bug: 22468835
Change-Id: I66e85e8adfb3eda194995eda529422a172f00cbd
 2015-07-14 13:32:33 -04:00
Marco Nelissen
3ced96178b Merge "Use original path if translated path doesn't exist" into mnc-dev 2015-07-14 17:30:06 +00:00
Amit Mahajan
7c5befa4a7 Add checks for READ_PRIVILEGED_PHONE_STATE. 
Callers will have either PRIVILEGED or regular READ_PHONE_STATE.

Bug: 22468536
Change-Id: I60251f61250a975f4147b027d2539824a728e3b5
 2015-07-14 10:26:00 -07:00
Craig Lafayette
2f0116fa3a Merge "Prevent null allowableAccounts from crashing" into mnc-dev 2015-07-14 17:25:40 +00:00
Chris Craik
941bcedb4c Merge "Fix unsafety in SkiaShader storage, and texture unit accounting" into mnc-dev 2015-07-14 16:58:01 +00:00
Jason Monk
a758ba6be9 Fix QS labels on language change 
Some tiles now won't do updates if the state hasn't changed (rotation) to avoid
breaking the animation state. To handle this, state is cleared when the
configuration changes.

Bug: 22206214
Change-Id: I029fb4c75cc920a6c9907b65e8c48d28c21d529a
 2015-07-14 12:29:28 -04:00
Alex Klyubin
5eaf24126d am 10633c96: Merge "Fix Android Keystore key factories to obey JCA contract." into mnc-dev 
* commit '10633c96b55d13f05304b758b01be48035adece3':
  Fix Android Keystore key factories to obey JCA contract.
 2015-07-14 16:28:28 +00:00
Alex Klyubin
10633c96b5 Merge "Fix Android Keystore key factories to obey JCA contract." into mnc-dev 2015-07-14 16:16:03 +00:00
Yohei Yukawa
be27832bba am 12952c79: Merge "Allow FloatingToolbar to be outside of the attached window." into mnc-dev 
* commit '12952c79528cd7ea804c400e5908a24e56f69bbe':
  Allow FloatingToolbar to be outside of the attached window.
 2015-07-14 15:45:05 +00:00
Yohei Yukawa
12952c7952 Merge "Allow FloatingToolbar to be outside of the attached window." into mnc-dev 2015-07-14 15:35:57 +00:00
Ronghua Wu
70250d3597 am 148c7c5c: Merge "media: Implement getAchievableFrameRatesFor with measured frame rate." into mnc-dev 
* commit '148c7c5c1794a9e306660f22c7cbbbc9906e5f5e':
  media: Implement getAchievableFrameRatesFor with measured frame rate.
 2015-07-14 15:33:25 +00:00