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

172476 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Winson Chung
c5f9ec3e27 am 675a0b6b: am 513aa792: am 3ed9f2f9: Merge "Adding bounce animation for affiliated tasks. (Bug 16656169)" into lmp-mr1-dev 
* commit '675a0b6bc9ee2f2e80f28381c0f34d98e0447ad6':
  Adding bounce animation for affiliated tasks. (Bug 16656169)
 2014-11-07 04:17:02 +00:00
Winson Chung
f3fefc6195 am d42e7b57: am c0542a96: am 7bd54c11: Merge "Fixing Recents crash when resetting focus of TaskView already returned to the pool." into lmp-mr1-dev 
* commit 'd42e7b57de7bb3323aa6c0d680378da000664a07':
  Fixing Recents crash when resetting focus of TaskView already returned to the pool.
 2014-11-07 04:16:57 +00:00
Anthony Lee
d997d01276 am 55b1eb84: am 0b948550: am 30e65842: Change access to removeConnection so we can override it. 
* commit '55b1eb84d03eb8f7dbf47f46d4e0228175d4578d':
  Change access to removeConnection so we can override it.
 2014-11-07 04:16:33 +00:00
Brian Carlstrom
900b2d913c am bb7388a8: am 14531903: am f4d2c8ee: Merge "Restore mLazyDexOpt behavior for eng builds" into lmp-mr1-dev 
* commit 'bb7388a86e8e9782cf8caf4d176cd2b8d16d752b':
  Restore mLazyDexOpt behavior for eng builds
 2014-11-07 04:15:39 +00:00
Andre Eisenbach
adc258e061 am b1b6ca5a: am b6523d83: am 44c11b9d: am df11d588: Fix crash during Bluetooth on/off stress test 
* commit 'b1b6ca5a022665b745e6ea1399b9ecc542776e9c':
  Fix crash during Bluetooth on/off stress test
 2014-11-07 04:15:34 +00:00
Amit Mahajan
714098025a am b34892e1: am b0abe26d: am fc3f2380: Merge "Add configuration to control converting sms destination number" into lmp-mr1-dev 
* commit 'b34892e1a07a6e3537fbd1f384ef9240a85aabd7':
  Add configuration to control converting sms destination number
 2014-11-07 04:15:21 +00:00
Luan Nguyen
38ba9213a5 am b97dbd2e: am f8263432: am df8daa8c: am db212613: am 816b93cf: am 712c7ea3: Merge "cherrypick from klp-modular-docs docs: make fixes to Wear training material Change-Id: I27c2c754a027f7202a6388a60008ad3a594132c4" into lmp-docs 
* commit 'b97dbd2e3af132a9f5722519c091c9594fee40d8':
  cherrypick from klp-modular-docs docs: make fixes to Wear training material Change-Id: I27c2c754a027f7202a6388a60008ad3a594132c4
 2014-11-07 04:15:15 +00:00
Joe Fernandez
f54ce6b046 am 03bfc4d3: am 5f7cf91f: am 0171ad2b: am 5851fb9b: am d00ce6c5: am 1d295821: docs: fix for Brand inquiries form 
* commit '03bfc4d3ff09019bb6b7a43afd9226d0ecf10e98':
  docs: fix for Brand inquiries form
 2014-11-07 04:15:10 +00:00
Andres Morales
c4e222c84b am 7c711415: (-s ours) am 98b07343: am 3e5d6aa0: am f33d9db4: am b1477d11: Merge "[DO NOT MERGE] Increase min free levels for cached processes on 64bit" into lmp-dev 
* commit '7c711415059c975d87b7fc4cff362b2bd48fd5bf':
  [DO NOT MERGE] Increase min free levels for cached processes on 64bit
 2014-11-07 04:12:11 +00:00
Jason Parks
05e095ae08 am e8d0fe98: am ae61ea93: am 220b65d2: am 94c3e3bf: Merge "Fix NPE for CTS." into lmp-sprout-dev 
* commit 'e8d0fe98a6d39c545467f679f0000b500ec7d341':
  Fix NPE for CTS.
 2014-11-07 04:12:06 +00:00
Jeff Hao
6ab96b39d0 am 48db836d: am 2140dc7e: am c02d9a73: am 2a83226c: Merge "Change boot screen title to "Android is starting" when not upgrading." into lmp-sprout-dev 
* commit '48db836d8972cf810d63f92fb5605b82abe1cb2a':
  Change boot screen title to "Android is starting" when not upgrading.
 2014-11-07 04:12:02 +00:00
