Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
175,231 Commits 3 Branches 0 Tags
2b5edf651a3916632da348e9f83e2b2393664381
Commit Graph

175231 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bo Liu
2b5edf651a am 88309159: am 38134303: am 84be180e: Merge "Fix crash in getNativeCanvas when canvasHandle is NULL" into lmp-mr1-dev 
* commit '88309159a53ceb4f34fe01056521e4b84e848ef7':
  Fix crash in getNativeCanvas when canvasHandle is NULL
 2014-11-25 18:51:37 +00:00
John Reck
58383869ab am af3efb4a: am f2a382d4: am fb6121e0: Merge "Revert "Ensure calling mutate() on DrawableContainer creates a new state"" into lmp-mr1-dev 
* commit 'af3efb4a9ea9eafc86888be48c88fe638a22c7e9':
  Revert "Ensure calling mutate() on DrawableContainer creates a new state"
 2014-11-25 18:51:33 +00:00
John Reck
fb7ff703e0 am 5ab86ba0: am 89a63f02: am 0c31d97a: Merge "Switch TextureCache to SkPixelRef::fStableId" into lmp-mr1-dev 
* commit '5ab86ba05decf12e8ee3f693aab6b265905049c6':
  Switch TextureCache to SkPixelRef::fStableId
 2014-11-25 18:51:29 +00:00
Natalie Masse
82f5fde34c am 18c295bf: am a05d4a4b: am 8d9e6434: am 65e51fcd: am d7c7d275: am 77283ec9: Merge "Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation" into lmp-docs 
* commit '18c295bf8b258e94050b2e2fb741cb597011159b':
  Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation
 2014-11-25 18:51:24 +00:00
Svet Ganov
657fcb172e am 846aac1a: am 48956f26: am f51d7015: Merge "Lockup in the print spooler." into lmp-mr1-dev 
* commit '846aac1a22a23df440e39c642cb9213a025f21b7':
  Lockup in the print spooler.
 2014-11-25 18:51:20 +00:00
Dirk Dougherty
0b43c7eefb am e264e1f0: am be8da57a: am 5977f7d5: am d23a8692: am 14e40f04: am fd117ff2: Doc change: zh-cn translation of Android L overviews. cherrypick from I56d1ce58e10b83d10d0077cc9dfbeb04f090b861 
* commit 'e264e1f046d6374577c8c474fb3a6d772e2ac0bf':
  Doc change: zh-cn translation of Android L overviews. cherrypick from  I56d1ce58e10b83d10d0077cc9dfbeb04f090b861
 2014-11-25 18:51:15 +00:00
Alan Viverette
c0cdc00df2 am 3d0b7cdb: am 2bae3789: am ada19e6d: Merge "Update action bar insets on sw600dp to match Material spec" into lmp-mr1-dev 
* commit '3d0b7cdb661d29091ee789e5ca5e2e762edb0864':
  Update action bar insets on sw600dp to match Material spec
 2014-11-25 18:51:11 +00:00
Alan Viverette
37edd7d673 am bf7ef378: am 0e8aabd6: am 662039c6: Merge "Update IME selection dialog layout for Material" into lmp-mr1-dev 
* commit 'bf7ef378980a7d5b9b231d6e75a70923e83eed8c':
  Update IME selection dialog layout for Material
 2014-11-25 18:51:06 +00:00
Alan Viverette
270ca583bb am c9b68e11: am df188d41: am d30f6fba: Merge "Cannot set Pivot X,Y values from setPivotX, setPivotY API" into lmp-mr1-dev 
* commit 'c9b68e115091f8cd0fd77590d9d1be2bb0f04953':
  Cannot set Pivot X,Y values from setPivotX, setPivotY API
 2014-11-25 18:51:02 +00:00
Adam Lesinski
e1d149d5da am 44a711cc: am 9f692b52: am 9be305d1: Merge "Make the Context service constant for UsageStats public" into lmp-mr1-dev 
* commit '44a711ccac480aef4e8518284b8a0320e227f2df':
  Make the Context service constant for UsageStats public
 2014-11-25 18:50:57 +00:00
Alan Viverette
b65c4a6216 am 15913c80: am cda2dafd: am 27fdbc60: Merge "Ensure calling mutate() on DrawableContainer creates a new state" into lmp-mr1-dev 
* commit '15913c804f20bb37af90a4b81ff7758db90a2d17':
  Ensure calling mutate() on DrawableContainer creates a new state
 2014-11-25 18:50:52 +00:00
