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

161079 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ricardo Cervera
5720328d41 am f2bf62c1: am d7b45dd7: am 3cf53caf: am 1ed09f9b: am e906b38b: am 781c988a: am ae7b5dc4: Merge "docs: ADT beginner text fix" into klp-modular-docs 
* commit 'f2bf62c1c2d9d65944d2e3e26e6f7b35fa797ae4':
  docs: ADT beginner text fix
 2014-10-01 22:02:28 +00:00
Jeff Brown
7ee1f53d3d am 5a3f98aa: am f0245cb2: am 69073040: am 62434d6a: Merge "Reduce latency from doze to screen on." into lmp-dev 
* commit '5a3f98aa8aafc16f6a8c3a4e5a813f7459a7cd92':
  Reduce latency from doze to screen on.
 2014-10-01 22:02:24 +00:00
Sungsoo Lim
52ecadbf8c am a381976b: am d5504e04: am e4495131: am ee33c661: Merge "Update java doc for content rating systems" into lmp-dev 
* commit 'a381976b7b6185782e4e1ea5472130266bee028d':
  Update java doc for content rating systems
 2014-10-01 22:02:20 +00:00
Jerome Poichet
c2ece4228d am 87ed0483: am 0d71155d: am a5fa02df: am 72079f7f: Merge "Make sure cancel is called on tear down." into lmp-dev 
* commit '87ed04832c7562260c3a87506286d63b137daee1':
  Make sure cancel is called on tear down.
 2014-10-01 22:02:16 +00:00
Dianne Hackborn
923b627a6c am c8d5d614: am d0ab6d6d: am 88998f79: am 62321ab1: Merge "Maybe fix issue #17700474: manta: high occurrence of device booted..." into lmp-dev 
* commit 'c8d5d614fbb1d36dc7d2da07564cdca77f8158f9':
 2014-10-01 22:02:15 +00:00
Wink Saville
5bfbb334ae Merge "Merge commit '62321ab1' into fix-merge-conflict" into lmp-mr1-dev-plus-aosp 2014-10-01 21:35:28 +00:00
Wink Saville
ed49288a00 Merge commit '62321ab1' into fix-merge-conflict 
* commit '62321ab1':
  Maybe fix issue #17700474: manta: high occurrence of device booted...

Conflicts:
	services/core/java/com/android/server/am/ActivityManagerService.java

Change-Id: Ica4d544d11c1f81be793bdb4dea610396b32e946
 2014-10-01 14:14:10 -07:00
Dan Albert
47c23a228d resolved conflicts for merge of fe50cfd5 to lmp-mr1-dev-plus-aosp 
Change-Id: Id09c2786db18fa7e747cd1652ea95f575c3f5c46
 2014-10-01 13:52:49 -07:00
Dan Albert
fe50cfd533 am c46dbe8a: Merge "Use std::sort instead of qsort_r wrapper." 
* commit 'c46dbe8ac4748a0084b026524ad9e5ac44fb9fde':
  Use std::sort instead of qsort_r wrapper.
 2014-10-01 20:34:15 +00:00
Dan Albert
c46dbe8ac4 Merge "Use std::sort instead of qsort_r wrapper." 2014-10-01 20:30:52 +00:00
Dan Albert
0de19adc80 Use std::sort instead of qsort_r wrapper. 
The HAVE_(BSD|GNU)_QSORT_R in AndroidConfig.h has never worked, and we
should just be using something standard anyway.

Change-Id: I784d6212f6c890a11c4af2f83d1ce2d279708652
 2014-10-01 11:34:17 -07:00
Amit Mahajan
7ed7afb51e am 7f630ae7: am c9ab6f12: am f9a67cf9: am 496aeb1a: Merge "Roaming blacklist" into lmp-dev 
* commit '7f630ae708927e5d76d8a198834ae2233ab3cca9':
  Roaming blacklist
 2014-10-01 17:11:14 +00:00
Adam Lesinski
7923da5f5d am 06f380e9: am 95731abe: am bb7b5197: am cd8e7381: Merge "Fix issue with using locally defined attrs in a shared lib" into lmp-dev 
* commit '06f380e9efa4698c223077cacaa2df80a704ef96':
  Fix issue with using locally defined attrs in a shared lib
 2014-10-01 17:11:10 +00:00
Alan Viverette
e5ee1dec2c am 999a1ca9: am 5c35f2a4: am e5bed12b: am c2379e00: Merge "Add activated text colors, update Material preference header" into lmp-dev 
* commit '999a1ca984ec0877c795433e6f1baa6cd5853aac':
  Add activated text colors, update Material preference header
 2014-10-01 17:11:06 +00:00
