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

200755 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Lesinski
e5c0550dfe am 267240f2: Merge "BatteryStats: Clear power use when removing a UID from uid_cputime kernel module" into mnc-dev 
* commit '267240f2ddbaa0ea2828d7466f310c6ffc7c91cd':
  BatteryStats: Clear power use when removing a UID from uid_cputime kernel module
 2015-07-15 00:39:13 +00:00
Adam Lesinski
903ebd153b am 56d82dd2: BatteryStats: Fix deadlock 
* commit '56d82dd28a3c7dcca9c9dc37a73a1cf5fc44498e':
  BatteryStats: Fix deadlock
 2015-07-15 00:39:09 +00:00
Adam Lesinski
267240f2dd Merge "BatteryStats: Clear power use when removing a UID from uid_cputime kernel module" into mnc-dev 2015-07-15 00:30:20 +00:00
Fyodor Kupolov
d4fd8c766d Added sendBroadcastMultiplePermissions method 
Added Context.sendBroadcastMultiplePermissions(Intent intent, String[]
receiverPermissions) method, which allows an array of required permissions
to be enforced.

Bug: 21852542
Change-Id: I27c9130e8f004b428452501ebc8a36aabde1f343
 2015-07-14 17:25:42 -07:00
Adam Lesinski
56d82dd28a BatteryStats: Fix deadlock 
Bug:22486756
Change-Id: I20e10cc344b128bfa156c5aada93d3fb2b0fcaa3
 2015-07-15 00:25:26 +00:00
Adam Lesinski
bdb0273455 BatteryStats: Clear power use when removing a UID from uid_cputime kernel module 
Bug:22461683
Change-Id: Iffb847268d2872bd2a843e28dc41fa22b1e36828
 2015-07-14 16:51:53 -07:00
Adam Lesinski
9de0c930ef am b3b21b46: am d4d190ca: am d4c1861a: Merge "BatteryStats: Fix units in wakelock distribution calculation" into mnc-dev 
* commit 'b3b21b46a948f77d08f7202d3af55d9569b17b01':
  BatteryStats: Fix units in wakelock distribution calculation
 2015-07-14 23:44:42 +00:00
Yin-Chia Yeh
5d27a838fa am 3bb64f2d: am 9d513cec: am b42cb352: Merge "Camera: clarify largest JPEG dimension expectation" into mnc-dev 
* commit '3bb64f2dfa6b64b5145fcd1b03452f2186a8d0d3':
  Camera: clarify largest JPEG dimension expectation
 2015-07-14 23:44:36 +00:00
Fyodor Kupolov
cf4617cfd0 am 1aeceef4: am fc4acfd9: am 4a817924: Merge "Revert "Allow array of required permissions in sendBroadcast"" into mnc-dev 
* commit '1aeceef44d89a80d12fa181d841c2610ffdd26b2':
  Revert "Allow array of required permissions in sendBroadcast"
 2015-07-14 23:44:30 +00:00
Adrian Roos
2609883606 Show correct locked orientation on phones 
Bug: 22487750
Change-Id: I1feaaf1e569c576c5212ef396732b2bbb5a0c0fc
 2015-07-14 23:44:25 +00:00
xinhe
f21c5cc121 am caa208b9: am 44ab51c6: am f1c2a1f7: Merge "Need to disable 5GHz bands for WiFi tethering in Japan" into mnc-dev 
* commit 'caa208b9d926ec262a14166bd4513855f4cf9111':
  Need to disable 5GHz bands for WiFi tethering in Japan
 2015-07-14 23:44:24 +00:00
Eric Laurent
1691f73de5 AudioManager: fix audio device callback list access 
Bug: 22470616.
Change-Id: Ic59e8499557395dabe789b5fec9cb7c86c13d10c
 2015-07-14 16:27:54 -07:00
Adam Lesinski
b3b21b46a9 am d4d190ca: am d4c1861a: Merge "BatteryStats: Fix units in wakelock distribution calculation" into mnc-dev 
* commit 'd4d190caed257afec060fe9d654059703a923d97':
  BatteryStats: Fix units in wakelock distribution calculation
 2015-07-14 23:26:27 +00:00
Yin-Chia Yeh
3bb64f2dfa am 9d513cec: am b42cb352: Merge "Camera: clarify largest JPEG dimension expectation" into mnc-dev 
* commit '9d513cec7c9721974d782471931d302281d3e898':
  Camera: clarify largest JPEG dimension expectation
 2015-07-14 23:26:22 +00:00
