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

153879 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ruben Brunk
4d9face69e am 7432b884: am b3c802f2: Merge "camera2: Use valid dimensions for RGBA8888 gralloc buffers." into lmp-dev 
* commit '7432b88447dea2a9a5b8adcfeb150da7a18d22f6':
  camera2: Use valid dimensions for RGBA8888 gralloc buffers.
 2014-10-01 15:15:14 +00:00
Jeff Sharkey
3de5ed51d6 am 7bd4aba1: am b27d43a8: Merge "Clear ident when obtaining provider across users." into lmp-dev 
* commit '7bd4aba1a81538897fc173a824b6e8eec568f945':
  Clear ident when obtaining provider across users.
 2014-10-01 15:15:10 +00:00
Dianne Hackborn
16b6a8f702 am 962e3e83: am 9cf01b63: Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit '962e3e831516688824fec334c5ddcfd4f3d13f44':
  More work on issue #17656716: Unhandled exception in Window Manager
 2014-10-01 15:15:07 +00:00
Svetoslav
344ffbc647 am 567c9788: am 44d4eeaa: Merge "Use default encryption password if an accessibility service is enabled." into lmp-dev 
* commit '567c97881b1d1719d32daaf647979e47e01be438':
  Use default encryption password if an accessibility service is enabled.
 2014-10-01 15:15:03 +00:00
Fabrice Di Meglio
db963b1c5d am e353ccbf: am 415393f4: Merge "Update for bug #17521147 Settings activity looks terrible on Volantis" into lmp-dev 
* commit 'e353ccbf532139cf4e83969e5fcbc81489fd21a2':
  Update for bug #17521147 Settings activity looks terrible on Volantis
 2014-10-01 15:14:59 +00:00
Winson Chung
d1c1201dfc am b61dea20: am da649073: Merge "Fixing regression with black task bar background. (Bug 17584337)" into lmp-dev 
* commit 'b61dea2047b1b27f169728104f8279528fbd9eac':
  Fixing regression with black task bar background. (Bug 17584337)
 2014-10-01 15:14:56 +00:00
Chris Wren
82ef988c92 am b742c9a0: am c3328cac: Merge "Add a returns clause to the matchesInterruptionFilter javadoc." into lmp-dev 
* commit 'b742c9a01261075d6a85f23d72e7842dec932cda':
  Add a returns clause to the matchesInterruptionFilter javadoc.
 2014-10-01 15:14:52 +00:00
Chris Wren
1d88c087e6 am 4afe428f: am af098c56: Merge "Update the documentation on EXTRA_PEOPLE." into lmp-dev 
* commit '4afe428f49533342966545a14b51acaee9052c71':
  Update the documentation on EXTRA_PEOPLE.
 2014-10-01 15:14:49 +00:00
Paul Jensen
18434fcc99 am a524b0f7: am 8df099df: Make CaptivePortalLogin app exit if underlying Network disconnects. 
* commit 'a524b0f7869c7dc9b5687721883acfd9a535e440':
  Make CaptivePortalLogin app exit if underlying Network disconnects.
 2014-10-01 15:14:45 +00:00
Alexandra Gherghina
a266670adf am d7275ae2: am 75c33d9d: Merge "Adds the ability to start a user in background" into lmp-dev 
* commit 'd7275ae2c2e2ed8663b05d0560097c45d3e86019':
  Adds the ability to start a user in background
 2014-10-01 15:14:41 +00:00
Dianne Hackborn
30854356ef am 29a11523: am c3014c8c: Merge "Fix issue #17705755: Battery stats resets at incorrect times" into lmp-dev 
* commit '29a115235832fd4ea6f6cac1ad962a3bfe6e99be':
  Fix issue #17705755: Battery stats resets at incorrect times
 2014-10-01 15:14:38 +00:00
Winson Chung
3175f7d245 am 2396f135: am e3206407: Merge "Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)" into lmp-dev 
* commit '2396f135678e8a40b963904e8a6710bc6a204180':
  Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)
 2014-10-01 15:14:34 +00:00