Alan Viverette
eb659ee3b4 am c6daadb5: am cf2b684f: am d292220f: am 191807e3: Merge "Remove baked-in shadow insets from Material dialog minHeight" into lmp-dev 
* commit 'c6daadb5be5fd5d244db370e4d61dd67b62a9774':
  Remove baked-in shadow insets from Material dialog minHeight
 2014-10-01 17:11:01 +00:00
Vineeta Srivastava
323807f483 am a42d17c5: am 3cc41b8e: am 533c9461: am ab1e241d: Merge "Show one name if both plmn and spn are equal" into lmp-dev 
* commit 'a42d17c5233b60c6f4460bd1679f788d334fea16':
  Show one name if both plmn and spn are equal
 2014-10-01 17:10:57 +00:00
Vineeta Srivastava
a098449bc2 am 70f7d14a: am f5e52703: am 0d4d8b19: am 575bf7e6: Merge "Correct MTU size for Bell" into lmp-dev 
* commit '70f7d14a6b3f6ebc0a20c56b3b9a949e8a273dfd':
  Correct MTU size for Bell
 2014-10-01 17:10:52 +00:00
Eino-Ville Talvala
93ac1c08ac am ef7bf5f0: am bf1184e8: am 4ddacc46: am 0a62ab70: Merge "Camera2 Legacy: Set a default thumbnail size" into lmp-dev 
* commit 'ef7bf5f0d82cd2d898c35b17b00d1ca4b59ec02a':
  Camera2 Legacy: Set a default thumbnail size
 2014-10-01 17:10:48 +00:00
Svetoslav
39423cf85c am 075f94b7: am 9d705759: am 6cda1b3f: am 6b491b64: Merge "Invalid accessibility state if UI test process crashes in a bad time." into lmp-dev 
* commit '075f94b76dae3e8143dfd5c92abf05c1812212c4':
  Invalid accessibility state if UI test process crashes in a bad time.
 2014-10-01 17:10:44 +00:00
Winson Chung
bb6a08cfdb am a173d9c8: am 57583c33: am d164460e: am 86ef70eb: Fixing build (Bug 17381033) 
* commit 'a173d9c83f411c74c2dfe8214a0f32cf6b66b7e7':
  Fixing build (Bug 17381033)
 2014-10-01 17:10:40 +00:00
Winson Chung
2a988941fc am cbb42d06: am 806a25a5: am 53c7483d: am c12f5745: Merge "Fixing an issue with leaking starting windows. (Bug 17657878)" into lmp-dev 
* commit 'cbb42d06c21a4875bfb5d0c5ff73ceae062356d0':
  Fixing an issue with leaking starting windows. (Bug 17657878)
 2014-10-01 17:10:34 +00:00
Craig Mautner
f82897a21c am d2e3bfce: am c139a41c: am d6770a0c: am 4fb4163f: Merge "Call Surface.release() for starting windows" into lmp-dev 
* commit 'd2e3bfcefddeef45b3bda04fd0e9ea00f62ab689':
  Call Surface.release() for starting windows
 2014-10-01 17:10:29 +00:00
Adam Powell
3ea97a8de6 am ac40e790: am ced21e4e: am c754382b: am fe426d06: Merge "Inset the non-overlay contextual action bar without a status guard" into lmp-dev 
* commit 'ac40e79029b99ef46f68c510ef19e81363f25bab':
  Inset the non-overlay contextual action bar without a status guard
 2014-10-01 17:10:25 +00:00
Alan Viverette
0a059f87b7 am a6a9b86b: am 601fa249: am 8c14ff5c: am c44c77d3: Merge "Implement missing visibility management for FrameLayout foreground" into lmp-dev 
* commit 'a6a9b86b7a79fbb0ab5b24a9c480f4f859b47823':
  Implement missing visibility management for FrameLayout foreground
 2014-10-01 17:10:21 +00:00
ztenghui
fee7f1b1d9 am ec81db6a: am c4306923: am 9e6a02b9: am ffa16f94: Merge "Correct the documentation for VectorDrawable" into lmp-dev 
* commit 'ec81db6ab43de69a9bba333c1939e6213af085fa':
  Correct the documentation for VectorDrawable
 2014-10-01 17:10:16 +00:00