Fyodor Kupolov
1aeceef44d am fc4acfd9: am 4a817924: Merge "Revert "Allow array of required permissions in sendBroadcast"" into mnc-dev 
* commit 'fc4acfd93c57277cb90774461e475a5032404d36':
  Revert "Allow array of required permissions in sendBroadcast"
 2015-07-14 23:26:18 +00:00
xinhe
caa208b9d9 am 44ab51c6: am f1c2a1f7: Merge "Need to disable 5GHz bands for WiFi tethering in Japan" into mnc-dev 
* commit '44ab51c635ba3f96f23366e5d57f9d1ad9857058':
  Need to disable 5GHz bands for WiFi tethering in Japan
 2015-07-14 23:26:13 +00:00
Adam Lesinski
d4d190caed am d4c1861a: Merge "BatteryStats: Fix units in wakelock distribution calculation" into mnc-dev 
* commit 'd4c1861a536d022b00505c75c30529c50688f26a':
  BatteryStats: Fix units in wakelock distribution calculation
 2015-07-14 23:13:43 +00:00
Yin-Chia Yeh
9d513cec7c am b42cb352: Merge "Camera: clarify largest JPEG dimension expectation" into mnc-dev 
* commit 'b42cb352a350bac198470f65125aa151ecacff13':
  Camera: clarify largest JPEG dimension expectation
 2015-07-14 23:13:27 +00:00
Fyodor Kupolov
fc4acfd93c am 4a817924: Merge "Revert "Allow array of required permissions in sendBroadcast"" into mnc-dev 
* commit '4a817924ecb282eef48b06b92f8e1914edd6cec2':
  Revert "Allow array of required permissions in sendBroadcast"
 2015-07-14 23:13:22 +00:00
xinhe
44ab51c635 am f1c2a1f7: Merge "Need to disable 5GHz bands for WiFi tethering in Japan" into mnc-dev 
* commit 'f1c2a1f798fc029200291ca9d5bbedb1f483d428':
  Need to disable 5GHz bands for WiFi tethering in Japan
 2015-07-14 23:13:08 +00:00
Adam Lesinski
d4c1861a53 Merge "BatteryStats: Fix units in wakelock distribution calculation" into mnc-dev 2015-07-14 23:00:24 +00:00
Yin-Chia Yeh
b42cb352a3 Merge "Camera: clarify largest JPEG dimension expectation" into mnc-dev 2015-07-14 22:53:11 +00:00
Fyodor Kupolov
4a817924ec Merge "Revert "Allow array of required permissions in sendBroadcast"" into mnc-dev 2015-07-14 22:43:47 +00:00
Yorke Lee
bcc004c1db am 72efb1ff: am 95f270de: am b63b031c: Merge "Standardize stateToString return values" into mnc-dev 
* commit '72efb1ffb23e8f9bd46ad8ac71de61179a8446f6':
  Standardize stateToString return values
 2015-07-14 22:41:30 +00:00
Fyodor Kupolov
7f006b5221 am 70174794: am ef77c116: am d69a82c1: Merge "Allow array of required permissions in sendBroadcast" into mnc-dev 
* commit '7017479423ed449a404146a5e77192eef9ba7d9c':
  Allow array of required permissions in sendBroadcast
 2015-07-14 22:41:23 +00:00
xinhe
f1c2a1f798 Merge "Need to disable 5GHz bands for WiFi tethering in Japan" into mnc-dev 2015-07-14 22:29:23 +00:00
Fyodor Kupolov
e37520b49d Revert "Allow array of required permissions in sendBroadcast" 
This reverts commit b4e7283c9afd9fb15ebd63f6ce9b75c9c1af658b.

Change-Id: Ie8390964bda5bdfa869cee8f46584043d8e7c664
 2015-07-14 22:29:21 +00:00
Yorke Lee
72efb1ffb2 am 95f270de: am b63b031c: Merge "Standardize stateToString return values" into mnc-dev 
* commit '95f270de2fe62ca78f05ef7300bfef7e0bcbc7a5':
  Standardize stateToString return values
 2015-07-14 22:27:52 +00:00
Fyodor Kupolov
7017479423 am ef77c116: am d69a82c1: Merge "Allow array of required permissions in sendBroadcast" into mnc-dev 
* commit 'ef77c116f3c1272f623627aec997c10c1432b03c':
  Allow array of required permissions in sendBroadcast
 2015-07-14 22:27:47 +00:00
Yorke Lee
95f270de2f am b63b031c: Merge "Standardize stateToString return values" into mnc-dev 
* commit 'b63b031cb5b9338daa3de76ee9976ba493037d92':
  Standardize stateToString return values
 2015-07-14 22:12:04 +00:00