Alan Viverette
65be2b5037 am 11d33527: am 44c09f29: am 27fbf676: Merge "Update documentation for DatePicker to reflect the new mode" into lmp-mr1-dev 
* commit '11d33527e8715f2f6b7317a6424bcb2001778d44':
  Update documentation for DatePicker to reflect the new mode
 2014-11-25 18:50:48 +00:00
Tom Taylor
2afde42d61 am 0b7a212f: am bd3b0000: am 4cd3e47e: Merge "Issues with messaging apps on non-primary user account" into lmp-mr1-dev 
* commit '0b7a212f6a405ff0036d8df258401b75fc4eb81e':
  Issues with messaging apps on non-primary user account
 2014-11-25 18:50:43 +00:00
Ruben Brunk
07053cb921 am 7eb6e0e3: am c02cdf00: am 8791a1e8: Merge "Camera2: Ignore unsupported face detection results in LEGACY." into lmp-mr1-dev 
* commit '7eb6e0e3954bce374bc9ab7362005063174090b1':
  Camera2: Ignore unsupported face detection results in LEGACY.
 2014-11-25 18:50:38 +00:00
Jeff Sharkey
41ab908eba am bcf57d9d: am f07a99f9: am 07aca15b: Merge "Better am error when SELinux blocking access." into lmp-mr1-dev 
* commit 'bcf57d9d3ab537b091bb9d6c02d25419f44a90c7':
  Better am error when SELinux blocking access.
 2014-11-25 18:50:33 +00:00
RoboErik
583f08d2d6 am 351ab57e: am a9031025: am d9bb296b: Merge "Delay calling onConnected until a session is set in MediaBrowser" into lmp-mr1-dev 
* commit '351ab57e2538bbe98455661517bd0e4b7f104605':
  Delay calling onConnected until a session is set in MediaBrowser
 2014-11-25 18:50:28 +00:00
Erik Kline
08866fcfa5 Merge "Map TYPE_VPN integer to "VPN" string." 2014-11-25 18:46:37 +00:00
Bo Liu
88309159a5 am 38134303: am 84be180e: Merge "Fix crash in getNativeCanvas when canvasHandle is NULL" into lmp-mr1-dev 
* commit '3813430367591efcf925b2baebc50a99a7666644':
  Fix crash in getNativeCanvas when canvasHandle is NULL
 2014-11-25 18:46:04 +00:00
John Reck
af3efb4a9e am f2a382d4: am fb6121e0: Merge "Revert "Ensure calling mutate() on DrawableContainer creates a new state"" into lmp-mr1-dev 
* commit 'f2a382d4f7de5336d0c20358bb694e205a38fc38':
  Revert "Ensure calling mutate() on DrawableContainer creates a new state"
 2014-11-25 18:45:54 +00:00
John Reck
5ab86ba05d am 89a63f02: am 0c31d97a: Merge "Switch TextureCache to SkPixelRef::fStableId" into lmp-mr1-dev 
* commit '89a63f02f5d0814435e72b515b792bc6737014dc':
  Switch TextureCache to SkPixelRef::fStableId
 2014-11-25 18:45:48 +00:00
Natalie Masse
18c295bf8b am a05d4a4b: am 8d9e6434: am 65e51fcd: am d7c7d275: am 77283ec9: Merge "Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation" into lmp-docs 
* commit 'a05d4a4bb38df792cbf19a0f1e198a26f1509281':
  Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation
 2014-11-25 18:45:38 +00:00
Svet Ganov
846aac1a22 am 48956f26: am f51d7015: Merge "Lockup in the print spooler." into lmp-mr1-dev 
* commit '48956f266df46bc852c8c2886f16dbb7ac61b3fe':
  Lockup in the print spooler.
 2014-11-25 18:45:32 +00:00
Dirk Dougherty
e264e1f046 am be8da57a: am 5977f7d5: am d23a8692: am 14e40f04: am fd117ff2: Doc change: zh-cn translation of Android L overviews. cherrypick from I56d1ce58e10b83d10d0077cc9dfbeb04f090b861 
* commit 'be8da57a33103f9257d1a23eee372a703d8c181a':
  Doc change: zh-cn translation of Android L overviews. cherrypick from  I56d1ce58e10b83d10d0077cc9dfbeb04f090b861
 2014-11-25 18:45:11 +00:00