Rich Slogar
3fe7241374 am 085c4809: am 7ac41ce3: am 1d793503: am d47ab00c: am 830790ba: am b0af6987: Merge "docs:Remove tools/index.jd file." into lmp-docs 
* commit '085c48098568f1c9619ea882432c6a09d2239b5f':
  docs:Remove tools/index.jd file.
 2014-11-07 04:11:57 +00:00
ztenghui
94745ccb33 am 86f289fb: am 0b70c09c: am 7ae6fc81: Merge "A better looking and faster spot shadow." into lmp-mr1-dev 
* commit '86f289fb505a8fef9e5aae822631a738540c31df':
  A better looking and faster spot shadow.
 2014-11-07 04:09:18 +00:00
Yohei Yukawa
2297d22659 am d1f629f3: am 42be51bd: Merge "Minimize the number of default enabled IMEs part 4" into lmp-mr1-dev automerge: 50ef3d9 
* commit 'd1f629f36ba35d86e37732a145aad771f9e6b23c':
  Minimize the number of default enabled IMEs part 4
 2014-11-07 03:56:14 +00:00
destradaa
22db164727 am 031550a3: am 9ed36c42: Merge "Add support for GPS measurement/navigation message capabilities. b/16727892 b/16815124" into lmp-mr1-dev automerge: 992b9aa 
* commit '031550a31e56bb8300ba9d1225004581ec156777':
  Add support for GPS measurement/navigation message capabilities. b/16727892 b/16815124
 2014-11-07 03:56:10 +00:00
Craig Mautner
f2859b514f am 587cdde2: am bc1fdca0: Add logging for failure to finish. automerge: a11bb74 
* commit '587cdde2e2bf7e833e433c1edd6e8078832e327c':
  Add logging for failure to finish.
 2014-11-07 03:56:05 +00:00
Sreeram Ramachandran
88d4f29654 am 64105c8f: am 2663cdcb: Merge "Send broadcasts when VPNs come and go." into lmp-mr1-dev automerge: 0cb1bc4 
* commit '64105c8f3a075bbdb1b552ed5b9942961b8499ad':
  Send broadcasts when VPNs come and go.
 2014-11-07 03:56:00 +00:00
destradaa
6550fa7452 am 91c962ad: am a084d357: Merge "Fix reference leak in GPS measurement JNI layer. b/16727892 b/17075171" into lmp-mr1-dev automerge: c3e5599 
* commit '91c962ad9c90e79b8dbbf7aaaaf2d827adf7cc16':
  Fix reference leak in GPS measurement JNI layer. b/16727892 b/17075171
 2014-11-07 03:55:54 +00:00
RoboErik
c4a4636cc2 am fcfe6f5c: am bd94aff2: Merge changes If4c38bfe,Id9878186 into lmp-mr1-dev automerge: b1d52e1 
* commit 'fcfe6f5c7e12548d20c31bcad4db5089d23b78d8':
  Update metadata artwork and uri docs
  skip MediaController callbacks if it's been unregistered
 2014-11-07 03:55:49 +00:00
Sailesh Nepal
3e9b648664 am 11db8477: am fe319eab: Merge "Make APIs to get system phone accounts public" into lmp-mr1-dev automerge: 7d901cb 
* commit '11db847774b3049ad889c96bdd49b8cf7ccd167e':
  Make APIs to get system phone accounts public
 2014-11-07 03:55:44 +00:00
Jeremy Joslin
e4fb9419d8 am 93f515f9: am 91fff05b: Merge "Implemented requestNetwork with a PendingIntent." into lmp-mr1-dev automerge: 1a2b99e 
* commit '93f515f99030f3c8d54005cc0cf600ca06e215b1':
  Implemented requestNetwork with a PendingIntent.
 2014-11-07 03:55:38 +00:00
Amith Yamasani
c179e4adc8 am f6c8169a: am 26d8d1d5: Merge "Fix singleUser provider grants" into lmp-mr1-dev automerge: 775d104 
* commit 'f6c8169a684183d5149fc7d41b92adbb1700dab5':
  Fix singleUser provider grants
 2014-11-07 03:55:33 +00:00
Craig Mautner
0fecad76d1 am 22254f50: am 39f6be12: Merge "More fixes for keyguard animations." into lmp-mr1-dev automerge: 7b1b0f6 
* commit '22254f504f10a0190792060de2820ccf7323a84f':
  More fixes for keyguard animations.
 2014-11-07 03:55:29 +00:00
Vinod Krishnan
357fa24b03 am df7ba463: am c6c5c7d6: am efec89f2: am 1d6d4272: Adding wallpaper animations 
* commit 'df7ba4633207be082bbdb2d823a6a85dd1484eec':
  Adding wallpaper animations
 2014-11-07 03:55:24 +00:00
