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

162371 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
smain@google.com
fc696fb6f3 am 3ae2a715: am 9f928944: Merge "update droiddoc option to include api level 21 for javadoc tagging" into lmp-dev 
* commit '3ae2a71539aeef868ec6b6c5b755a2b3f0c1b4e0':
  update droiddoc option to include api level 21 for javadoc tagging
 2014-10-09 19:16:55 +00:00
Christopher Tate
c09f6e6906 am b03b6a6c: am 6dea8de7: Merge "Actually tell the widget service that restore is starting" into lmp-dev 
* commit 'b03b6a6c5a88e4c55d936ec028dd55a699ae787f':
  Actually tell the widget service that restore is starting
 2014-10-09 19:16:50 +00:00
Robin Lee
4a718f2af3 am a300025d: Merge "DevicePolicy: One cert tracker warning per profile" into lmp-dev 
* commit 'a300025d23fac899c2294a8281b12b52d4e830b6':
  DevicePolicy: One cert tracker warning per profile
 2014-10-09 19:11:29 +00:00
Joe Fernandez
5b349c4ce9 am e2f757d9: am a63f81ec: am e15773be: Merge "docs: Android TV publishing requirements" into klp-modular-docs 
* commit 'e2f757d9f3341b66d75d335cd9dd29848a4b8969':
  docs: Android TV publishing requirements
 2014-10-09 19:11:22 +00:00
Chong Zhang
d25b996a7a am a6ae8ba4: MediaHTTPConnection: do not use proxy for localhost 
* commit 'a6ae8ba4a59f3f893fe8893335e7517388123c10':
  MediaHTTPConnection: do not use proxy for localhost
 2014-10-09 19:11:11 +00:00
Christopher Tate
f857b272c2 am 2e0f6682: Merge "Also monitor MOVED_TO events for wallpaper updates" into lmp-dev 
* commit '2e0f66820e12bbd24f476fba863d9dab564c6f97':
  Also monitor MOVED_TO events for wallpaper updates
 2014-10-09 19:11:06 +00:00
Fred Fettinger
708206c35e am 6c858c25: am b4093c12: (-s ours) hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE 
* commit '6c858c25f31bcdd72b60cbd0c91b085d9f298ffa':
  hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE
 2014-10-09 19:09:50 +00:00
mike dooley
3175824a78 am 879142bf: Fix hangouts conference calling regression. 
* commit '879142bf1c6b72670d4aedac82938f00a97acf5b':
  Fix hangouts conference calling regression.
 2014-10-09 19:09:41 +00:00
Tim Kilbourn
5d7f58be2c am 37bd0776: Merge "Don\'t start SearchDialog on television." into lmp-dev 
* commit '37bd07768a05aabb0905608606f354a488a2d5cf':
  Don't start SearchDialog on television.
 2014-10-09 19:09:30 +00:00
Jeff Brown
ab46eda872 am 704998ab: Merge "Ensure we correctly unblank displays when added." into lmp-dev 
* commit '704998abbafea84c28c0bcd0c540af87562b4cc9':
  Ensure we correctly unblank displays when added.
 2014-10-09 19:09:01 +00:00
smain@google.com
8433b63c02 am b880707c: am 63cd4977: am 770c3c5e: fix unclickable link due to overlay from offset dev below 
* commit 'b880707c7facd8f9232379ef481b2b5a0030b682':
  fix unclickable link due to overlay from offset dev below
 2014-10-09 19:08:56 +00:00
smain@google.com
3ae2a71539 am 9f928944: Merge "update droiddoc option to include api level 21 for javadoc tagging" into lmp-dev 
* commit '9f928944fa4186e97b051b0076d7e30469b92124':
  update droiddoc option to include api level 21 for javadoc tagging
 2014-10-09 19:08:41 +00:00
Christopher Tate
b03b6a6c5a am 6dea8de7: Merge "Actually tell the widget service that restore is starting" into lmp-dev 
* commit '6dea8de7097eb91c9595cea63acd489e34c63aac':
  Actually tell the widget service that restore is starting
 2014-10-09 19:08:33 +00:00