Alan Viverette
3d0b7cdb66 am 2bae3789: am ada19e6d: Merge "Update action bar insets on sw600dp to match Material spec" into lmp-mr1-dev 
* commit '2bae3789da18676cabf2e09e49c519fa96184a81':
  Update action bar insets on sw600dp to match Material spec
 2014-11-25 18:44:48 +00:00
Alan Viverette
bf7ef37898 am 0e8aabd6: am 662039c6: Merge "Update IME selection dialog layout for Material" into lmp-mr1-dev 
* commit '0e8aabd6c9dfef168a6de714219fc52ecaca08ea':
  Update IME selection dialog layout for Material
 2014-11-25 18:44:42 +00:00
Alan Viverette
c9b68e1150 am df188d41: am d30f6fba: Merge "Cannot set Pivot X,Y values from setPivotX, setPivotY API" into lmp-mr1-dev 
* commit 'df188d4137a9ebf0661127bab36c517a7fb001d5':
  Cannot set Pivot X,Y values from setPivotX, setPivotY API
 2014-11-25 18:44:37 +00:00
Adam Lesinski
44a711ccac am 9f692b52: am 9be305d1: Merge "Make the Context service constant for UsageStats public" into lmp-mr1-dev 
* commit '9f692b520255435903c8c1efb7b50f22a80505a5':
  Make the Context service constant for UsageStats public
 2014-11-25 18:44:31 +00:00
Alan Viverette
15913c804f am cda2dafd: am 27fdbc60: Merge "Ensure calling mutate() on DrawableContainer creates a new state" into lmp-mr1-dev 
* commit 'cda2dafd36641130fc41888d81c98cd2d54047b8':
  Ensure calling mutate() on DrawableContainer creates a new state
 2014-11-25 18:44:25 +00:00
Alan Viverette
11d33527e8 am 44c09f29: am 27fbf676: Merge "Update documentation for DatePicker to reflect the new mode" into lmp-mr1-dev 
* commit '44c09f2919d21296c0f020b954621c30d73eba20':
  Update documentation for DatePicker to reflect the new mode
 2014-11-25 18:44:20 +00:00
Tom Taylor
0b7a212f6a am bd3b0000: am 4cd3e47e: Merge "Issues with messaging apps on non-primary user account" into lmp-mr1-dev 
* commit 'bd3b00004c5aab43de0632994aa9a9d4e701ad5e':
  Issues with messaging apps on non-primary user account
 2014-11-25 18:43:56 +00:00
Ruben Brunk
7eb6e0e395 am c02cdf00: am 8791a1e8: Merge "Camera2: Ignore unsupported face detection results in LEGACY." into lmp-mr1-dev 
* commit 'c02cdf00e51b9a7ec7b9c74ba7eeb3711ec52213':
  Camera2: Ignore unsupported face detection results in LEGACY.
 2014-11-25 18:43:51 +00:00
Jeff Sharkey
bcf57d9d3a am f07a99f9: am 07aca15b: Merge "Better am error when SELinux blocking access." into lmp-mr1-dev 
* commit 'f07a99f9b92878e3570fe1715c701bc4c32d2ad9':
  Better am error when SELinux blocking access.
 2014-11-25 18:43:43 +00:00
RoboErik
351ab57e25 am a9031025: am d9bb296b: Merge "Delay calling onConnected until a session is set in MediaBrowser" into lmp-mr1-dev 
* commit 'a90310256476868d51811eb41c2c7f9b609dc0dc':
  Delay calling onConnected until a session is set in MediaBrowser
 2014-11-25 18:43:37 +00:00
Dan Stoza
031cfc8f3f Merge "Cast buffer width and height to int" 2014-11-25 18:33:34 +00:00
Jeff Sharkey
642b478635 am 278dfdf7: am 117c549b: am 0f667f58: Merge "Ignore spammy package logs when dumping." into lmp-mr1-dev 
* commit '278dfdf73142e72944478e50a3f02d3b5c6fd370':
  Ignore spammy package logs when dumping.
 2014-11-25 17:56:01 +00:00
Jeff Sharkey
db81f23e22 am 44952282: am ce7a0e6c: am 7038c390: Merge "Move Documents action bar update even later." into lmp-mr1-dev 
* commit '44952282e8e170483eef30f18c74fa3995cad0c9':
  Move Documents action bar update even later.
 2014-11-25 17:55:56 +00:00
Alan Viverette
d8eb415d61 am 67c55be3: am 0d05788f: am 760cfb02: Merge "Check for null drawable in theme-less getDrawable()" into lmp-mr1-dev 
* commit '67c55be39a76fb17cff79d926914a37fe56d452d':
  Check for null drawable in theme-less getDrawable()
 2014-11-25 17:55:52 +00:00