Ricardo Cervera
f37abd66d5 am 61b73f34: am 5c3ba706: am a2c2014d: am 126eda32: am b4a19198: am 58dc8c42: am e7cd5f2e: Merge "docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200" into klp-modular-docs 
* commit '61b73f345bcce43493f318ae7b83b6bc4ad167b9':
  docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200
 2014-11-07 03:55:20 +00:00
Paul Lawrence
e1b98a0097 am c7579101: (-s ours) am 202ab298: am b282cc30: am 3bde026a: am afb6b50e: Merge "DO NOT MERGE: Don\'t log passwords returned from vdc" into lmp-dev 
* commit 'c7579101c94cbb547dd19c8550f3767f2ad35944':
  DO NOT MERGE: Don't log passwords returned from vdc
 2014-11-07 03:55:16 +00:00
Ricardo Cervera
39d672ada5 am 424518ff: am 1e9f44f1: am f90d9c23: am 0a285d4a: am 9bc1b15a: am cc0753b0: docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200 
* commit '424518fff4397af27077dbc24b740cab3a05f748':
  docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200
 2014-11-07 03:55:11 +00:00
Dirk Dougherty
c7c4e34b5d am 8345fb97: am ac70173d: am 1d270087: am 61a76f2d: am f15017fc: am 326c70ef: Doc change: Add play dev guide page with index card and shareable download. 
* commit '8345fb9731bf842e1044d7c6fd4d4c19f4284ca4':
  Doc change: Add play dev guide page with index card and shareable download.
 2014-11-07 03:55:07 +00:00
Dirk Dougherty
ff8e05fe19 am 14f77b4f: am 3c7e1f4a: am 0b315994: am 2acfc3b9: am d7476cf4: Merge "Doc change: Add play dev guide page with index card and shareable download." into lmp-dev 
* commit '14f77b4ffb87f060a53859104ee83c365c0bd550':
  Doc change: Add play dev guide page with index card and shareable download.
 2014-11-07 03:55:02 +00:00
Joe Fernandez
7dc3e9dbd7 am 36b61f6a: am 03d3a6e4: am 0c03031b: am 93f89657: am ab6e9048: am 2490ec83: Merge "docs: Add more information for getting started with TV app" into lmp-docs 
* commit '36b61f6a26f5962c2d0b79d1331b057f6f598b8e':
  docs: Add more information for getting started with TV app
 2014-11-07 03:54:57 +00:00
Justin Koh
96c93f3f38 am 402a3601: (-s ours) am 4ca342cd: am 2d42f484: am b8038d58: Merge "Hide Surface#lockHardwareCanvas DO NOT MERGE" into lmp-sprout-dev 
* commit '402a360111c4be079cd86b389aba64859e938f8c':
  Hide Surface#lockHardwareCanvas DO NOT MERGE
 2014-11-07 03:54:53 +00:00
Dirk Dougherty
0e16428287 am b3c71567: am 768344f7: am 012849f4: am c6f2ec20: am b2fe15f9: am 66296451: Merge "Doc change: update behavior changes and move to separate doc. Add nogotofail to SSL best practices." into lmp-docs 
* commit 'b3c715675aefcb2a9be7204754a65db74d72e9be':
  Doc change: update behavior changes and move to separate doc. Add nogotofail to SSL best practices.
 2014-11-07 03:54:45 +00:00
Winson Chung
675a0b6bc9 am 513aa792: am 3ed9f2f9: Merge "Adding bounce animation for affiliated tasks. (Bug 16656169)" into lmp-mr1-dev 
* commit '513aa79290dd17400c4cce82d1d801c05ff3776f':
  Adding bounce animation for affiliated tasks. (Bug 16656169)
 2014-11-07 01:45:11 +00:00
Winson Chung
d42e7b57de am c0542a96: am 7bd54c11: Merge "Fixing Recents crash when resetting focus of TaskView already returned to the pool." into lmp-mr1-dev 
* commit 'c0542a96db6e2c59c00d9bfa030383eb82c1f41a':
  Fixing Recents crash when resetting focus of TaskView already returned to the pool.
 2014-11-07 01:45:06 +00:00
Anthony Lee
55b1eb84d0 am 0b948550: am 30e65842: Change access to removeConnection so we can override it. 
* commit '0b9485502faa5837d3007992d3128a8d43a6247b':
  Change access to removeConnection so we can override it.
 2014-11-07 01:36:50 +00:00
