John Reck
d0f91ebaef
am 43973c9d: am 1787b4ea: Merge "Fix cancel crash" into lmp-mr1-dev automerge: 9280480
...
* commit '43973c9d732d74dec12e796fb40ae285c1687d6a':
Fix cancel crash
2014-11-03 18:41:39 +00:00
John Reck
43973c9d73
am 1787b4ea: Merge "Fix cancel crash" into lmp-mr1-dev
...
automerge: 9280480
2014-11-03 18:32:20 +00:00
John Reck
1787b4ea43
Merge "Fix cancel crash" into lmp-mr1-dev
2014-11-03 18:27:41 +00:00
John Reck
55b46eff39
Fix cancel crash
...
Bug: 18059003
Change-Id: I579468fbd1645049f8fbe335faf4da1f2d3bb0a3
2014-11-03 10:00:33 -08:00
Narayan Kamath
c936585efd
am f2459e2e: am 10ac55ba: am 5f8099ed: Merge "Add java.util.List import."
...
* commit 'f2459e2e1688aae285346f2638d49e1b8e230229':
Add java.util.List import.
2014-11-03 17:35:39 +00:00
Narayan Kamath
f2459e2e16
am 10ac55ba: am 5f8099ed: Merge "Add java.util.List import."
...
* commit '10ac55ba4f0beed608b310c473bb052cbcdf19c1':
Add java.util.List import.
2014-11-03 16:52:41 +00:00
Narayan Kamath
10ac55ba4f
am 5f8099ed: Merge "Add java.util.List import."
...
* commit '5f8099ed181c2ba279c4a747096442389d5f8840':
Add java.util.List import.
2014-11-03 16:00:57 +00:00
Narayan Kamath
2b4378fef8
Add java.util.List import.
...
Unused on master but used downstream.
Change-Id: I7c072e25d1f7c3a645efb2986d23e81068dced22
2014-11-03 15:55:03 +00:00
Adrian Roos
017c8dc878
am 1814f14c: am 808fe6f9: Merge "Fix colored status bar panning issues" into lmp-mr1-dev automerge: fcad9e1
...
* commit '1814f14c7d2ddfb0ccf0c8283bc7638059fc9af8':
Fix colored status bar panning issues
2014-11-03 15:53:57 +00:00
Adrian Roos
1814f14c7d
am 808fe6f9: Merge "Fix colored status bar panning issues" into lmp-mr1-dev
...
automerge: fcad9e1
2014-11-03 15:48:21 +00:00
Adrian Roos
808fe6f99f
Merge "Fix colored status bar panning issues" into lmp-mr1-dev
2014-11-03 15:44:08 +00:00
Jason Monk
52eb811a44
am 8efeae7e: am 2e647efe: Merge "Move LOCK_TO_APP_EXIT_LOCKED from System to Secure" into lmp-mr1-dev automerge: 5c69f5b
...
* commit '8efeae7eb4da19bd3dcf1a5013e3011d50f2ca42':
Move LOCK_TO_APP_EXIT_LOCKED from System to Secure
2014-11-03 14:48:48 +00:00
Narayan Kamath
d449a008a0
am cd4910ef: am 2e1bd46a: am ef5d43a7: Merge "Revert "Revert "Remove unused apache related API."""
...
* commit 'cd4910ef606e1fa8c974c348174ee55a65541cb6':
Revert "Revert "Remove unused apache related API.""
2014-11-03 14:42:49 +00:00
Jason Monk
8efeae7eb4
am 2e647efe: Merge "Move LOCK_TO_APP_EXIT_LOCKED from System to Secure" into lmp-mr1-dev
...
automerge: 5c69f5b
2014-11-03 14:42:18 +00:00
Narayan Kamath
cd4910ef60
am 2e1bd46a: am ef5d43a7: Merge "Revert "Revert "Remove unused apache related API."""
...
* commit '2e1bd46a1567fa987df04dd8eef66e91b50ef4f3':
Revert "Revert "Remove unused apache related API.""
2014-11-03 14:38:02 +00:00
Jason Monk
2e647efe01
Merge "Move LOCK_TO_APP_EXIT_LOCKED from System to Secure" into lmp-mr1-dev
2014-11-03 14:36:02 +00:00
Narayan Kamath
2e1bd46a15
am ef5d43a7: Merge "Revert "Revert "Remove unused apache related API."""
...
* commit 'ef5d43a7cf694ffac8b0069aa5026862d6b32735':
Revert "Revert "Remove unused apache related API.""
2014-11-03 14:31:11 +00:00
Narayan Kamath
4b8f1846ca
Revert "Revert "Remove unused apache related API.""
...
This reverts commit 31f54ef815
2014-11-03 13:32:10 +00:00
Narayan Kamath
3455c5c93e
am 4a51d064: am 9301eafb: Merge "Fix getPackageInfo("android") in the system server." into lmp-mr1-dev automerge: 726e9ea
...
* commit '4a51d06402ae59b49cf0e99d05a82f71500ffe08':
Fix getPackageInfo("android") in the system server.
2014-11-03 12:57:39 +00:00
Narayan Kamath
4a51d06402
am 9301eafb: Merge "Fix getPackageInfo("android") in the system server." into lmp-mr1-dev
...
automerge: 726e9ea
2014-11-03 12:52:14 +00:00
Narayan Kamath
9301eafbcc
Merge "Fix getPackageInfo("android") in the system server." into lmp-mr1-dev
2014-11-03 12:45:16 +00:00
Jeff Brown
b3d18f2c2e
am 5177979b: am e333e674: Add a function to boost screen brightness temporarily. automerge: 0ed053e automerge: a80162f
...
* commit '5177979bbd7459179648057ba00a6399aeb26357':
Add a function to boost screen brightness temporarily.
2014-11-01 17:51:16 +00:00
Alex Klyubin
e55c4f43df
am a409cdf1: am dcf5af38: am 8129b8b4: am dd8accfe: Merge "Mention ECDHE_PSK bug in Javadoc of PskKeyManager." into lmp-docs automerge: 2f1c76f automerge: 42340b9
...
* commit 'a409cdf161664666e15f337ea5a0efd078667352':
Mention ECDHE_PSK bug in Javadoc of PskKeyManager.
2014-11-01 17:40:58 +00:00
Jeff Brown
5177979bbd
am e333e674: Add a function to boost screen brightness temporarily. automerge: 0ed053e
...
automerge: a80162f
2014-11-01 15:04:52 +00:00
Alex Klyubin
a409cdf161
am dcf5af38: am 8129b8b4: am dd8accfe: Merge "Mention ECDHE_PSK bug in Javadoc of PskKeyManager." into lmp-docs automerge: 2f1c76f
...
automerge: 42340b9
2014-11-01 15:00:10 +00:00
Jeff Brown
0ed053ef53
am e333e674: Add a function to boost screen brightness temporarily.
...
* commit 'e333e674a758c39885d4d9779a1aad387fb0e6aa':
Add a function to boost screen brightness temporarily.
2014-11-01 14:10:46 +00:00
Alex Klyubin
2f1c76f074
am dcf5af38: am 8129b8b4: am dd8accfe: Merge "Mention ECDHE_PSK bug in Javadoc of PskKeyManager." into lmp-docs
...
* commit 'dcf5af38bfd306af77613aa051393bf7d8e8fb44':
Mention ECDHE_PSK bug in Javadoc of PskKeyManager.
2014-11-01 14:08:40 +00:00
Jeff Brown
e333e674a7
Add a function to boost screen brightness temporarily.
...
When PowerManager.boostScreenBrightness() is called, the screen
brightness is set to maximum for 5 seconds. This action is
also considered to be user activity.
Bug: 17934954
Change-Id: I1cb4a03a60705c6c1c5cc9ff84b1c5dbd2932fcd
2014-10-31 18:45:11 -07:00
Svet Ganov
e73c6d93b9
am 28d51a39: am 182f0a13: Merge "Crash apps that print malformed or password protected PDFs." into lmp-mr1-dev automerge: 4f5b8a6
...
* commit '28d51a39a1bed35855b0fe75a65ad4a6d43a4460':
Crash apps that print malformed or password protected PDFs.
2014-11-01 00:32:52 +00:00
Svet Ganov
28d51a39a1
am 182f0a13: Merge "Crash apps that print malformed or password protected PDFs." into lmp-mr1-dev
...
automerge: 4f5b8a6
2014-11-01 00:27:30 +00:00
Svet Ganov
182f0a136f
Merge "Crash apps that print malformed or password protected PDFs." into lmp-mr1-dev
2014-11-01 00:22:08 +00:00
Svet Ganov
fce84f035c
Crash apps that print malformed or password protected PDFs.
...
If apps are writing malformed content (typically not a PDF file) or if the
PDF content they provide to the print system is password protected, are now
crashed as both of these are app bugs.
bug:17636435
Change-Id: Ifce6a3199e587448dd38f6a84290a965c24b698b
2014-11-01 00:06:08 +00:00
Adam Powell
53b603af4b
am 987f7168: am d8c941ff: Merge "Don\'t update OverScroller fling state if no time has passed since start" into lmp-mr1-dev automerge: 35261e4
...
* commit '987f7168d54ef42542b9d03b589f0287fd6e15c7':
Don't update OverScroller fling state if no time has passed since start
2014-10-31 23:56:03 +00:00
Adam Powell
987f7168d5
am d8c941ff: Merge "Don\'t update OverScroller fling state if no time has passed since start" into lmp-mr1-dev
...
automerge: 35261e4
2014-10-31 23:49:49 +00:00
Adam Powell
d8c941ff46
Merge "Don't update OverScroller fling state if no time has passed since start" into lmp-mr1-dev
2014-10-31 23:42:43 +00:00
Christopher Lane
1bb81dd46e
am c56a9d10: am be36ebc2: Merge "Add convenience method for getting the complex unit type" into lmp-mr1-dev automerge: 38d6cf9
...
* commit 'c56a9d10f7b5ffa9a6023f3dff043cbea8b3cb96':
Add convenience method for getting the complex unit type
2014-10-31 22:13:29 +00:00
Christopher Lane
c56a9d10f7
am be36ebc2: Merge "Add convenience method for getting the complex unit type" into lmp-mr1-dev
...
automerge: 38d6cf9
2014-10-31 22:07:30 +00:00
Christopher Lane
be36ebc28d
Merge "Add convenience method for getting the complex unit type" into lmp-mr1-dev
2014-10-31 22:01:35 +00:00
Christopher Lane
9f357ae9f0
Add convenience method for getting the complex unit type
...
Bug: 18193912
Change-Id: Ida29c12c6c3f07ac0657e70d2ab07f2fc4f2cb20
2014-10-31 14:52:06 -07:00
George Mount
486384ef46
am 0d6624d3: am fa21e757: Merge "Ensure views are attached prior to starting enter transition." into lmp-mr1-dev automerge: 7bce500
...
* commit '0d6624d35af7c7623cf97084753255079b01fbdf':
Ensure views are attached prior to starting enter transition.
2014-10-31 21:43:21 +00:00
George Mount
0d6624d35a
am fa21e757: Merge "Ensure views are attached prior to starting enter transition." into lmp-mr1-dev
...
automerge: 7bce500
2014-10-31 21:38:13 +00:00
George Mount
fa21e75734
Merge "Ensure views are attached prior to starting enter transition." into lmp-mr1-dev
2014-10-31 21:30:20 +00:00
Adam Powell
311506afbb
Don't update OverScroller fling state if no time has passed since start
...
If no time has passed when we try to update fling state, skip the
update computation since there is nothing to do.
Fixes a bug where we could return NaN from
OverScroller#getCurrentVelocity.
Bug 17700698
Change-Id: I65042d4d26a29593f66781b58456c2d1e85381c6
2014-10-31 14:03:01 -07:00
Amith Yamasani
b9a7f37e71
am 84df64d4: am 8079a812: Merge "Backup and restore battery saver trigger level" into lmp-mr1-dev automerge: 80e5f45
...
* commit '84df64d4009aa42ccca1bb4c4b03396fe441f990':
Backup and restore battery saver trigger level
2014-10-31 20:04:24 +00:00
Svetoslav
e7d267e3d8
am eaaa38ae: am b1ecf0d7: Merge "Adding APIs to enable apps to influence accessibility traversal." into lmp-mr1-dev automerge: 97fcd2b
...
* commit 'eaaa38aea09e82fc557ebf0dd7fd02acfbfa1d59':
Adding APIs to enable apps to influence accessibility traversal.
2014-10-31 20:04:14 +00:00
Amith Yamasani
84df64d400
am 8079a812: Merge "Backup and restore battery saver trigger level" into lmp-mr1-dev
...
automerge: 80e5f45
2014-10-31 20:00:57 +00:00
Svetoslav
eaaa38aea0
am b1ecf0d7: Merge "Adding APIs to enable apps to influence accessibility traversal." into lmp-mr1-dev
...
automerge: 97fcd2b
2014-10-31 19:58:57 +00:00
Amith Yamasani
8079a812aa
Merge "Backup and restore battery saver trigger level" into lmp-mr1-dev
2014-10-31 19:55:52 +00:00
Svetoslav
b1ecf0d776
Merge "Adding APIs to enable apps to influence accessibility traversal." into lmp-mr1-dev
2014-10-31 19:53:32 +00:00
Jason Monk
94cfd9d7c4
Move LOCK_TO_APP_EXIT_LOCKED from System to Secure
...
To prepare for controlling from settings.
While here, add lock to app settings to backups.
Bug: 16957435
Change-Id: I059140cd07a7a0d5ceb4e0bfe5e0176cb96629d3
2014-10-31 14:47:13 -04:00