Ruben Brunk
e60986611f am df261085: am 4d9face6: am 7432b884: am b3c802f2: Merge "camera2: Use valid dimensions for RGBA8888 gralloc buffers." into lmp-dev 
* commit 'df26108539c1ca134bece1c75d96b96f71c0e3f5':
  camera2: Use valid dimensions for RGBA8888 gralloc buffers.
 2014-10-01 17:10:12 +00:00
Jeff Sharkey
ae66513bb0 am 029a4b98: am 3de5ed51: am 7bd4aba1: am b27d43a8: Merge "Clear ident when obtaining provider across users." into lmp-dev 
* commit '029a4b98cc09a516f1ae37f580cb68047d01f2a2':
  Clear ident when obtaining provider across users.
 2014-10-01 17:10:08 +00:00
Dianne Hackborn
67787a82a0 am cb5fc84b: am 16b6a8f7: am 962e3e83: am 9cf01b63: Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit 'cb5fc84b554aa82a98867f997caffea3d7067033':
  More work on issue #17656716: Unhandled exception in Window Manager
 2014-10-01 17:10:04 +00:00
Svetoslav
047ab3b2e5 am cf0a3373: am 344ffbc6: am 567c9788: am 44d4eeaa: Merge "Use default encryption password if an accessibility service is enabled." into lmp-dev 
* commit 'cf0a337352a228302d44f9582673c7acdba329ca':
  Use default encryption password if an accessibility service is enabled.
 2014-10-01 17:10:00 +00:00
Fabrice Di Meglio
551db03c6a am 6d418b43: am db963b1c: am e353ccbf: am 415393f4: Merge "Update for bug #17521147 Settings activity looks terrible on Volantis" into lmp-dev 
* commit '6d418b43e566a48729bc122cf58d3f9399fb2274':
  Update for bug #17521147 Settings activity looks terrible on Volantis
 2014-10-01 17:09:56 +00:00
Winson Chung
07f9306ef4 am 69a0645e: am d1c1201d: am b61dea20: am da649073: Merge "Fixing regression with black task bar background. (Bug 17584337)" into lmp-dev 
* commit '69a0645eb2025c54232c4b65544db581a183c1e7':
  Fixing regression with black task bar background. (Bug 17584337)
 2014-10-01 17:09:51 +00:00
Chris Wren
5055589269 am edc19979: am 82ef988c: am b742c9a0: am c3328cac: Merge "Add a returns clause to the matchesInterruptionFilter javadoc." into lmp-dev 
* commit 'edc199796844db9ee947165ddfff7cec810403e2':
  Add a returns clause to the matchesInterruptionFilter javadoc.
 2014-10-01 17:09:47 +00:00
Chris Wren
8bac9b5a6e am ca20e6c6: am 1d88c087: am 4afe428f: am af098c56: Merge "Update the documentation on EXTRA_PEOPLE." into lmp-dev 
* commit 'ca20e6c637c34a1200f08b2de5485193bc4eb74c':
  Update the documentation on EXTRA_PEOPLE.
 2014-10-01 17:09:43 +00:00
Paul Jensen
60c8c86df3 am 8c4ba7c3: am 18434fcc: am a524b0f7: am 8df099df: Make CaptivePortalLogin app exit if underlying Network disconnects. 
* commit '8c4ba7c3f6263a692c9b2ac1164348ad853206e8':
  Make CaptivePortalLogin app exit if underlying Network disconnects.
 2014-10-01 17:09:38 +00:00
Alexandra Gherghina
58499d61f8 am 8292b033: am a266670a: am d7275ae2: am 75c33d9d: Merge "Adds the ability to start a user in background" into lmp-dev 
* commit '8292b0331e21af8786791067e92009e949448f3f':
  Adds the ability to start a user in background
 2014-10-01 17:09:34 +00:00
Dianne Hackborn
63f38a0836 am e83f322f: am 30854356: am 29a11523: am c3014c8c: Merge "Fix issue #17705755: Battery stats resets at incorrect times" into lmp-dev 
* commit 'e83f322fa91f64844ea24aab2944540ca43a2a01':
  Fix issue #17705755: Battery stats resets at incorrect times
 2014-10-01 17:09:29 +00:00
Winson Chung
be1b7ddb44 am ac5bb347: am 3175f7d2: am 2396f135: am e3206407: Merge "Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)" into lmp-dev 
* commit 'ac5bb347cb769f217135124ddb6008bab9727d22':
  Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)
 2014-10-01 17:09:22 +00:00
