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
Robin Lee
967bc00fc1 am d92e9beb: am 499a3629: am 4a718f2a: am a300025d: Merge "DevicePolicy: One cert tracker warning per profile" into lmp-dev 
* commit 'd92e9bebdfb37a220cc35d9f64292d4e854a7d6e':
  DevicePolicy: One cert tracker warning per profile
 2014-10-10 16:59:31 +00:00
Joe Fernandez
5d5f3d1d87 am d240b98f: am b455eb7b: am 5b349c4c: am e2f757d9: am a63f81ec: am e15773be: Merge "docs: Android TV publishing requirements" into klp-modular-docs 
* commit 'd240b98f999533904db68cba93ea25c255f0ae53':
  docs: Android TV publishing requirements
 2014-10-10 16:59:26 +00:00
Chong Zhang
6725305137 am 8dac6fe7: am d4410a19: am d25b996a: am a6ae8ba4: MediaHTTPConnection: do not use proxy for localhost 
* commit '8dac6fe7ae724549607b6400bdfc789f7a323472':
  MediaHTTPConnection: do not use proxy for localhost
 2014-10-10 16:59:22 +00:00
Christopher Tate
798965a693 am c049e123: am 97cb995e: am f857b272: am 2e0f6682: Merge "Also monitor MOVED_TO events for wallpaper updates" into lmp-dev 
* commit 'c049e123bec7a573b012a2a024cbbb55ce32c402':
  Also monitor MOVED_TO events for wallpaper updates
 2014-10-10 16:59:17 +00:00
Fred Fettinger
a6758f664a am 0ebdc70d: am 1114b3b8: am 708206c3: am 6c858c25: am b4093c12: (-s ours) hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE 
* commit '0ebdc70d7a9b0cd38cfd6105135133c888075ef1':
  hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE
 2014-10-10 16:59:13 +00:00
mike dooley
7f1f1391c2 am a83896ce: am 6e24a156: am 3175824a: am 879142bf: Fix hangouts conference calling regression. 
* commit 'a83896ce73c56e3b16c8333cf442ebdbe7f9b8d0':
  Fix hangouts conference calling regression.
 2014-10-10 16:59:08 +00:00
Tim Kilbourn
9d285e7f99 am 79297f3c: am bb76d5cd: am 5d7f58be: am 37bd0776: Merge "Don\'t start SearchDialog on television." into lmp-dev 
* commit '79297f3c1c7898a194310169ef499889ed544a57':
  Don't start SearchDialog on television.
 2014-10-10 16:59:04 +00:00
Jeff Brown
1a62427231 am 847d2692: am 8aa2e3f1: am ab46eda8: am 704998ab: Merge "Ensure we correctly unblank displays when added." into lmp-dev 
* commit '847d2692978bb8efcd5335feb3ea27aa87948f42':
  Ensure we correctly unblank displays when added.
 2014-10-10 16:59:00 +00:00
smain@google.com
ea2a8ba464 am efdf63a7: am 8aa0e547: am 8433b63c: am b880707c: am 63cd4977: am 770c3c5e: fix unclickable link due to overlay from offset dev below 
* commit 'efdf63a74e101d4c37b50b6ad18ddbefc4d74c37':
  fix unclickable link due to overlay from offset dev below
 2014-10-10 16:58:55 +00:00
smain@google.com
5c90ccc34e am 520100d5: am fc696fb6: am 3ae2a715: am 9f928944: Merge "update droiddoc option to include api level 21 for javadoc tagging" into lmp-dev 
* commit '520100d569127a23052478e0420f5feacbf8b366':
  update droiddoc option to include api level 21 for javadoc tagging
 2014-10-10 16:58:50 +00:00
Christopher Tate
5a65116141 am 353e4a99: am c09f6e69: am b03b6a6c: am 6dea8de7: Merge "Actually tell the widget service that restore is starting" into lmp-dev 
* commit '353e4a99e92dbf8739b91e868aad7c2a86f0a7e7':
  Actually tell the widget service that restore is starting
 2014-10-10 16:58:45 +00:00
Jeff Hao
915bd5ca4f am 4b34b329: am 6b7515dd: Merge "Improve priority ordering of apps when performing boot dexopt." into lmp-mr1-dev 
* commit '4b34b329fb242985eedec63418b50357b00f6bd8':
  Improve priority ordering of apps when performing boot dexopt.
 2014-10-10 16:58:14 +00:00
