Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
176,611 Commits 3 Branches 0 Tags
c56cd34dcafe0d854a3a2b234a32cf859708f1df
Commit Graph

176611 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robin Lee
cc19e8b85b am 692e4933: Merge "DevicePolicy: Don\'t warn about managed profile CAs" into lmp-mr1-dev 
* commit '692e4933f01f5f7d0c16dcbcd96127897d054511':
  DevicePolicy: Don't warn about managed profile CAs
 2014-11-25 19:17:43 +00:00
Robin Lee
692e4933f0 Merge "DevicePolicy: Don't warn about managed profile CAs" into lmp-mr1-dev 2014-11-25 19:11:00 +00:00
chh
d7572b84ef am 3ec380d3: am fc545733: Merge "Remove unused variables and functions, don\'t warn about unused parameters" 
* commit '3ec380d365cbe5fac23ff19897512cf492a7a8a4':
  Remove unused variables and functions, don't warn about unused parameters
 2014-11-25 19:04:05 +00:00
Chih-hung Hsieh
243a42a799 am 43ea037b: am 481c4b64: Merge "Fix class vs. struct mismatch" 
* commit '43ea037b4c61e332d7419ac069a62e314166fdd7':
  Fix class vs. struct mismatch
 2014-11-25 19:03:57 +00:00
Chih-hung Hsieh
b308666814 am 6cc39a47: am 613d2066: Merge "Fix unused variables." 
* commit '6cc39a475dd8eaac04438b393559612ff7cd840f':
  Fix unused variables.
 2014-11-25 19:03:50 +00:00
Chih-hung Hsieh
0551ae80eb am 73780ac3: am 38cc84de: Merge "Remove unused variable" 
* commit '73780ac3921c26853eb132296144b85461c80e31':
  Remove unused variable
 2014-11-25 19:03:18 +00:00
Chih-Hung Hsieh
f14203295b am a3b1ea33: am e57b3991: Merge "Remove unused function" 
* commit 'a3b1ea33368b72209f72ad21b512b1c755ce05aa':
  Remove unused function
 2014-11-25 18:52:20 +00:00
Chris Craik
9c5b7b0942 am ee660651: Merge "Improve DisplayList state output" into lmp-mr1-dev 
* commit 'ee6606519d22805c1caf23a3c75cde9fc97b34eb':
  Improve DisplayList state output
 2014-11-25 18:51:59 +00:00
Andres Morales
8f70a2558b am ffc71028: am 83f4847f: am 59093d92: Merge "Define permission for system apps to query size of block" into lmp-mr1-dev 
* commit 'ffc710281c38aba9546d200a25d6b19b0f85470a':
  Define permission for system apps to query size of block
 2014-11-25 18:51:42 +00:00
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
Andres Morales
ffc710281c am 83f4847f: am 59093d92: Merge "Define permission for system apps to query size of block" into lmp-mr1-dev 
* commit '83f4847f7b842fafec74fad85878e36b19dfef9f':
  Define permission for system apps to query size of block
 2014-11-25 18:46:15 +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
Dianne Hackborn
bafddb4aa5 am d0f6b4f6: Merge "Start MountService before performBootDexOpt" into lmp-mr1-dev 
* commit 'd0f6b4f6297373e569e383edc21aaa3f87591e0b':
  Start MountService before performBootDexOpt
 2014-11-25 18:45:28 +00:00
John Spurlock
f74ae93cac am bc6f59a1: Merge "VolumeZen: Introduce internal vs external ringer mode." into lmp-mr1-dev 
* commit 'bc6f59a1ef341231c2b57e0cde691be1a5a32203':
  VolumeZen: Introduce internal vs external ringer mode.
 2014-11-25 18:45:23 +00:00
Chris Craik
ee6606519d Merge "Improve DisplayList state output" into lmp-mr1-dev 2014-11-25 18:45:11 +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
Dianne Hackborn
d0f6b4f629 Merge "Start MountService before performBootDexOpt" into lmp-mr1-dev 2014-11-25 18:42:59 +00:00
padarshr
4a84116d11 Start MountService before performBootDexOpt 
This change is to start Mountservice before starting
performBootDexOpt, as in one case, in performBootDexOpt
when system upgrade happens, StorageManager will be started to
get the low threshold of DataDir. But, at this point, as
Mountservice is still not up, StorageManager will end up
having a null object of Mountservice.

Change-Id: I6dec474266faa5de67449c1bbe6ef30791e5ecaa
 2014-11-25 10:42:15 -08:00
John Spurlock
bc6f59a1ef Merge "VolumeZen: Introduce internal vs external ringer mode." into lmp-mr1-dev 2014-11-25 18:40:55 +00:00
Alan Viverette
8dcd533786 Ensure calling mutate() on DrawableContainer creates a new state 
Previously, a new state would only be created on newDrawable(), which
caused the first drawable loaded for a resource to share constant state
with the cached version. Even if mutate() was called, the constant
state was still shared and any changes were applied to the cached copy.

BUG: 18504919
Change-Id: I40d257867eb0a092ce580b9c4338ddc7406a031d
 2014-11-25 10:40:24 -08:00