John Spurlock
eac6926f0c am 260e6d54: am a1b84165: Merge "Don\'t play hint animations when dozing" into lmp-dev 
* commit '260e6d542ff05094063f1a1574f41fa165308eef':
  Don't play hint animations when dozing
 2014-10-01 15:14:30 +00:00
Jason Monk
9e280c447f am 15349991: am e7b18d2b: Merge "Pull roaming from mServiceState for consistency" into lmp-dev 
* commit '15349991240bb9443d704b4ac85915f474e5108c':
  Pull roaming from mServiceState for consistency
 2014-10-01 15:14:26 +00:00
George Mount
6d7a0cd57f am 3dc0a918: am 8afceda1: Merge "Clear preordered list after use." into lmp-dev 
* commit '3dc0a918748fade0ad7c683c6bc769f032759fcd':
  Clear preordered list after use.
 2014-10-01 15:14:22 +00:00
John Spurlock
3fd4440fea am af41d847: am ee98df79: Doze: Log screenOnFromTouch when flinging. 
* commit 'af41d8477a8152c0597630066207a863ad74614e':
  Doze: Log screenOnFromTouch when flinging.
 2014-10-01 15:14:18 +00:00
Ruben Brunk
7432b88447 am b3c802f2: Merge "camera2: Use valid dimensions for RGBA8888 gralloc buffers." into lmp-dev 
* commit 'b3c802f2381c3411fe753206ab89027f60164b77':
  camera2: Use valid dimensions for RGBA8888 gralloc buffers.
 2014-10-01 15:01:24 +00:00
Jeff Sharkey
7bd4aba1a8 am b27d43a8: Merge "Clear ident when obtaining provider across users." into lmp-dev 
* commit 'b27d43a8805769f9a9dfdc024b5cd19b71cfd8d7':
  Clear ident when obtaining provider across users.
 2014-10-01 15:01:05 +00:00
Dianne Hackborn
962e3e8315 am 9cf01b63: Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit '9cf01b63cb0023aec0e05b1ce050ff572532b876':
  More work on issue #17656716: Unhandled exception in Window Manager
 2014-10-01 15:00:49 +00:00
Svetoslav
567c97881b am 44d4eeaa: Merge "Use default encryption password if an accessibility service is enabled." into lmp-dev 
* commit '44d4eeaa48721296663a05d01071f196a509dc34':
  Use default encryption password if an accessibility service is enabled.
 2014-10-01 15:00:44 +00:00
Fabrice Di Meglio
e353ccbf53 am 415393f4: Merge "Update for bug #17521147 Settings activity looks terrible on Volantis" into lmp-dev 
* commit '415393f424c8df75194aa194c46acfb213866c08':
  Update for bug #17521147 Settings activity looks terrible on Volantis
 2014-10-01 15:00:33 +00:00
Winson Chung
b61dea2047 am da649073: Merge "Fixing regression with black task bar background. (Bug 17584337)" into lmp-dev 
* commit 'da649073bd927fa69d02982745cc1d61e9a4f8b3':
  Fixing regression with black task bar background. (Bug 17584337)
 2014-10-01 15:00:17 +00:00
Chris Wren
b742c9a012 am c3328cac: Merge "Add a returns clause to the matchesInterruptionFilter javadoc." into lmp-dev 
* commit 'c3328cacdad67623f94b13fceb734d958461a475':
  Add a returns clause to the matchesInterruptionFilter javadoc.
 2014-10-01 14:59:59 +00:00
Chris Wren
4afe428f49 am af098c56: Merge "Update the documentation on EXTRA_PEOPLE." into lmp-dev 
* commit 'af098c5657942d645ec7362cc439718457abec64':
  Update the documentation on EXTRA_PEOPLE.
 2014-10-01 14:59:55 +00:00
Paul Jensen
a524b0f786 am 8df099df: Make CaptivePortalLogin app exit if underlying Network disconnects. 
* commit '8df099df1516d23c113be3121635dcd34984a4a0':
  Make CaptivePortalLogin app exit if underlying Network disconnects.
 2014-10-01 14:59:47 +00:00