RoboErik
ee512f515f am d9be933f: am 51ff1c93: am f9122232: am a78601dc: Merge "Ensure metadata bundles are unparceled before making them available" into lmp-dev 
* commit 'd9be933fc2e68f5f1ec5503e72f39b85abd65b52':
  Ensure metadata bundles are unparceled before making them available
 2014-10-10 16:57:55 +00:00
Christopher Tate
eb129805b5 am 05d7f0df: am a4d5471f: am 3a8e28c1: am c0a30bcf: Merge "Turn on dimension validation in wallpaper restore" into lmp-dev 
* commit '05d7f0dfe8352aab87d35f42209b1d34ae30b2d1':
  Turn on dimension validation in wallpaper restore
 2014-10-10 16:57:50 +00:00
Georgi Nikolov
3cda47927a am fb7bf887: am ffdc68e0: am 682d77dc: am 6eb0f480: Merge "BUG 17887323: Need to turn off DEBUG log spam in Job Scheduler" into lmp-dev 
* commit 'fb7bf887eeacae9de156f819f0575d250b8efc06':
  BUG 17887323: Need to turn off DEBUG log spam in Job Scheduler
 2014-10-10 16:57:45 +00:00
Ye Wen
b9e984594c am b6566c37: am ac9d81b9: am 108ba84a: am de73afe2: Merge "Make MmsServiceBroker more robust to MmsService crashes" into lmp-dev 
* commit 'b6566c373160ab09f346092abeb32eee2928bce1':
  Make MmsServiceBroker more robust to MmsService crashes
 2014-10-10 16:57:40 +00:00
Adam Lesinski
557b8d7cbd am bd1867e4: am 03be7ab5: am 6167950b: am 59d208dd: Merge "Remove UsageEvents#resetToStart() as it doesn\'t work" into lmp-dev 
* commit 'bd1867e48e9655c266fa901ec7bc9f85f8fb5c11':
  Remove UsageEvents#resetToStart() as it doesn't work
 2014-10-10 16:57:35 +00:00
ztenghui
39af6ae064 am a92dd37f: am e6411c76: Merge "Support dot separation as the svg path data did." into lmp-mr1-dev 
* commit 'a92dd37feb28923c1633b85d12382bc2aa2e03da':
  Support dot separation as the svg path data did.
 2014-10-10 16:57:03 +00:00
Geoff Mendal
ad54e37f3d am a036088d: (-s ours) am c1f4c0fe: (-s ours) am e73bb6e0: (-s ours) am 49c5ddd6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'a036088d8e10b3c10b06bb5c73aa885a8eb061ec':
  Import translations. DO NOT MERGE
 2014-10-10 04:27:04 +00:00
Quddus Chong
45d4e141d4 am 39dd5163: am 00c1c564: am 10be6fed: am 8f25f390: am 9df3d67b: am 7f567e4a: docs: Changed date of GMS v6.1 (Manchego) release to October 2014. 
* commit '39dd5163e7c9695c65d728828778de4648903f62':
  docs: Changed date of GMS v6.1 (Manchego) release to October 2014.
 2014-10-10 04:27:00 +00:00
Mike Lockwood
253ad526c1 am 500913ee: am cf1e5c39: am cf61b3f6: am 3910f53c: Merge "bootanimation: Tweak parameters for pcm_open for playing boot sounds." into lmp-dev 
* commit '500913ee002eb8a6a418732f3a6d7549ac046eaf':
  bootanimation: Tweak parameters for pcm_open for playing boot sounds.
 2014-10-10 04:26:55 +00:00
Eino-Ville Talvala
874d982c4d am 58d5a8b6: am 7e7a14c5: am eeec4b9e: am ef773e35: Merge changes Id09663d8,Ie88f3750 into lmp-dev 
* commit '58d5a8b646ed479d12109a94b9ebd37be79e4662':
  Camera2: Docs cleanup, especially units and range
  camera2: Update docs only for legacy devices
 2014-10-10 04:26:51 +00:00
Svetoslav
73a02f4337 am 202ff5f2: am fc324ddf: am 2f2864b7: am 3dd06d90: Merge "Restored widget provider id not properly updated." into lmp-dev 
* commit '202ff5f2e0c53ea68d40104f34084cb39b9906f1':
  Restored widget provider id not properly updated.
 2014-10-10 04:26:46 +00:00
Dianne Hackborn
75a6e82bcc am 36ae48a8: am d83e9e42: am 0761b1b5: am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev 
* commit '36ae48a850bade17d485cb49dd40a3f11f667ad4':
  Put in real "code" (aka marketing) name.
 2014-10-10 04:26:40 +00:00
