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

154720 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Carlstrom
b3ab7b95a6 am c9e46543: am ae214fac: am 7123bd69: Merge "Use VMRuntime.isBootClassPathOnDisk" into lmp-dev 
* commit 'c9e46543e7825106c71b3dae2db3acc0bbbbf2a2':
  Use VMRuntime.isBootClassPathOnDisk
 2014-10-01 17:02:43 +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
Alan Viverette
c6daadb5be am cf2b684f: am d292220f: am 191807e3: Merge "Remove baked-in shadow insets from Material dialog minHeight" into lmp-dev 
* commit 'cf2b684f97b3cec9f9f57b31697c167b0e35c203':
  Remove baked-in shadow insets from Material dialog minHeight
 2014-10-01 17:02:11 +00:00
Vineeta Srivastava
a42d17c523 am 3cc41b8e: am 533c9461: am ab1e241d: Merge "Show one name if both plmn and spn are equal" into lmp-dev 
* commit '3cc41b8edd70244442ac666f3e3a2e63cff3cf0d':
  Show one name if both plmn and spn are equal
 2014-10-01 17:02:07 +00:00
Vineeta Srivastava
70f7d14a6b am f5e52703: am 0d4d8b19: am 575bf7e6: Merge "Correct MTU size for Bell" into lmp-dev 
* commit 'f5e527039b9ed1920ca5709047c1dcbdc0e63f3d':
  Correct MTU size for Bell
 2014-10-01 17:02:04 +00:00
Eino-Ville Talvala
ef7bf5f0d8 am bf1184e8: am 4ddacc46: am 0a62ab70: Merge "Camera2 Legacy: Set a default thumbnail size" into lmp-dev 
* commit 'bf1184e8bb795ea74044c9ccb703883f579ccec4':
  Camera2 Legacy: Set a default thumbnail size
 2014-10-01 17:02:00 +00:00
Svetoslav
075f94b76d am 9d705759: am 6cda1b3f: am 6b491b64: Merge "Invalid accessibility state if UI test process crashes in a bad time." into lmp-dev 
* commit '9d70575903f1189d6de577d8cc2e59252c2e9c39':
  Invalid accessibility state if UI test process crashes in a bad time.
 2014-10-01 17:01:57 +00:00
Winson Chung
a173d9c83f am 57583c33: am d164460e: am 86ef70eb: Fixing build (Bug 17381033) 
* commit '57583c33ec4e58fedf862478cf4116b5a7524568':
  Fixing build (Bug 17381033)
 2014-10-01 17:01:53 +00:00
Winson Chung
cbb42d06c2 am 806a25a5: am 53c7483d: am c12f5745: Merge "Fixing an issue with leaking starting windows. (Bug 17657878)" into lmp-dev 
* commit '806a25a51573377f35445a55fe89782f7603da61':
  Fixing an issue with leaking starting windows. (Bug 17657878)
 2014-10-01 17:01:50 +00:00
Craig Mautner
d2e3bfcefd am c139a41c: am d6770a0c: am 4fb4163f: Merge "Call Surface.release() for starting windows" into lmp-dev 
* commit 'c139a41ce722519beb9849cc509b3cbc61551e78':
  Call Surface.release() for starting windows
 2014-10-01 17:01:46 +00:00
Adam Powell
ac40e79029 am ced21e4e: am c754382b: am fe426d06: Merge "Inset the non-overlay contextual action bar without a status guard" into lmp-dev 
* commit 'ced21e4e651ab86d311212f527036253dd8079c4':
  Inset the non-overlay contextual action bar without a status guard
 2014-10-01 17:01:43 +00:00
Alan Viverette
a6a9b86b7a am 601fa249: am 8c14ff5c: am c44c77d3: Merge "Implement missing visibility management for FrameLayout foreground" into lmp-dev 
* commit '601fa2498d9042a19a21015e21629901ff09b25d':
  Implement missing visibility management for FrameLayout foreground
 2014-10-01 17:01:39 +00:00
ztenghui
ec81db6ab4 am c4306923: am 9e6a02b9: am ffa16f94: Merge "Correct the documentation for VectorDrawable" into lmp-dev 
* commit 'c430692305d4a162e2b33d59b330e54b2341de3a':
  Correct the documentation for VectorDrawable
 2014-10-01 17:01:09 +00:00
Ruben Brunk
df26108539 am 4d9face6: am 7432b884: am b3c802f2: Merge "camera2: Use valid dimensions for RGBA8888 gralloc buffers." into lmp-dev 
* commit '4d9face69eed8e1e6980199ea4e91a01a4bf0759':
  camera2: Use valid dimensions for RGBA8888 gralloc buffers.
 2014-10-01 17:00:57 +00:00