John Spurlock
f35be105ee am 9a4fc6aa: am eac6926f: am 260e6d54: am a1b84165: Merge "Don\'t play hint animations when dozing" into lmp-dev 
* commit '9a4fc6aab9884af87d49e0d912da56dd8bfe8868':
  Don't play hint animations when dozing
 2014-10-01 17:09:18 +00:00
Jason Monk
e9250ae94f am 81ab90f2: am 9e280c44: am 15349991: am e7b18d2b: Merge "Pull roaming from mServiceState for consistency" into lmp-dev 
* commit '81ab90f2173c8afac82a22c2cca72eb90293de9a':
  Pull roaming from mServiceState for consistency
 2014-10-01 17:09:13 +00:00
George Mount
c416fb8c62 am 8cc88125: am 6d7a0cd5: am 3dc0a918: am 8afceda1: Merge "Clear preordered list after use." into lmp-dev 
* commit '8cc881257c6e8e9448a05e25688861536ea55971':
  Clear preordered list after use.
 2014-10-01 17:09:09 +00:00
John Spurlock
c4b4ffb808 am abc4db31: am 3fd4440f: am af41d847: am ee98df79: Doze: Log screenOnFromTouch when flinging. 
* commit 'abc4db312aa6e5287b5abbd2d201f10d642fca7d':
  Doze: Log screenOnFromTouch when flinging.
 2014-10-01 17:09:05 +00:00
Baligh Uddin
66e622ba6a am f13bb6f5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'f13bb6f53ca5a86ba7822dd1735adb417bfaf34e':
  Import translations. DO NOT MERGE
 2014-10-01 17:04:00 +00:00
Ricardo Cervera
f2bf62c1c2 am d7b45dd7: am 3cf53caf: am 1ed09f9b: am e906b38b: am 781c988a: am ae7b5dc4: Merge "docs: ADT beginner text fix" into klp-modular-docs 
* commit 'd7b45dd7b04dbe19dafd5e83066824e8f32d5563':
  docs: ADT beginner text fix
 2014-10-01 17:02:40 +00:00
Jeff Brown
5a3f98aa8a am f0245cb2: am 69073040: am 62434d6a: Merge "Reduce latency from doze to screen on." into lmp-dev 
* commit 'f0245cb2e3058e74ad1df7a169ae663d31565ce5':
  Reduce latency from doze to screen on.
 2014-10-01 17:02:36 +00:00
Sungsoo Lim
a381976b7b am d5504e04: am e4495131: am ee33c661: Merge "Update java doc for content rating systems" into lmp-dev 
* commit 'd5504e04f532ba6a89c5fa72535c0713b5db2fa1':
  Update java doc for content rating systems
 2014-10-01 17:02:33 +00:00
Jerome Poichet
87ed04832c am 0d71155d: am a5fa02df: am 72079f7f: Merge "Make sure cancel is called on tear down." into lmp-dev 
* commit '0d71155d42e09e62456505bcff4e1dfe02ba9b32':
  Make sure cancel is called on tear down.
 2014-10-01 17:02:29 +00:00
Dianne Hackborn
c8d5d614fb am d0ab6d6d: am 88998f79: am 62321ab1: Merge "Maybe fix issue #17700474: manta: high occurrence of device booted..." into lmp-dev 
* commit 'd0ab6d6dbf948fc04ec12467ae85513650a4ff14':
  Maybe fix issue #17700474: manta: high occurrence of device booted...
 2014-10-01 17:02:26 +00:00
Amit Mahajan
7f630ae708 am c9ab6f12: am f9a67cf9: am 496aeb1a: Merge "Roaming blacklist" into lmp-dev 
* commit 'c9ab6f1288e65b31ffa8879916187c75d08c63cf':
  Roaming blacklist
 2014-10-01 17:02:22 +00:00
Adam Lesinski
06f380e9ef am 95731abe: am bb7b5197: am cd8e7381: Merge "Fix issue with using locally defined attrs in a shared lib" into lmp-dev 
* commit '95731abeae49eac57911068ac8545f4eba2ae58d':
  Fix issue with using locally defined attrs in a shared lib
 2014-10-01 17:02:18 +00:00
Alan Viverette
999a1ca984 am 5c35f2a4: am e5bed12b: am c2379e00: Merge "Add activated text colors, update Material preference header" into lmp-dev 
* commit '5c35f2a47e222e60e6d27d4b7acbd0114bf97d6c':
  Add activated text colors, update Material preference header
 2014-10-01 17:02:14 +00:00