Elliott Hughes
90e01b3b40 am b68fe9e5: am ae1b6805: Merge "Track change to private libcore data structure." 
* commit 'b68fe9e5f355a3d13ed74cb89fb3e3818b356cee':
  Track change to private libcore data structure.
 2014-10-09 18:20:23 +00:00
Elliott Hughes
b68fe9e5f3 am ae1b6805: Merge "Track change to private libcore data structure." 
* commit 'ae1b6805a2609759186af8d7131c4750e011019a':
  Track change to private libcore data structure.
 2014-10-09 18:13:54 +00:00
Jeff Hao
4b34b329fb am 6b7515dd: Merge "Improve priority ordering of apps when performing boot dexopt." into lmp-mr1-dev 
* commit '6b7515dd0d70ad1b3149b1f38ef548a06a4d5cec':
  Improve priority ordering of apps when performing boot dexopt.
 2014-10-09 18:13:23 +00:00
Elliott Hughes
ae1b6805a2 Merge "Track change to private libcore data structure." 2014-10-09 18:08:58 +00:00
Jeff Hao
6b7515dd0d Merge "Improve priority ordering of apps when performing boot dexopt." into lmp-mr1-dev 2014-10-09 18:06:48 +00:00
RoboErik
d9be933fc2 am 51ff1c93: am f9122232: am a78601dc: Merge "Ensure metadata bundles are unparceled before making them available" into lmp-dev 
* commit '51ff1c937d6fe5f994f701260bc69c8b1dae3fe9':
  Ensure metadata bundles are unparceled before making them available
 2014-10-09 17:04:55 +00:00
Christopher Tate
05d7f0dfe8 am a4d5471f: am 3a8e28c1: am c0a30bcf: Merge "Turn on dimension validation in wallpaper restore" into lmp-dev 
* commit 'a4d5471fc66345f82ffbc877eea172d879fb8563':
  Turn on dimension validation in wallpaper restore
 2014-10-09 17:04:51 +00:00
Georgi Nikolov
fb7bf887ee am ffdc68e0: am 682d77dc: am 6eb0f480: Merge "BUG 17887323: Need to turn off DEBUG log spam in Job Scheduler" into lmp-dev 
* commit 'ffdc68e0a87a67a647de1e787b76e995dca8848e':
  BUG 17887323: Need to turn off DEBUG log spam in Job Scheduler
 2014-10-09 17:04:47 +00:00
Ye Wen
b6566c3731 am ac9d81b9: am 108ba84a: am de73afe2: Merge "Make MmsServiceBroker more robust to MmsService crashes" into lmp-dev 
* commit 'ac9d81b9ba2419c797a9a28dd0a479bc33bd36f6':
  Make MmsServiceBroker more robust to MmsService crashes
 2014-10-09 17:04:43 +00:00
Adam Lesinski
bd1867e48e am 03be7ab5: am 6167950b: am 59d208dd: Merge "Remove UsageEvents#resetToStart() as it doesn\'t work" into lmp-dev 
* commit '03be7ab52975a5bab0e0e86d25694c14b8030aa6':
  Remove UsageEvents#resetToStart() as it doesn't work
 2014-10-09 17:04:39 +00:00
RoboErik
51ff1c937d am f9122232: am a78601dc: Merge "Ensure metadata bundles are unparceled before making them available" into lmp-dev 
* commit 'f91222327e71edccb5b5d34fde61abc54f580fab':
  Ensure metadata bundles are unparceled before making them available
 2014-10-09 16:57:57 +00:00
Christopher Tate
a4d5471fc6 am 3a8e28c1: am c0a30bcf: Merge "Turn on dimension validation in wallpaper restore" into lmp-dev 
* commit '3a8e28c1d7dc474b70e937774de5eba70d528674':
  Turn on dimension validation in wallpaper restore
 2014-10-09 16:57:51 +00:00
Georgi Nikolov
ffdc68e0a8 am 682d77dc: am 6eb0f480: Merge "BUG 17887323: Need to turn off DEBUG log spam in Job Scheduler" into lmp-dev 
* commit '682d77dcf19c2d1a7b26a22e457e53daee6fb212':
  BUG 17887323: Need to turn off DEBUG log spam in Job Scheduler
 2014-10-09 16:57:46 +00:00