Jeff Sharkey
029a4b98cc am 3de5ed51: am 7bd4aba1: am b27d43a8: Merge "Clear ident when obtaining provider across users." into lmp-dev 
* commit '3de5ed51d6366b3823346e23fb5d28173df4ec07':
  Clear ident when obtaining provider across users.
 2014-10-01 17:00:54 +00:00
Dianne Hackborn
cb5fc84b55 am 16b6a8f7: am 962e3e83: am 9cf01b63: Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit '16b6a8f702fe654575f8929754908f57845158ce':
  More work on issue #17656716: Unhandled exception in Window Manager
 2014-10-01 17:00:50 +00:00
Svetoslav
cf0a337352 am 344ffbc6: am 567c9788: am 44d4eeaa: Merge "Use default encryption password if an accessibility service is enabled." into lmp-dev 
* commit '344ffbc647926611e52ae31d3e3188099a3b76fc':
  Use default encryption password if an accessibility service is enabled.
 2014-10-01 17:00:47 +00:00
Fabrice Di Meglio
6d418b43e5 am db963b1c: am e353ccbf: am 415393f4: Merge "Update for bug #17521147 Settings activity looks terrible on Volantis" into lmp-dev 
* commit 'db963b1c5d35d8feb3f6811124ff8a54e3a1ef2c':
  Update for bug #17521147 Settings activity looks terrible on Volantis
 2014-10-01 17:00:43 +00:00
Winson Chung
69a0645eb2 am d1c1201d: am b61dea20: am da649073: Merge "Fixing regression with black task bar background. (Bug 17584337)" into lmp-dev 
* commit 'd1c1201dfc07a6cce890b69610dc0e173a282791':
  Fixing regression with black task bar background. (Bug 17584337)
 2014-10-01 17:00:40 +00:00
Chris Wren
edc1997968 am 82ef988c: am b742c9a0: am c3328cac: Merge "Add a returns clause to the matchesInterruptionFilter javadoc." into lmp-dev 
* commit '82ef988c92fb158125f294201baecaceff7bcc8e':
  Add a returns clause to the matchesInterruptionFilter javadoc.
 2014-10-01 17:00:32 +00:00
Chris Wren
ca20e6c637 am 1d88c087: am 4afe428f: am af098c56: Merge "Update the documentation on EXTRA_PEOPLE." into lmp-dev 
* commit '1d88c087e6f95d1e29a2d657b4a446f2a20d75c4':
  Update the documentation on EXTRA_PEOPLE.
 2014-10-01 17:00:28 +00:00
Paul Jensen
8c4ba7c3f6 am 18434fcc: am a524b0f7: am 8df099df: Make CaptivePortalLogin app exit if underlying Network disconnects. 
* commit '18434fcc99e15f4cb29e4b07d4b1d7ba14b8285f':
  Make CaptivePortalLogin app exit if underlying Network disconnects.
 2014-10-01 17:00:24 +00:00
Alexandra Gherghina
8292b0331e am a266670a: am d7275ae2: am 75c33d9d: Merge "Adds the ability to start a user in background" into lmp-dev 
* commit 'a266670adf26984a25aaafc79ddd521dfcf6180c':
  Adds the ability to start a user in background
 2014-10-01 17:00:21 +00:00
Dianne Hackborn
e83f322fa9 am 30854356: am 29a11523: am c3014c8c: Merge "Fix issue #17705755: Battery stats resets at incorrect times" into lmp-dev 
* commit '30854356ef263a4e4ac3bd2376886f272d768e72':
  Fix issue #17705755: Battery stats resets at incorrect times
 2014-10-01 17:00:18 +00:00
Winson Chung
ac5bb347cb am 3175f7d2: am 2396f135: am e3206407: Merge "Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)" into lmp-dev 
* commit '3175f7d245daba660852cbcb92a7a821899b70a3':
  Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)
 2014-10-01 17:00:14 +00:00
John Spurlock
9a4fc6aab9 am eac6926f: am 260e6d54: am a1b84165: Merge "Don\'t play hint animations when dozing" into lmp-dev 
* commit 'eac6926f0cb260339ec7ec2495964331249338e2':
  Don't play hint animations when dozing
 2014-10-01 17:00:10 +00:00
Jason Monk
81ab90f217 am 9e280c44: am 15349991: am e7b18d2b: Merge "Pull roaming from mServiceState for consistency" into lmp-dev 
* commit '9e280c447f5f8747f7c4777d80d5dd7c25e7713e':
  Pull roaming from mServiceState for consistency
 2014-10-01 17:00:05 +00:00
George Mount
8cc881257c am 6d7a0cd5: am 3dc0a918: am 8afceda1: Merge "Clear preordered list after use." into lmp-dev 
* commit '6d7a0cd57f75e3b88a7f8a0f74694c8c049784c3':
  Clear preordered list after use.
 2014-10-01 16:59:48 +00:00