Alexandra Gherghina
d7275ae2c2 am 75c33d9d: Merge "Adds the ability to start a user in background" into lmp-dev 
* commit '75c33d9d04d8c0a9884a70077681261b57c7833c':
  Adds the ability to start a user in background
 2014-10-01 14:59:23 +00:00
Dianne Hackborn
29a1152358 am c3014c8c: Merge "Fix issue #17705755: Battery stats resets at incorrect times" into lmp-dev 
* commit 'c3014c8cf8932cb6a482e985edc7def97c50eede':
  Fix issue #17705755: Battery stats resets at incorrect times
 2014-10-01 14:59:18 +00:00
Winson Chung
2396f13567 am e3206407: Merge "Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)" into lmp-dev 
* commit 'e3206407a5968dcf6690793f047bdfede0424df5':
  Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)
 2014-10-01 14:59:12 +00:00
John Spurlock
260e6d542f am a1b84165: Merge "Don\'t play hint animations when dozing" into lmp-dev 
* commit 'a1b84165f9520c025c59f5b2d93a65d4609b8088':
  Don't play hint animations when dozing
 2014-10-01 14:59:07 +00:00
Jason Monk
1534999124 am e7b18d2b: Merge "Pull roaming from mServiceState for consistency" into lmp-dev 
* commit 'e7b18d2bab30ca257b63e9029c6e08b9700b89a6':
  Pull roaming from mServiceState for consistency
 2014-10-01 14:58:57 +00:00
George Mount
3dc0a91874 am 8afceda1: Merge "Clear preordered list after use." into lmp-dev 
* commit '8afceda14176b911cf755b8ebbcfbfa9eff60aae':
  Clear preordered list after use.
 2014-10-01 14:58:53 +00:00
John Spurlock
af41d8477a am ee98df79: Doze: Log screenOnFromTouch when flinging. 
* commit 'ee98df79a1797323aaa6d645e9cd5dc6a7cc0ee4':
  Doze: Log screenOnFromTouch when flinging.
 2014-10-01 14:58:45 +00:00
Baligh Uddin
3e9bf6c693 am 3022aa21: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '3022aa2175e82cc67c51a70748ea6923876e9806':
  Import translations. DO NOT MERGE
 2014-10-01 05:31:30 +00:00
Baligh Uddin
2e459a6653 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-10-01 04:25:39 +00:00
Baligh Uddin
3022aa2175 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-01 04:25:35 +00:00
Matthew Williams
9a957e0904 am d55d3c59: am bc156ba4: Merge "Fix deadlock caused by clearAllBackoffs in SSE" into lmp-dev 
* commit 'd55d3c597a889ec1ac5b0fc1248a605fc49f5d38':
  Fix deadlock caused by clearAllBackoffs in SSE
 2014-10-01 00:59:20 +00:00
Lorenzo Colitti
5e7f08f513 am 6c1d0e07: am d8f7e048: Merge "Update LegacyTypeTracker state before sending connect broadcasts." into lmp-dev 
* commit '6c1d0e07840d124921fd30f04ad11b409ea73b3e':
  Update LegacyTypeTracker state before sending connect broadcasts.
 2014-10-01 00:59:16 +00:00
Scott Rowe
a0bdf9cce7 am 8cfba205: am d1462247: am 6287a65c: am 294d5347: am 9d20628b: docs: b/16044763 Update IAB docs to give notice of v2 turndown 
* commit '8cfba20560314a09d7e9a2fd98355109d30d57cd':
  docs: b/16044763 Update IAB docs to give notice of v2 turndown
 2014-10-01 00:59:13 +00:00
Ricardo Cervera
ba32c278da am d4a2da04: am 3910b5d2: am 6ea34ddf: am 9f483941: am 808440cd: Merge "docs: Fixed path for build output." into klp-modular-docs 
* commit 'd4a2da0494f4a3d2636f7e61c36373f872039262':
  docs: Fixed path for build output.
 2014-10-01 00:59:09 +00:00