Deepanshu Gupta
7c5020db4f am d8497e45: am 0a61c7ee: am 985d59d7: am 908a4f9a: am 4f133894: Exclude KXmlParser from LayoutLib. 
* commit 'd8497e45c72fbb27961d096499984906af19d35f':
  Exclude KXmlParser from LayoutLib.
 2014-10-10 04:26:33 +00:00
Jeff Sharkey
1855d0da8b am 8a1df415: am b4248495: am b01a5ba2: am 562262cc: Merge "Bring along more ApplicationInfo fields." into lmp-dev 
* commit '8a1df4154d0e1296a3f03fa2aaf852ac08f68f36':
  Bring along more ApplicationInfo fields.
 2014-10-10 04:26:29 +00:00
Geoff Mendal
3853a21f01 am 52940c2b: (-s ours) am 437e5c9c: (-s ours) am db5b94d4: (-s ours) am f121892b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '52940c2bcfa264a45875d36860de3903e336e740':
  Import translations. DO NOT MERGE
 2014-10-10 04:26:24 +00:00
Filip Gruszczynski
1e788daf6a am 6c995613: am 301d2276: am 49e2371a: Merge "Log exception when creating Activity in ActivityUnitTestCase." into lmp-sprout-dev 
* commit '6c99561384dafaa080b804078e55c6167efe0e11':
  Log exception when creating Activity in ActivityUnitTestCase.
 2014-10-10 04:26:18 +00:00
Alan Viverette
3ad81eee72 am 2eda6f07: am 466f5581: Merge "Slow down ripple background fade in from press" into lmp-mr1-dev 
* commit '2eda6f078cd6014a860903f515affa4d6a58748a':
  Slow down ripple background fade in from press
 2014-10-09 22:23:16 +00:00
Alan Viverette
cda9841a8b am f1d23f9c: am fe087d38: Merge "Fix invalid bounds detection in ExploreByTouchHelper" into lmp-mr1-dev 
* commit 'f1d23f9cc1992b936c98e2882eb5a3d766129fe7':
  Fix invalid bounds detection in ExploreByTouchHelper
 2014-10-09 22:23:11 +00:00
Robin Lee
d92e9bebdf am 499a3629: am 4a718f2a: am a300025d: Merge "DevicePolicy: One cert tracker warning per profile" into lmp-dev 
* commit '499a36294b48acf5c77f36281ddb40ef205dc596':
  DevicePolicy: One cert tracker warning per profile
 2014-10-09 19:23:27 +00:00
Joe Fernandez
d240b98f99 am b455eb7b: am 5b349c4c: am e2f757d9: am a63f81ec: am e15773be: Merge "docs: Android TV publishing requirements" into klp-modular-docs 
* commit 'b455eb7b32748c326bf64467223a8e553d630176':
  docs: Android TV publishing requirements
 2014-10-09 19:23:23 +00:00
Chong Zhang
8dac6fe7ae am d4410a19: am d25b996a: am a6ae8ba4: MediaHTTPConnection: do not use proxy for localhost 
* commit 'd4410a19bcad9e402c2a8f31576454a061c0c110':
  MediaHTTPConnection: do not use proxy for localhost
 2014-10-09 19:23:19 +00:00
Christopher Tate
c049e123be am 97cb995e: am f857b272: am 2e0f6682: Merge "Also monitor MOVED_TO events for wallpaper updates" into lmp-dev 
* commit '97cb995e990ab868355f109c1466a810dbad4d35':
  Also monitor MOVED_TO events for wallpaper updates
 2014-10-09 19:23:15 +00:00
Fred Fettinger
0ebdc70d7a am 1114b3b8: am 708206c3: am 6c858c25: am b4093c12: (-s ours) hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE 
* commit '1114b3b8d74aee0f1ec17f9f7b7f8e8c3cb3b4ca':
  hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE
 2014-10-09 19:23:11 +00:00
mike dooley
a83896ce73 am 6e24a156: am 3175824a: am 879142bf: Fix hangouts conference calling regression. 
* commit '6e24a156cd9a43ff782926a8d5618ed63944a933':
  Fix hangouts conference calling regression.
 2014-10-09 19:23:07 +00:00
Tim Kilbourn
79297f3c1c am bb76d5cd: am 5d7f58be: am 37bd0776: Merge "Don\'t start SearchDialog on television." into lmp-dev 
* commit 'bb76d5cd886f34165e59a35a36c353fe559929c7':
  Don't start SearchDialog on television.
 2014-10-09 19:23:00 +00:00
