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

172788 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Quddus Chong
fedaef0d92 am 15127a69: am 871aff9c: Merge "docs: Removed statement that ART does not implement compacting garbage collection. bug: 18181075" into lmp-docs automerge: 0d7fa2f 
* commit '15127a69f6885f6fda2f60f9f2eafa2752d0f3e6':
  docs: Removed statement that ART does not implement compacting garbage collection. bug: 18181075
 2014-11-07 03:53:14 +00:00
Quddus Chong
15127a69f6 am 871aff9c: Merge "docs: Removed statement that ART does not implement compacting garbage collection. bug: 18181075" into lmp-docs 
automerge: 0d7fa2f

* commit '0d7fa2fdd95a1e76373bfa8be31d8c50e96c5715':
  docs: Removed statement that ART does not implement compacting garbage collection. bug: 18181075
 2014-11-07 03:45:33 +00:00
Quddus Chong
0d7fa2fdd9 am 871aff9c: Merge "docs: Removed statement that ART does not implement compacting garbage collection. bug: 18181075" into lmp-docs 
* commit '871aff9ca6654ee17e1cfb6d76b987dd3d552bba':
  docs: Removed statement that ART does not implement compacting garbage collection. bug: 18181075
 2014-11-07 02:52:28 +00:00
Jim Miller
73d4368119 am eae9dc3b: am c6f5009f: Merge "Fix build" into lmp-mr1-dev 
* commit 'eae9dc3b7fdf21c50de864d5ab13c71446c7b2da':
  Fix build
 2014-11-07 02:27:08 +00:00
Jim Miller
eae9dc3b7f am c6f5009f: Merge "Fix build" into lmp-mr1-dev 
* commit 'c6f5009fdb6aeafbee6db2b3e381f405ff23718b':
  Fix build
 2014-11-07 02:21:20 +00:00
Jim Miller
c6f5009fdb Merge "Fix build" into lmp-mr1-dev 2014-11-07 02:18:20 +00:00
Jungshik Jang
7fb8e7f4ff CEC: Send <Give System Audio Mode> regardless of TV's setting. 
When TV is brought back out of standby, it should send <Give System Audio Mode>
to audio receiver so that TV recovers system audio mode.
Current implementation sends <Give System Audio Mode> only when setting is "ON".
In order to fix this, this change sends <Give System Audio Mode>
regardless of TV's setting and update system audio mode according to
response of <Give System Audio Mode>.

Bug: 18267467
Change-Id: I2c3c05347c6f2a7a3a5e3772e4e26c77156eb740
 2014-11-07 11:11:58 +09:00
Jim Miller
a237a31484 Fix build 
Change-Id: I1c4054f0e613f19a39c4bc32cc90bdec3b21dca9
 2014-11-06 18:05:59 -08:00
Andrew Lee
a56fa73c30 am 8f34e65a: am a70688f2: Merge "Replace onConferenceChanged with onConnectionAdded." into lmp-mr1-dev 
* commit '8f34e65afc020df064d0703633cb1f875bfc4fe8':
  Replace onConferenceChanged with onConnectionAdded.
 2014-11-07 02:04:30 +00:00
Andrew Lee
8f34e65afc am a70688f2: Merge "Replace onConferenceChanged with onConnectionAdded." into lmp-mr1-dev 
* commit 'a70688f2a5d2e90b3806709e32cb8de2057f5e39':
  Replace onConferenceChanged with onConnectionAdded.
 2014-11-07 01:58:35 +00:00
Andrew Lee
a70688f2a5 Merge "Replace onConferenceChanged with onConnectionAdded." into lmp-mr1-dev 2014-11-07 01:54:01 +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
Andrew Lee
46f7f5dce4 Replace onConferenceChanged with onConnectionAdded. 
This change is motivated by a desire to be able to adjust the
phone capabilities of a conference depending on its connections.

Turns out Connection is not a good place to do this, because when
the conference is set, this code is only fired if the connection
service already contains the conference. Conference makes more
sense to do this anyways, at the end of the day.

+ Add onConnectionAdded function to Conference.java.
- Remove onConferenceChanged function from Connection.java.

Bug: 18241753
Change-Id: Ib9212a8483a7a7b542618697399bbab8b2701b04
 2014-11-06 17:19:51 -08: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
Quddus Chong
871aff9ca6 Merge "docs: Removed statement that ART does not implement compacting garbage collection. bug: 18181075" into lmp-docs 2014-11-07 01:11:33 +00:00
Winson Chung
2763095c13 Increasing the min swipe thresholds for the nav bar gestures. (Bug 17109581) 
Change-Id: I1bcf6f91f616890f0e815db33267c5230ae9c76f
(cherry picked from commit 559e6d34b4e76ee21dc6e300681c399ed735a964)
 2014-11-07 01:10:03 +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
Jorim Jaggi
ae52c56448 Adjust owner info to spec 
Bug: 18249205
Change-Id: I71916b977d7567d4bc998b86f0d7748ae73a5de0
 2014-11-07 01:50:50 +01: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