Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
171,398 Commits 3 Branches 0 Tags
7a5aa7053c28bb4fed6c49c7311560fa88fb33fc
Commit Graph

47292 Commits

Author SHA1 Message Date
Adrian Roos
7a5aa7053c am 670edcb5: am 862d72e2: Merge "Improve dump of status bar service" into lmp-mr1-dev automerge: 8af07f4 
* commit '670edcb53557b600d9200512a0cf1cdd1fb37bc5':
  Improve dump of status bar service
 2014-11-03 15:07:15 +00:00
Adrian Roos
670edcb535 am 862d72e2: Merge "Improve dump of status bar service" into lmp-mr1-dev 
automerge: 8af07f4

* commit '8af07f4717359c8421bc91c8171fcf749714b08f':
  Improve dump of status bar service
 2014-11-03 15:02:09 +00:00
Adrian Roos
862d72e2f4 Merge "Improve dump of status bar service" into lmp-mr1-dev 2014-11-03 14:56:48 +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

* commit '5c69f5b276b65bd4b8000d2b6e56baddccf89846':
  Move LOCK_TO_APP_EXIT_LOCKED from System to Secure
 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.

Change-Id: Ib8fc22e3a23b2c06400cd687e8ed9cef9a11d09b
 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

* commit '726e9ea7322d5122a22a0077d58ae92870962df4':
  Fix getPackageInfo("android") in the system server.
 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

* commit 'a80162f0d124e7400e268440c864289a9a7be11e':
  Add a function to boost screen brightness temporarily.
 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

* commit '42340b9de03fb2b27a0f915d827d729bce7fcda7':
  Mention ECDHE_PSK bug in Javadoc of PskKeyManager.
 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

* commit '4f5b8a6b9b1966b42c929f89e1e91827ec495719':
  Crash apps that print malformed or password protected PDFs.
 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

* commit '35261e41b60ff2c0297dedaaff849a7414c9ff76':
  Don't update OverScroller fling state if no time has passed since start
 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
Dianne Hackborn
bc622ed7c3 am 58f2a1e8: am f34fa3e7: Merge "Improve low on RAM reporting." into lmp-mr1-dev automerge: 1816361 
* commit '58f2a1e8a47de6c3ce4f588b07fc052f4687492d':
  Improve low on RAM reporting.
 2014-10-31 23:30:52 +00:00
Dianne Hackborn
58f2a1e8a4 am f34fa3e7: Merge "Improve low on RAM reporting." into lmp-mr1-dev 
automerge: 1816361

* commit '18163616c80aa30f4b7389838d8658812615080c':
  Improve low on RAM reporting.
 2014-10-31 23:23:40 +00:00
Dianne Hackborn
f34fa3e7aa Merge "Improve low on RAM reporting." into lmp-mr1-dev 2014-10-31 22:44:24 +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

* commit '38d6cf9cbee98b3fe66e6ccda223b3c4c01a0815':
  Add convenience method for getting the complex unit type
 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

* commit '7bce5007d2b2b218d11514a3df8e7109e37d9e7c':
  Ensure views are attached prior to starting enter transition.
 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
Adam Powell
3bfcae769f am dec2509d: am b9eabc5c: Merge "Allow swipe down to dismiss for ResolverDrawerLayout" into lmp-mr1-dev automerge: 63bb338 
* commit 'dec2509d706f64fc81676fdde1c353e717a73ed0':
  Allow swipe down to dismiss for ResolverDrawerLayout
 2014-10-31 20:40:14 +00:00
Adam Powell
dec2509d70 am b9eabc5c: Merge "Allow swipe down to dismiss for ResolverDrawerLayout" into lmp-mr1-dev 
automerge: 63bb338

* commit '63bb33832380feb546d1a20d8f1c057f2088aed5':
  Allow swipe down to dismiss for ResolverDrawerLayout
 2014-10-31 20:35:42 +00:00
Adam Powell
b9eabc5c2b Merge "Allow swipe down to dismiss for ResolverDrawerLayout" into lmp-mr1-dev 2014-10-31 20:28:48 +00: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

* commit '80e5f45979416c0bee487725eaf4078b6ba42769':
  Backup and restore battery saver trigger level
 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

* commit '97fcd2b5d15ed01b1ee27a30132e95b4733793cf':
  Adding APIs to enable apps to influence accessibility traversal.
 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
Amith Yamasani
94005240ec Backup and restore battery saver trigger level 
Bug: 17836827
Change-Id: Icb6bf071a0966a8fb9a03fadd0f8b3daa5ad11f8
 2014-10-31 11:35:13 -07:00
Dianne Hackborn
6edb5c665d Improve low on RAM reporting. 
- Don't print every little native process.
- Print in different sections, so if one is too long we don't get the
  rest truncated in the log.
- Include other info from meminfo -- ksm and free/used/lost summary.

Change-Id: Iea4ec3860212667e195d2b60b3ded23bfec78436
 2014-10-31 10:35:15 -07:00