Justin Koh
870ba83b3d am 8dd8818b: am 91bd8769: am 92ffd6b5: (-s ours) am 28d01e67: Merge "DO NOT MERGE Disable vibration from notificationmanagerservice when on watch" into klp-modular-dev 
* commit '8dd8818bdeb7b264f82da0f0854722ffd7ab7e12':
  DO NOT MERGE Disable vibration from notificationmanagerservice when on watch
 2014-10-01 00:59:06 +00:00
Alan Viverette
a1411fe08f am 52208590: am 76e15c4b: Merge "Decrease date picker height to avoid cutting off calendar" into lmp-dev 
* commit '52208590123210506abd2d14124bec1f07847b1f':
  Decrease date picker height to avoid cutting off calendar
 2014-10-01 00:59:02 +00:00
Alan Viverette
eca52d9171 am 35ebdd05: am b805da9b: Merge "Fix drawable container tinting" into lmp-dev 
* commit '35ebdd0514c7d3e6b2e64acb916f5160821bd463':
  Fix drawable container tinting
 2014-10-01 00:58:59 +00:00
Jean-Michel Trivi
9f1bca5f21 am 0ed179d1: am 4a154af9: Merge "Send volume keys to the default stream if not actually playing" into lmp-dev 
* commit '0ed179d185bc976779c6959b4d2d11c19538e60b':
  Send volume keys to the default stream if not actually playing
 2014-10-01 00:58:55 +00:00
Dianne Hackborn
e26ba8f74f am 069de204: am 38646c19: Merge "Work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit '069de2045ef1b65f8952e2a452afbfa6bdc3f850':
  Work on issue #17656716: Unhandled exception in Window Manager
 2014-10-01 00:58:52 +00:00
Chris Craik
d7de7b49b1 am 505c9d2c: am e910cc88: Merge "Implement alpha as documented for drawables" into lmp-dev 
* commit '505c9d2ce0a8ed8dc27baf406f05f2ae4c265fe5':
  Implement alpha as documented for drawables
 2014-10-01 00:58:48 +00:00
Fabrice Di Meglio
b90269b095 am b08fc7ec: am df61d004: Fix bug #17682629 Crash while accessing apps\' settings 
* commit 'b08fc7ec1b77203d53766a1537239e30fc56890f':
  Fix bug #17682629 Crash while accessing apps' settings
 2014-10-01 00:58:45 +00:00
Matthew Williams
d55d3c597a am bc156ba4: Merge "Fix deadlock caused by clearAllBackoffs in SSE" into lmp-dev 
* commit 'bc156ba430d286aaab8deb7bbb3bccc655cd2e92':
  Fix deadlock caused by clearAllBackoffs in SSE
 2014-10-01 00:52:38 +00:00
Lorenzo Colitti
6c1d0e0784 am d8f7e048: Merge "Update LegacyTypeTracker state before sending connect broadcasts." into lmp-dev 
* commit 'd8f7e048281559462f9c590f9d7d48fb7fe065ce':
  Update LegacyTypeTracker state before sending connect broadcasts.
 2014-10-01 00:52:34 +00:00
Scott Rowe
8cfba20560 am d1462247: am 6287a65c: am 294d5347: am 9d20628b: docs: b/16044763 Update IAB docs to give notice of v2 turndown 
* commit 'd1462247e05dab10d20372249e9a3ef7ef93fc2e':
  docs: b/16044763 Update IAB docs to give notice of v2 turndown
 2014-10-01 00:52:07 +00:00
Ricardo Cervera
d4a2da0494 am 3910b5d2: am 6ea34ddf: am 9f483941: am 808440cd: Merge "docs: Fixed path for build output." into klp-modular-docs 
* commit '3910b5d2f55b613191610905a4ae25aa3d3a1d15':
  docs: Fixed path for build output.
 2014-10-01 00:52:04 +00:00