Jeff Brown
847d269297 am 8aa2e3f1: am ab46eda8: am 704998ab: Merge "Ensure we correctly unblank displays when added." into lmp-dev 
* commit '8aa2e3f168bc68b1ed59d0ea14a212bdb1837fa8':
  Ensure we correctly unblank displays when added.
 2014-10-09 19:22:56 +00:00
smain@google.com
efdf63a74e am 8aa0e547: am 8433b63c: am b880707c: am 63cd4977: am 770c3c5e: fix unclickable link due to overlay from offset dev below 
* commit '8aa0e54703067633001d52661a423075b38ed26e':
  fix unclickable link due to overlay from offset dev below
 2014-10-09 19:22:52 +00:00
smain@google.com
520100d569 am fc696fb6: am 3ae2a715: am 9f928944: Merge "update droiddoc option to include api level 21 for javadoc tagging" into lmp-dev 
* commit 'fc696fb6f3eb1b8226ac4675da02e512e5ff48bd':
  update droiddoc option to include api level 21 for javadoc tagging
 2014-10-09 19:22:48 +00:00
Christopher Tate
353e4a99e9 am c09f6e69: am b03b6a6c: am 6dea8de7: Merge "Actually tell the widget service that restore is starting" into lmp-dev 
* commit 'c09f6e6906bc159121bf84454b0462a592032491':
  Actually tell the widget service that restore is starting
 2014-10-09 19:22:44 +00:00
Robin Lee
499a36294b am 4a718f2a: am a300025d: Merge "DevicePolicy: One cert tracker warning per profile" into lmp-dev 
* commit '4a718f2af33159e58f4ad639d9d0e633a6ca8a8f':
  DevicePolicy: One cert tracker warning per profile
 2014-10-09 19:17:39 +00:00
Joe Fernandez
b455eb7b32 am 5b349c4c: am e2f757d9: am a63f81ec: am e15773be: Merge "docs: Android TV publishing requirements" into klp-modular-docs 
* commit '5b349c4ce9be68efe3b6d0bc09a3cfa22d837f25':
  docs: Android TV publishing requirements
 2014-10-09 19:17:34 +00:00
Chong Zhang
d4410a19bc am d25b996a: am a6ae8ba4: MediaHTTPConnection: do not use proxy for localhost 
* commit 'd25b996a7ab2589f258d0006dda6589f53d98366':
  MediaHTTPConnection: do not use proxy for localhost
 2014-10-09 19:17:29 +00:00
Christopher Tate
97cb995e99 am f857b272: am 2e0f6682: Merge "Also monitor MOVED_TO events for wallpaper updates" into lmp-dev 
* commit 'f857b272c27ca6836b5cec51a9f3714603aa2ad0':
  Also monitor MOVED_TO events for wallpaper updates
 2014-10-09 19:17:23 +00:00
Fred Fettinger
1114b3b8d7 am 708206c3: am 6c858c25: am b4093c12: (-s ours) hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE 
* commit '708206c35ed8da1e0c3f0624a9221ecb84d3504f':
  hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE
 2014-10-09 19:17:18 +00:00
mike dooley
6e24a156cd am 3175824a: am 879142bf: Fix hangouts conference calling regression. 
* commit '3175824a783c5d45df91ccf84fab8304f4d353c4':
  Fix hangouts conference calling regression.
 2014-10-09 19:17:14 +00:00
Tim Kilbourn
bb76d5cd88 am 5d7f58be: am 37bd0776: Merge "Don\'t start SearchDialog on television." into lmp-dev 
* commit '5d7f58be2c034823d6e5cfab847ad50b2a463dfc':
  Don't start SearchDialog on television.
 2014-10-09 19:17:10 +00:00
Jeff Brown
8aa2e3f168 am ab46eda8: am 704998ab: Merge "Ensure we correctly unblank displays when added." into lmp-dev 
* commit 'ab46eda872b4c9a4e16c57c00e5c85bb1f7143ce':
  Ensure we correctly unblank displays when added.
 2014-10-09 19:17:05 +00:00
smain@google.com
8aa0e54703 am 8433b63c: am b880707c: am 63cd4977: am 770c3c5e: fix unclickable link due to overlay from offset dev below 
* commit '8433b63c0248b4c2650ee3d8db77aaba4748ae47':
  fix unclickable link due to overlay from offset dev below
 2014-10-09 19:17:01 +00:00