John Spurlock
abc4db312a am 3fd4440f: am af41d847: am ee98df79: Doze: Log screenOnFromTouch when flinging. 
* commit '3fd4440fea2d29f423a99cfaa5e30f4ff5c2239d':
  Doze: Log screenOnFromTouch when flinging.
 2014-10-01 16:59:44 +00:00
Baligh Uddin
f13bb6f53c Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-10-01 16:35:21 +00:00
Brian Carlstrom
c9e46543e7 am ae214fac: am 7123bd69: Merge "Use VMRuntime.isBootClassPathOnDisk" into lmp-dev 
* commit 'ae214fac0fa3887c41b1b16a0016a4e6f5b127b1':
  Use VMRuntime.isBootClassPathOnDisk
 2014-10-01 15:16:27 +00:00
Ricardo Cervera
d7b45dd7b0 am 3cf53caf: am 1ed09f9b: am e906b38b: am 781c988a: am ae7b5dc4: Merge "docs: ADT beginner text fix" into klp-modular-docs 
* commit '3cf53caf5e06d072a2a82dd4f8def9e0ab74c9d9':
  docs: ADT beginner text fix
 2014-10-01 15:16:23 +00:00
Jeff Brown
f0245cb2e3 am 69073040: am 62434d6a: Merge "Reduce latency from doze to screen on." into lmp-dev 
* commit '6907304024f1c31d2d2dcf783588a6dd8865ecd8':
  Reduce latency from doze to screen on.
 2014-10-01 15:16:19 +00:00
Sungsoo Lim
d5504e04f5 am e4495131: am ee33c661: Merge "Update java doc for content rating systems" into lmp-dev 
* commit 'e4495131cb0b176451d8b422e357c4bd28d8860c':
  Update java doc for content rating systems
 2014-10-01 15:16:16 +00:00
Jerome Poichet
0d71155d42 am a5fa02df: am 72079f7f: Merge "Make sure cancel is called on tear down." into lmp-dev 
* commit 'a5fa02dfa8ae6e2a8cfab6489ada400f8c33f455':
  Make sure cancel is called on tear down.
 2014-10-01 15:16:12 +00:00
Dianne Hackborn
d0ab6d6dbf am 88998f79: am 62321ab1: Merge "Maybe fix issue #17700474: manta: high occurrence of device booted..." into lmp-dev 
* commit '88998f79f1344650bc3ebf704600b03bfde2619f':
  Maybe fix issue #17700474: manta: high occurrence of device booted...
 2014-10-01 15:16:09 +00:00
Amit Mahajan
c9ab6f1288 am f9a67cf9: am 496aeb1a: Merge "Roaming blacklist" into lmp-dev 
* commit 'f9a67cf9beb635befa6a2063ef635ca9c5a10e29':
  Roaming blacklist
 2014-10-01 15:16:06 +00:00
Adam Lesinski
95731abeae am bb7b5197: am cd8e7381: Merge "Fix issue with using locally defined attrs in a shared lib" into lmp-dev 
* commit 'bb7b51978eb5341e9a1204a447c8340bfb248504':
  Fix issue with using locally defined attrs in a shared lib
 2014-10-01 15:16:02 +00:00
Alan Viverette
5c35f2a47e am e5bed12b: am c2379e00: Merge "Add activated text colors, update Material preference header" into lmp-dev 
* commit 'e5bed12bc2c1fede6b7f2db22d4432f4473c3232':
  Add activated text colors, update Material preference header
 2014-10-01 15:15:58 +00:00
Alan Viverette
cf2b684f97 am d292220f: am 191807e3: Merge "Remove baked-in shadow insets from Material dialog minHeight" into lmp-dev 
* commit 'd292220f460400b7c9b6549a39578c87317b6daf':
  Remove baked-in shadow insets from Material dialog minHeight
 2014-10-01 15:15:54 +00:00
Vineeta Srivastava
3cc41b8edd am 533c9461: am ab1e241d: Merge "Show one name if both plmn and spn are equal" into lmp-dev 
* commit '533c9461569c171fbdfe51cff708c27c10302353':
  Show one name if both plmn and spn are equal
 2014-10-01 15:15:51 +00:00
Vineeta Srivastava
f5e527039b am 0d4d8b19: am 575bf7e6: Merge "Correct MTU size for Bell" into lmp-dev 
* commit '0d4d8b19c0600b3dcfece194c5ae6c0a9d882fdc':
  Correct MTU size for Bell
 2014-10-01 15:15:47 +00:00
Eino-Ville Talvala
bf1184e8bb am 4ddacc46: am 0a62ab70: Merge "Camera2 Legacy: Set a default thumbnail size" into lmp-dev 
* commit '4ddacc465d52d118dedc087f68d6a00f8b419342':
  Camera2 Legacy: Set a default thumbnail size
 2014-10-01 15:15:43 +00:00