Adam Lesinski
93f8e4e007
am c6361077: am 8e81f616: am 36ba8b1b: am ba7e39d5: am 92a3914f: Merge "BatteryStats: Remove uid_cputime Slog.wtf for high cpu times" into mnc-dev
...
* commit 'c63610777100d8ce17a0c2b3db788fe8b0913171':
BatteryStats: Remove uid_cputime Slog.wtf for high cpu times
2015-07-14 21:20:01 +00:00
Adam Lesinski
c636107771
am 8e81f616: am 36ba8b1b: am ba7e39d5: am 92a3914f: Merge "BatteryStats: Remove uid_cputime Slog.wtf for high cpu times" into mnc-dev
...
* commit '8e81f6164e93c8a69dc196d83e0a8ee0ebb7297e':
BatteryStats: Remove uid_cputime Slog.wtf for high cpu times
2015-07-14 21:04:27 +00:00
Mathieu Chartier
f8cc20031e
am 82f91da7: am ad4a285a: am ebac4d1b: Merge "Change conditionallyCheckInstanceCounts to use countInstancesOfClasses"
...
* commit '82f91da700445c4606faea45ac8f0dc9f2857471':
Change conditionallyCheckInstanceCounts to use countInstancesOfClasses
2015-07-14 20:47:32 +00:00
Adam Lesinski
36ba8b1b4c
am ba7e39d5: am 92a3914f: Merge "BatteryStats: Remove uid_cputime Slog.wtf for high cpu times" into mnc-dev
...
* commit 'ba7e39d53a49a1a86d5ec1b5ce66ce56b30c7e66':
BatteryStats: Remove uid_cputime Slog.wtf for high cpu times
2015-07-14 20:37:23 +00:00
Mathieu Chartier
82f91da700
am ad4a285a: am ebac4d1b: Merge "Change conditionallyCheckInstanceCounts to use countInstancesOfClasses"
...
* commit 'ad4a285af619ea29f79dbe4da19061c49f24a8c9':
Change conditionallyCheckInstanceCounts to use countInstancesOfClasses
2015-07-14 20:27:42 +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
Adrian Roos
b483aebdd3
am 1d9a312c: am 3d2c2980: am a2231a75: am 9c013a21: Merge "Show charging speed on Keyguard" into mnc-dr-dev
...
* commit '1d9a312c2c6a372071572fb32e10de19e67482d6':
Show charging speed on Keyguard
2015-07-14 20:15:27 +00: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
Adrian Roos
1d9a312c2c
am 3d2c2980: am a2231a75: am 9c013a21: Merge "Show charging speed on Keyguard" into mnc-dr-dev
...
* commit '3d2c298035c0d94f1bd590b04b5679f09b09f285':
Show charging speed on Keyguard
2015-07-14 20:01:15 +00:00
Adrian Roos
a2231a754b
am 9c013a21: Merge "Show charging speed on Keyguard" into mnc-dr-dev
...
* commit '9c013a211768c661f1142aba31c690daa76c66f7':
Show charging speed on Keyguard
2015-07-14 19:31:47 +00:00
Adrian Roos
9c013a2117
Merge "Show charging speed on Keyguard" into mnc-dr-dev
2015-07-14 19:17:07 +00:00
Marco Nelissen
1cdd6e83fb
am b2fef7a8: am f12612c8: am 48c78cfb: am c56668eb: am 3ced9617: Merge "Use original path if translated path doesn\'t exist" into mnc-dev
...
* commit 'b2fef7a81f39c38eff79897e7af02fff20b829cb':
Use original path if translated path doesn't exist
2015-07-14 18:47:52 +00:00
Craig Lafayette
56e4b6f2ad
am a2113804: am 986b40ea: am 7df8b265: am d86ab3c5: am 2f0116fa: Merge "Prevent null allowableAccounts from crashing" into mnc-dev
...
* commit 'a2113804f911a7ddd64f7dfb5cd17973859063b7':
Prevent null allowableAccounts from crashing
2015-07-14 18:47:45 +00:00
Yohei Yukawa
e7998fb00f
am a6b4eaf5: am 1e01d621: am 17dce343: am be27832b: am 12952c79: Merge "Allow FloatingToolbar to be outside of the attached window." into mnc-dev
...
* commit 'a6b4eaf5bbcef6331981da5c52c1375c6f2b700c':
Allow FloatingToolbar to be outside of the attached window.
2015-07-14 18:47:25 +00:00
Andrei Stingaceanu
e937abe222
am 943b001c: am b9384d5d: am 31ccc9f0: am a7e2ab6e: am 8af7432c: Merge "Fix "Select All" in extracted mode" into mnc-dev
...
* commit '943b001c80e43d1b36d3f6b8b21673df40942daf':
Fix "Select All" in extracted mode
2015-07-14 18:47:11 +00:00
Andrei Stingaceanu
a2c1d7841a
am 464f4006: am dfa116e2: am 2e59771e: am 0e6360f4: am a9b9907f: Merge "Fix insertion handle disappearing in extract mode" into mnc-dev
...
* commit '464f40065f0ccd41214733d2a158a035a8b644b6':
Fix insertion handle disappearing in extract mode
2015-07-14 18:46:57 +00:00
Erik Kline
bdeae4c1e0
am e3454420: am 678702d3: am 32cfbc9d: am 68bc390c: am 77612940: Merge "Log NetworkRequestInfo to get more detailed history" into mnc-dev
...
* commit 'e345442007b453c5f715ab204d48bb2082840c53':
Log NetworkRequestInfo to get more detailed history
2015-07-14 18:45:03 +00:00
Zach Johnson
40f028f817
am 58a0fe81: am eca5bf64: am 72407cb5: am 19ab3b47: am 569ff225: Fix BluetoothSocket file descriptor leak
...
* commit '58a0fe8175030255c648846fcc932ae2edf690d6':
Fix BluetoothSocket file descriptor leak
2015-07-14 18:44:52 +00:00
Ian Pedowitz
fbb4a38c7c
resolved conflicts for merge of 30efac5a to master
...
Change-Id: I0dad4cf10ed01cbf49e33f0c2ed1d6f8a1c893e0
2015-07-14 11:38:49 -07: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
Christopher Tate
4fd7987682
am d5c43b76: am df8db14e: am 0e201048: am b4494b02: am 288ecf98: Merge "Prioritize most-recently-enabled link-handling app" into mnc-dev
...
* commit 'd5c43b7619d9d42e902a34c8b300f882b8213309':
Prioritize most-recently-enabled link-handling app
2015-07-14 18:28:26 +00:00
Adrian Roos
7b04311d88
Show charging speed on Keyguard
...
Bug: 8099739
Change-Id: I2e5c21dd7ec028ce47fb03ab71e74f7fccaa9e36
2015-07-14 18:22:39 +00:00
Marco Nelissen
b2fef7a81f
am f12612c8: am 48c78cfb: am c56668eb: am 3ced9617: Merge "Use original path if translated path doesn\'t exist" into mnc-dev
...
* commit 'f12612c8e24cdccc390e69e7623af793c79b4c36':
Use original path if translated path doesn't exist
2015-07-14 18:21:57 +00:00
Craig Lafayette
a2113804f9
am 986b40ea: am 7df8b265: am d86ab3c5: am 2f0116fa: Merge "Prevent null allowableAccounts from crashing" into mnc-dev
...
* commit '986b40ea99d6fdbb836a52fe6a6991fbb1eeca01':
Prevent null allowableAccounts from crashing
2015-07-14 18:21:51 +00:00
Yohei Yukawa
a6b4eaf5bb
am 1e01d621: am 17dce343: am be27832b: am 12952c79: Merge "Allow FloatingToolbar to be outside of the attached window." into mnc-dev
...
* commit '1e01d62160b65ca326b015ba542a52fe22c442b7':
Allow FloatingToolbar to be outside of the attached window.
2015-07-14 18:15:27 +00:00
Andrei Stingaceanu
943b001c80
am b9384d5d: am 31ccc9f0: am a7e2ab6e: am 8af7432c: Merge "Fix "Select All" in extracted mode" into mnc-dev
...
* commit 'b9384d5d549f602dc4c898a16e413ed0069df713':
Fix "Select All" in extracted mode
2015-07-14 18:15:05 +00:00
Andrei Stingaceanu
464f40065f
am dfa116e2: am 2e59771e: am 0e6360f4: am a9b9907f: Merge "Fix insertion handle disappearing in extract mode" into mnc-dev
...
* commit 'dfa116e2f71100eb56ff48cc233941f18c7a79cc':
Fix insertion handle disappearing in extract mode
2015-07-14 18:14:51 +00:00
Marco Nelissen
48c78cfb9e
am c56668eb: am 3ced9617: Merge "Use original path if translated path doesn\'t exist" into mnc-dev
...
* commit 'c56668eb223fe45ff5c1e399d99943838320c407':
Use original path if translated path doesn't exist
2015-07-14 17:49:56 +00:00
Craig Lafayette
7df8b2658f
am d86ab3c5: am 2f0116fa: Merge "Prevent null allowableAccounts from crashing" into mnc-dev
...
* commit 'd86ab3c539cd548d54620edf8836546695dd7424':
Prevent null allowableAccounts from crashing
2015-07-14 17:49:51 +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
Marco Nelissen
3ced96178b
Merge "Use original path if translated path doesn't exist" into mnc-dev
2015-07-14 17:30:06 +00:00
Craig Lafayette
2f0116fa3a
Merge "Prevent null allowableAccounts from crashing" into mnc-dev
2015-07-14 17:25:40 +00:00
Erik Kline
e345442007
am 678702d3: am 32cfbc9d: am 68bc390c: am 77612940: Merge "Log NetworkRequestInfo to get more detailed history" into mnc-dev
...
* commit '678702d3298563e9e03c9ac5b46ee7f3d89d89c6':
Log NetworkRequestInfo to get more detailed history
2015-07-14 17:18:04 +00:00
Zach Johnson
58a0fe8175
am eca5bf64: am 72407cb5: am 19ab3b47: am 569ff225: Fix BluetoothSocket file descriptor leak
...
* commit 'eca5bf647ea3374e5fcb576f7d2df8fb33422a24':
Fix BluetoothSocket file descriptor leak
2015-07-14 17:17:58 +00:00
Ian Pedowitz
30efac5aac
am 80a4bfc2: am 80ea6c79: am d7be214c: resolved conflicts for merge of 8cee6587 to mnc-dr-dev
...
* commit '80a4bfc239ef107187005adf8041650995401dc9':
Teach storage appops.
2015-07-14 17:17:45 +00:00
Christopher Tate
d5c43b7619
am df8db14e: am 0e201048: am b4494b02: am 288ecf98: Merge "Prioritize most-recently-enabled link-handling app" into mnc-dev
...
* commit 'df8db14e8f4ee17912ff9374054edf3612070ddc':
Prioritize most-recently-enabled link-handling app
2015-07-14 17:17:18 +00:00
John Reck
84e7055983
am ae94ac95: am 5d84b44b: am 72e8e080: am 074b3ceb: am f96d9c54: Merge "Improve resource loading by ~3x" into mnc-dev
...
* commit 'ae94ac95754f4e1c4d4f9fda83e7a7e15e90d90b':
Improve resource loading by ~3x
2015-07-14 16:52:13 +00:00
Aravind Akella
40d8c2be35
am 6804eed8: am bbe42345: am f61d30cc: am 42cae4ab: am 37511e35: Merge "Log full class name of the client activating sensors for better debugging." into mnc-dev
...
* commit '6804eed853fe7afb597a7ec84c30e0df4ca74848':
Log full class name of the client activating sensors for better debugging.
2015-07-14 16:51:44 +00:00
Chris Wren
8665a4e932
am 92c5e775: am 01a73cd8: am 500db3c1: am d5b0f69a: am 208934ff: Merge "fix build by restoring deleted enum" into mnc-dev
...
* commit '92c5e7752005776ada31a7d4992548e36f06f335':
fix build by restoring deleted enum
2015-07-14 16:51:23 +00:00
Julia Reynolds
a7380629e9
am e8ff4f71: am 711ff332: am 91941a57: am 19fd8658: am fbd0a444: Merge "Remove personal/device group from sideloading screen." into mnc-dev
...
* commit 'e8ff4f718dff0cf00c6c852f2bc908b508850fa1':
Remove personal/device group from sideloading screen.
2015-07-14 16:51:16 +00:00
Chris Wren
d2d6e41173
am 23652ff5: am 4810bf5d: am ea794192: am 2d8e0173: am 4502bfb8: Merge "add new enums to MetricsConstans" into mnc-dev
...
* commit '23652ff538f414ca32b0c792bc29c60a4c62e4ca':
add new enums to MetricsConstans
2015-07-14 16:51:01 +00:00
Rubin Xu
949d16ebd5
am 5571a986: am afe3c2b3: am 474f987d: am f5d6d432: am cf9aebf1: Merge "Remove ExternalStorageFormatter" into mnc-dev
...
* commit '5571a986f0a2939248aefc584248d08732c761e4':
Remove ExternalStorageFormatter
2015-07-14 16:50:41 +00:00
Billy Lau
4c8d312606
am e385d26f: am cb2a7a2c: am 0be2efb2: am f028ba3d: am 96d00ab3: Merge "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" into mnc-dev
...
* commit 'e385d26fef2f62988c082ee8066f5d6715aa16c9':
Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission
2015-07-14 16:50:20 +00:00
Zhijun He
71e1b0af54
am 48016b9a: am b5468cbf: am cf00a864: am a9fc8aa3: am 4fb81253: Camera metadata: fix typos.
...
* commit '48016b9afeae0cd246a1385471635180c64bc41c':
Camera metadata: fix typos.
2015-07-14 16:50:13 +00:00
Raph Levien
b34396d3c5
am aac0c9e7: am 9d66b9cd: am 073477a1: am 93a2c97d: am 1b3d0351: Merge "Improve Html.toHtml() documentation" into mnc-dev
...
* commit 'aac0c9e7583239ec55e0456c4c88b79f5615caca':
Improve Html.toHtml() documentation
2015-07-14 16:49:51 +00:00
Carlos Valdivia
4eafb7a0d2
am 50cf5e3a: am 1aefc776: am 4e976dd1: am cc3c93d3: am 97cf0f1d: Merge "Revert "Revert "Security: AccountChooser shouldn\'t auto reveal accounts.""" into mnc-dev
...
* commit '50cf5e3a2bd544f4661660756ffc4c67d5afbb21':
Revert "Revert "Security: AccountChooser shouldn't auto reveal accounts.""
2015-07-14 16:49:09 +00:00
Mady Mellor
2f30e890cd
am 604b1138: am 8fe9a017: am 441ad4df: am 7fac4d6c: am 1c277ca8: Merge "Fix: line slop shouldn\'t always increase / decrease by one line" into mnc-dev
...
* commit '604b1138f166a75b80c79243432798416a843c93':
Fix: line slop shouldn't always increase / decrease by one line
2015-07-14 16:49:01 +00:00
Mady Mellor
60ca990850
am ee4d90ba: am 8f85f645: am 9d4cd8cf: am 24950db2: am a9f07ccf: Merge "Fix line slop issue at end of line for Thai & CJK" into mnc-dev
...
* commit 'ee4d90ba0d5abbb7379e6f47d97c12619bbfeeee':
Fix line slop issue at end of line for Thai & CJK
2015-07-14 16:48:54 +00:00
Chris Craik
f689dfc549
am f451be08: am e8a5ae29: am 3b34b006: am be10a866: am 9f004920: Merge "Reduce cost of span type checking" into mnc-dev
...
* commit 'f451be081f5460a10b6ccf2d5e129ee69241da0f':
Reduce cost of span type checking
2015-07-14 16:48:28 +00:00