Jean-Michel Trivi
17bee9ca7d am e19bb5c0: am 213472d7: am 8c816096: Merge "Add support for audio focus locking" into lmp-mr1-dev 
* commit 'e19bb5c092309fad108e556e2e76ab13c0c17786':
  Add support for audio focus locking
 2014-11-25 17:55:48 +00:00
Jeff Davidson
633fffbff5 am 476d5a26: am 6fdf2a17: am 6ea4e11d: Merge "Don\'t enforce control permission when preparing consented VPN." into lmp-mr1-dev 
* commit '476d5a265bae7c638d83fc59037a885065e344a4':
  Don't enforce control permission when preparing consented VPN.
 2014-11-25 17:55:43 +00:00
Jinsuk Kim
d7a7d6f68c am 4043fd8f: am c27f5baa: am 51cb7aa7: Merge "CEC: Do not issue non-effective <Routing Change>" into lmp-mr1-dev 
* commit '4043fd8fec7e7f507851715138d705a8fdfe9e90':
  CEC: Do not issue non-effective <Routing Change>
 2014-11-25 17:55:39 +00:00
Geoff Mendal
77dad0e63b am 0f1fb55b: (-s ours) am 6a0ec6e6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '0f1fb55b8632542264ebb745618719f4f8bd8d44':
  Import translations. DO NOT MERGE
 2014-11-25 17:55:35 +00:00
Geoff Mendal
a2b2c60383 am 27192976: (-s ours) am db3b7b58: (-s ours) am 597226d6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '271929761551a0b515194bcdb6364d1b12522b88':
  Import translations. DO NOT MERGE
 2014-11-25 17:55:30 +00:00
Jeff Sharkey
278dfdf731 am 117c549b: am 0f667f58: Merge "Ignore spammy package logs when dumping." into lmp-mr1-dev 
* commit '117c549b86979d891edfe1d810ac087609928386':
  Ignore spammy package logs when dumping.
 2014-11-25 17:50:12 +00:00
Jeff Sharkey
44952282e8 am ce7a0e6c: am 7038c390: Merge "Move Documents action bar update even later." into lmp-mr1-dev 
* commit 'ce7a0e6cc7cd90cc5019f9b150a0295347f38406':
  Move Documents action bar update even later.
 2014-11-25 17:50:06 +00:00
Alan Viverette
67c55be39a am 0d05788f: am 760cfb02: Merge "Check for null drawable in theme-less getDrawable()" into lmp-mr1-dev 
* commit '0d05788fd06b24068c269bfa80dd96deafb00357':
  Check for null drawable in theme-less getDrawable()
 2014-11-25 17:49:53 +00:00
Jean-Michel Trivi
e19bb5c092 am 213472d7: am 8c816096: Merge "Add support for audio focus locking" into lmp-mr1-dev 
* commit '213472d7384c9d8096748f3cd9305ef49342dbcf':
  Add support for audio focus locking
 2014-11-25 17:49:46 +00:00
Jeff Davidson
476d5a265b am 6fdf2a17: am 6ea4e11d: Merge "Don\'t enforce control permission when preparing consented VPN." into lmp-mr1-dev 
* commit '6fdf2a1709c2006275d148e3156d249dcc27a99c':
  Don't enforce control permission when preparing consented VPN.
 2014-11-25 17:49:39 +00:00
Jinsuk Kim
4043fd8fec am c27f5baa: am 51cb7aa7: Merge "CEC: Do not issue non-effective <Routing Change>" into lmp-mr1-dev 
* commit 'c27f5baaeb39137b7cedc7c36feaaa1a67b1d3a3':
  CEC: Do not issue non-effective <Routing Change>
 2014-11-25 17:49:34 +00:00
Geoff Mendal
0f1fb55b86 am 6a0ec6e6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '6a0ec6e60616811bb19a25ce79c74361968642c4':
  Import translations. DO NOT MERGE
 2014-11-25 17:49:28 +00:00
Jeff Sharkey
eb9d22bb3d am c02f304c: am 58b699c3: am 636baa0d: Merge "Introduce revision codes for split APKs." into lmp-mr1-dev 
* commit 'c02f304c3a1dc45a7e44b9f91b38c62353850d30':
  Introduce revision codes for split APKs.
 2014-11-25 17:49:24 +00:00