Ye Wen
ac9d81b9ba am 108ba84a: am de73afe2: Merge "Make MmsServiceBroker more robust to MmsService crashes" into lmp-dev 
* commit '108ba84ac546bb72deae76699cd26b1004985c05':
  Make MmsServiceBroker more robust to MmsService crashes
 2014-10-09 16:57:39 +00:00
Adam Lesinski
03be7ab529 am 6167950b: am 59d208dd: Merge "Remove UsageEvents#resetToStart() as it doesn\'t work" into lmp-dev 
* commit '6167950b7a5a8b9f021e9656b42b9b48bfbcbf80':
  Remove UsageEvents#resetToStart() as it doesn't work
 2014-10-09 16:57:34 +00:00
RoboErik
f91222327e am a78601dc: Merge "Ensure metadata bundles are unparceled before making them available" into lmp-dev 
* commit 'a78601dc1929428007fdbb07da0a07ae3fb60bd5':
  Ensure metadata bundles are unparceled before making them available
 2014-10-09 16:46:46 +00:00
Christopher Tate
3a8e28c1d7 am c0a30bcf: Merge "Turn on dimension validation in wallpaper restore" into lmp-dev 
* commit 'c0a30bcfaecf38ab5b55c53e82505570ffffa71e':
  Turn on dimension validation in wallpaper restore
 2014-10-09 16:46:36 +00:00
Georgi Nikolov
682d77dcf1 am 6eb0f480: Merge "BUG 17887323: Need to turn off DEBUG log spam in Job Scheduler" into lmp-dev 
* commit '6eb0f4808dd984a7fa45da5eca03b4c5d8ff9327':
  BUG 17887323: Need to turn off DEBUG log spam in Job Scheduler
 2014-10-09 16:46:26 +00:00
Ye Wen
108ba84ac5 am de73afe2: Merge "Make MmsServiceBroker more robust to MmsService crashes" into lmp-dev 
* commit 'de73afe268bd7979017ae4b9481fc1ebf5df6c19':
  Make MmsServiceBroker more robust to MmsService crashes
 2014-10-09 16:46:19 +00:00
Adam Lesinski
6167950b7a am 59d208dd: Merge "Remove UsageEvents#resetToStart() as it doesn\'t work" into lmp-dev 
* commit '59d208ddc1c5c51ae4d4f19ffbaf7685e534fe7f':
  Remove UsageEvents#resetToStart() as it doesn't work
 2014-10-09 16:46:14 +00:00
ztenghui
a92dd37feb am e6411c76: Merge "Support dot separation as the svg path data did." into lmp-mr1-dev 
* commit 'e6411c76c44930cd893b78ea9f59f26a4a441881':
  Support dot separation as the svg path data did.
 2014-10-09 16:39:06 +00:00
ztenghui
e6411c76c4 Merge "Support dot separation as the svg path data did." into lmp-mr1-dev 2014-10-09 16:34:40 +00:00
Geoff Mendal
a036088d8e am c1f4c0fe: (-s ours) am e73bb6e0: (-s ours) am 49c5ddd6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'c1f4c0fefebfb296846e88324c1bb7dee6b5c876':
  Import translations. DO NOT MERGE
 2014-10-09 13:17:14 +00:00
Quddus Chong
39dd5163e7 am 00c1c564: am 10be6fed: am 8f25f390: am 9df3d67b: am 7f567e4a: docs: Changed date of GMS v6.1 (Manchego) release to October 2014. 
* commit '00c1c564b0edca42093febf9e3f789cb9ae75d9d':
  docs: Changed date of GMS v6.1 (Manchego) release to October 2014.
 2014-10-09 13:17:10 +00:00
Mike Lockwood
500913ee00 am cf1e5c39: am cf61b3f6: am 3910f53c: Merge "bootanimation: Tweak parameters for pcm_open for playing boot sounds." into lmp-dev 
* commit 'cf1e5c3912a4d3fb0dd0dae80e049fa470e29581':
  bootanimation: Tweak parameters for pcm_open for playing boot sounds.
 2014-10-09 13:17:06 +00:00