Fyodor Kupolov
ef77c116f3 am d69a82c1: Merge "Allow array of required permissions in sendBroadcast" into mnc-dev 
* commit 'd69a82c107cea4aca87eecc3978e21ea9bc23c82':
  Allow array of required permissions in sendBroadcast
 2015-07-14 22:12:00 +00:00
Yorke Lee
b63b031cb5 Merge "Standardize stateToString return values" into mnc-dev 2015-07-14 22:00:33 +00:00
Fyodor Kupolov
d69a82c107 Merge "Allow array of required permissions in sendBroadcast" into mnc-dev 2015-07-14 21:57:34 +00:00
Jeff Sharkey
de404257a9 am 556136c8: am c7a60749: am d3719ab0: Merge "Better handling of storage paths." into mnc-dev 
* commit '556136c8b606d4e5843a64b2a5936ec51e375a80':
  Better handling of storage paths.
 2015-07-14 21:44:10 +00:00
Chien-Yu Chen
bdde49a0e0 am 8f2ea4cc: am 951e2633: am 6eec00ec: Merge "Camera: Reconnect after camera service crashes" into mnc-dev 
* commit '8f2ea4ccc5047912384e261a516776da2e335068':
  Camera: Reconnect after camera service crashes
 2015-07-14 21:44:04 +00:00
Jorim Jaggi
c98e7fa30e am 07e3cbc3: am 4cfdcf5b: Touch, wake and unlock 
* commit '07e3cbc3ad16a3dbb880590f33e8bdc1bcb166d1':
  Touch, wake and unlock
 2015-07-14 21:43:53 +00:00
Jeff Sharkey
556136c8b6 am c7a60749: am d3719ab0: Merge "Better handling of storage paths." into mnc-dev 
* commit 'c7a607496aa5ba368524dd334877a9c428ab5f78':
  Better handling of storage paths.
 2015-07-14 21:28:27 +00:00
Chien-Yu Chen
8f2ea4ccc5 am 951e2633: am 6eec00ec: Merge "Camera: Reconnect after camera service crashes" into mnc-dev 
* commit '951e2633ebe5338a764bb8084c0c6f1166ace260':
  Camera: Reconnect after camera service crashes
 2015-07-14 21:28:23 +00:00
Jorim Jaggi
07e3cbc3ad am 4cfdcf5b: Touch, wake and unlock 
* commit '4cfdcf5b0551e5656ea379c428e78b812c2e5cbe':
  Touch, wake and unlock
 2015-07-14 21:28:16 +00:00
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
66c8d8a353 am cc717083: am a05e7ac2: am 5cf30c60: Merge "Pass wifi ap state through to tile when receiver triggered." into mnc-dev 
* commit 'cc717083ebc2fd9d5597d8777df08e5a7d878de9':
  Pass wifi ap state through to tile when receiver triggered.
 2015-07-14 20:48:03 +00:00
Andrew Solovay
edf1f874be am f7810b44: am 90adb81b: am 353886b2: am e67416ec: am 4859a612: Merge "docs: Clarified how to find out when a switch is toggled" into mnc-preview-docs 
* commit 'f7810b44e0044b2feec3e31dbc8a162f4c2e7170':
  docs: Clarified how to find out when a switch is toggled
 2015-07-14 20:47:57 +00:00
Jason Monk
b03cc05260 am 602dbdc5: am 41904c99: am fb973240: Merge "Fix status bar bt accessibility message" into mnc-dev 
* commit '602dbdc545fd7e8703e114a6bfbc65ec938aa67a':
  Fix status bar bt accessibility message
 2015-07-14 20:47:51 +00:00
Jason Monk
4345912dc8 am b9b50eff: am a7542155: am 2061049d: Merge "Move wifi accessibility strings to SettingsLib" into mnc-dev 
* commit 'b9b50effa1ddd66c999e25af1f8bf2e2a9c07566':
  Move wifi accessibility strings to SettingsLib
 2015-07-14 20:47:46 +00:00
Adam Lesinski
8e81f6164e am 36ba8b1b: am ba7e39d5: am 92a3914f: Merge "BatteryStats: Remove uid_cputime Slog.wtf for high cpu times" into mnc-dev 
* commit '36ba8b1b4c0822036b4652d3e134979fae89c54d':
  BatteryStats: Remove uid_cputime Slog.wtf for high cpu times
 2015-07-14 20:47:41 +00:00
Julia Reynolds
cc717083eb am a05e7ac2: am 5cf30c60: Merge "Pass wifi ap state through to tile when receiver triggered." into mnc-dev 
* commit 'a05e7ac245c941763c42fcefdb4a342d0e4a9359':
  Pass wifi ap state through to tile when receiver triggered.
 2015-07-14 20:42:56 +00:00