Winson Chung
513aa79290 am 3ed9f2f9: Merge "Adding bounce animation for affiliated tasks. (Bug 16656169)" into lmp-mr1-dev 
* commit '3ed9f2f903a8e6c38ca9f2ce3819ac063281a020':
  Adding bounce animation for affiliated tasks. (Bug 16656169)
 2014-11-07 01:33:28 +00:00
Winson Chung
c0542a96db am 7bd54c11: Merge "Fixing Recents crash when resetting focus of TaskView already returned to the pool." into lmp-mr1-dev 
* commit '7bd54c11223669e4b00a0d6cace0025f8116da5e':
  Fixing Recents crash when resetting focus of TaskView already returned to the pool.
 2014-11-07 01:33:23 +00:00
Winson Chung
3ed9f2f903 Merge "Adding bounce animation for affiliated tasks. (Bug 16656169)" into lmp-mr1-dev 2014-11-07 01:30:20 +00:00
Winson Chung
7bd54c1122 Merge "Fixing Recents crash when resetting focus of TaskView already returned to the pool." into lmp-mr1-dev 2014-11-07 01:28:08 +00:00
Anthony Lee
0b9485502f am 30e65842: Change access to removeConnection so we can override it. 
* commit '30e65842493adc71aff649f32a45b6a38e83dc2e':
  Change access to removeConnection so we can override it.
 2014-11-07 01:17:29 +00:00
Winson Chung
7ae4b7e196 Fixing Recents crash when resetting focus of TaskView already returned to the pool. 
Change-Id: Iee789e4e726d5f035ec518f4fec444afecc2bbf2
 2014-11-06 17:07:52 -08:00
Anthony Lee
30e6584249 Change access to removeConnection so we can override it. 
Bug: 18056632
Bug: 18240234
Change-Id: I4e82051a27f3565e9a854df8b27c35300cdbe2ad
 2014-11-06 16:47:20 -08:00
Brian Carlstrom
bb7388a86e am 14531903: am f4d2c8ee: Merge "Restore mLazyDexOpt behavior for eng builds" into lmp-mr1-dev 
* commit '1453190388e789e27c775ebb8e96267e3c3c6eca':
  Restore mLazyDexOpt behavior for eng builds
 2014-11-07 00:46:16 +00:00
Brian Carlstrom
1453190388 am f4d2c8ee: Merge "Restore mLazyDexOpt behavior for eng builds" into lmp-mr1-dev 
* commit 'f4d2c8eebd8113482b48e0b8f83deb4b2f1f9b22':
  Restore mLazyDexOpt behavior for eng builds
 2014-11-07 00:41:46 +00:00
Andre Eisenbach
b1b6ca5a02 am b6523d83: am 44c11b9d: am df11d588: Fix crash during Bluetooth on/off stress test 
* commit 'b6523d83d448f372290ff42e56a1498c753b0b40':
  Fix crash during Bluetooth on/off stress test
 2014-11-07 00:40:46 +00:00
Brian Carlstrom
f4d2c8eebd Merge "Restore mLazyDexOpt behavior for eng builds" into lmp-mr1-dev 2014-11-07 00:39:09 +00:00
Andre Eisenbach
b6523d83d4 am 44c11b9d: am df11d588: Fix crash during Bluetooth on/off stress test 
* commit '44c11b9d2a17a8364e53ee437884c5349ec88341':
  Fix crash during Bluetooth on/off stress test
 2014-11-07 00:33:41 +00:00
Amit Mahajan
b34892e1a0 am b0abe26d: am fc3f2380: Merge "Add configuration to control converting sms destination number" into lmp-mr1-dev 
* commit 'b0abe26dd98e005f25afeacc55723bd8e508b703':
  Add configuration to control converting sms destination number
 2014-11-07 00:31:22 +00:00
Luan Nguyen
b97dbd2e3a am f8263432: am df8daa8c: am db212613: am 816b93cf: am 712c7ea3: Merge "cherrypick from klp-modular-docs docs: make fixes to Wear training material Change-Id: I27c2c754a027f7202a6388a60008ad3a594132c4" into lmp-docs 
* commit 'f82634324d5d85dc46a3c514f2114b7010c7bce5':
  cherrypick from klp-modular-docs docs: make fixes to Wear training material Change-Id: I27c2c754a027f7202a6388a60008ad3a594132c4
 2014-11-07 00:31:15 +00:00
Joe Fernandez
03bfc4d3ff am 5f7cf91f: am 0171ad2b: am 5851fb9b: am d00ce6c5: am 1d295821: docs: fix for Brand inquiries form 
* commit '5f7cf91fa44b0136296e730d69beea16a4ec75a4':
  docs: fix for Brand inquiries form
 2014-11-07 00:31:10 +00:00