Eino-Ville Talvala
58d5a8b646 am 7e7a14c5: am eeec4b9e: am ef773e35: Merge changes Id09663d8,Ie88f3750 into lmp-dev 
* commit '7e7a14c541aba0824e37f51920e988dc38e9a34f':
  Camera2: Docs cleanup, especially units and range
  camera2: Update docs only for legacy devices
 2014-10-09 13:17:01 +00:00
Svetoslav
202ff5f2e0 am fc324ddf: am 2f2864b7: am 3dd06d90: Merge "Restored widget provider id not properly updated." into lmp-dev 
* commit 'fc324ddf0593b21694b7fcf315c6da607ff38805':
  Restored widget provider id not properly updated.
 2014-10-09 13:16:45 +00:00
Dianne Hackborn
36ae48a850 am d83e9e42: am 0761b1b5: am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev 
* commit 'd83e9e42805e340384f30199777fbc472c5c6f20':
  Put in real "code" (aka marketing) name.
 2014-10-09 13:16:40 +00:00
Deepanshu Gupta
d8497e45c7 am 0a61c7ee: am 985d59d7: am 908a4f9a: am 4f133894: Exclude KXmlParser from LayoutLib. 
* commit '0a61c7ee4a94326b7524d58f456973b68ac62d35':
  Exclude KXmlParser from LayoutLib.
 2014-10-09 13:16:36 +00:00
Jeff Sharkey
8a1df4154d am b4248495: am b01a5ba2: am 562262cc: Merge "Bring along more ApplicationInfo fields." into lmp-dev 
* commit 'b424849533ac369c41a824510a8f3914f62ed2c6':
  Bring along more ApplicationInfo fields.
 2014-10-09 13:16:31 +00:00
Geoff Mendal
52940c2bcf am 437e5c9c: (-s ours) am db5b94d4: (-s ours) am f121892b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '437e5c9c9a994efe795e72ffe4721055f077c4cf':
  Import translations. DO NOT MERGE
 2014-10-09 13:16:27 +00:00
Filip Gruszczynski
6c99561384 am 301d2276: am 49e2371a: Merge "Log exception when creating Activity in ActivityUnitTestCase." into lmp-sprout-dev 
* commit '301d2276f9d5208da7036b465203575a5eac8936':
  Log exception when creating Activity in ActivityUnitTestCase.
 2014-10-09 13:16:23 +00:00
Geoff Mendal
c1f4c0fefe am e73bb6e0: (-s ours) am 49c5ddd6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'e73bb6e059dbd073b09246471b332b6b0e72f191':
  Import translations. DO NOT MERGE
 2014-10-09 13:04:23 +00:00
Quddus Chong
00c1c564b0 am 10be6fed: am 8f25f390: am 9df3d67b: am 7f567e4a: docs: Changed date of GMS v6.1 (Manchego) release to October 2014. 
* commit '10be6fed6629a3f977d3b693f70868df3c5d1c0c':
  docs: Changed date of GMS v6.1 (Manchego) release to October 2014.
 2014-10-09 13:04:18 +00:00
Mike Lockwood
cf1e5c3912 am cf61b3f6: am 3910f53c: Merge "bootanimation: Tweak parameters for pcm_open for playing boot sounds." into lmp-dev 
* commit 'cf61b3f6e653749b3d04eb531d76918e88eb98bd':
  bootanimation: Tweak parameters for pcm_open for playing boot sounds.
 2014-10-09 13:04:13 +00:00
Eino-Ville Talvala
7e7a14c541 am eeec4b9e: am ef773e35: Merge changes Id09663d8,Ie88f3750 into lmp-dev 
* commit 'eeec4b9ebc15545e59985eab29385157cbbd8e9f':
  Camera2: Docs cleanup, especially units and range
  camera2: Update docs only for legacy devices
 2014-10-09 13:04:08 +00:00
Svetoslav
fc324ddf05 am 2f2864b7: am 3dd06d90: Merge "Restored widget provider id not properly updated." into lmp-dev 
* commit '2f2864b7b13ee4846a1d95c2c03eeb5752629f21':
  Restored widget provider id not properly updated.
 2014-10-09 13:03:28 +00:00