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

167428 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Andre Eisenbach
44c11b9d2a am df11d588: Fix crash during Bluetooth on/off stress test 
* commit 'df11d588bb26ad0e8b8a6e8551393a0abeec2fef':
  Fix crash during Bluetooth on/off stress test
 2014-11-07 00:27:28 +00:00
Andres Morales
7c71141505 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 '98b073434d0c55788c3e27887675c795c46c8b9d':
  [DO NOT MERGE] Increase min free levels for cached processes on 64bit
 2014-11-07 00:24:59 +00:00
Jason Parks
e8d0fe98a6 am ae61ea93: am 220b65d2: am 94c3e3bf: Merge "Fix NPE for CTS." into lmp-sprout-dev 
* commit 'ae61ea936ab2323419383993b09f2943787c299a':
  Fix NPE for CTS.
 2014-11-07 00:24:53 +00:00
Jeff Hao
48db836d89 am 2140dc7e: am c02d9a73: am 2a83226c: Merge "Change boot screen title to "Android is starting" when not upgrading." into lmp-sprout-dev 
* commit '2140dc7e45fba88ff6606b9447a053f23b0f0786':
  Change boot screen title to "Android is starting" when not upgrading.
 2014-11-07 00:24:48 +00:00
Rich Slogar
085c480985 am 7ac41ce3: am 1d793503: am d47ab00c: am 830790ba: am b0af6987: Merge "docs:Remove tools/index.jd file." into lmp-docs 
* commit '7ac41ce38c671eee784f26fe9d10c537cde3962c':
  docs:Remove tools/index.jd file.
 2014-11-07 00:24:42 +00:00
Amit Mahajan
b0abe26dd9 am fc3f2380: Merge "Add configuration to control converting sms destination number" into lmp-mr1-dev 
* commit 'fc3f2380c97b0e2704b6350e031c96e0b01a3046':
  Add configuration to control converting sms destination number
 2014-11-07 00:24:27 +00:00
Luan Nguyen
f82634324d 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 'df8daa8c133100910a56a79298d75e7950503bf3':
  cherrypick from klp-modular-docs docs: make fixes to Wear training material Change-Id: I27c2c754a027f7202a6388a60008ad3a594132c4
 2014-11-07 00:24:22 +00:00
Joe Fernandez
5f7cf91fa4 am 0171ad2b: am 5851fb9b: am d00ce6c5: am 1d295821: docs: fix for Brand inquiries form 
* commit '0171ad2bffa6daca994d3087c0577ace229adc99':
  docs: fix for Brand inquiries form
 2014-11-07 00:24:17 +00:00
Andre Eisenbach
df11d588bb Fix crash during Bluetooth on/off stress test 
Bug: 18106938
Change-Id: Icdeb736d89d5926264f2043455ccbc3760fd5d29
(cherry picked from commit 178d3b54cd50558be789c5dfd8dad80ffdc65021)
 2014-11-07 00:19:45 +00:00
Amit Mahajan
fc3f2380c9 Merge "Add configuration to control converting sms destination number" into lmp-mr1-dev 2014-11-07 00:17:43 +00:00
ztenghui
86f289fb50 am 0b70c09c: am 7ae6fc81: Merge "A better looking and faster spot shadow." into lmp-mr1-dev 
* commit '0b70c09c1df3a5c359b8a93a8ac08e945805b693':
  A better looking and faster spot shadow.
 2014-11-07 00:17:09 +00:00
Luan Nguyen
df8daa8c13 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 'db21261339f37666a23b5d1e7f8997af4439c0c2':
  cherrypick from klp-modular-docs docs: make fixes to Wear training material Change-Id: I27c2c754a027f7202a6388a60008ad3a594132c4
 2014-11-07 00:17:02 +00:00
Joe Fernandez
0171ad2bff am 5851fb9b: am d00ce6c5: am 1d295821: docs: fix for Brand inquiries form 
* commit '5851fb9b820eac653ff9010d49d96cb3df927203':
  docs: fix for Brand inquiries form
 2014-11-07 00:16:58 +00:00
Andres Morales
98b073434d am 3e5d6aa0: am f33d9db4: am b1477d11: Merge "[DO NOT MERGE] Increase min free levels for cached processes on 64bit" into lmp-dev 
* commit '3e5d6aa04b3336984f28b3168ef95396848cc6de':
  [DO NOT MERGE] Increase min free levels for cached processes on 64bit
 2014-11-07 00:14:02 +00:00
Jason Parks
ae61ea936a am 220b65d2: am 94c3e3bf: Merge "Fix NPE for CTS." into lmp-sprout-dev 
* commit '220b65d21dcb332b9bb39e2c75a5adba5d7c73d9':
  Fix NPE for CTS.
 2014-11-07 00:13:57 +00:00
Jeff Hao
2140dc7e45 am c02d9a73: am 2a83226c: Merge "Change boot screen title to "Android is starting" when not upgrading." into lmp-sprout-dev 
* commit 'c02d9a73e389e27e603d667094dfa7d18a77fe98':
  Change boot screen title to "Android is starting" when not upgrading.
 2014-11-07 00:13:53 +00:00
Rich Slogar
7ac41ce38c am 1d793503: am d47ab00c: am 830790ba: am b0af6987: Merge "docs:Remove tools/index.jd file." into lmp-docs 
* commit '1d793503bd423f04123f6ad56c28a5c99835383c':
  docs:Remove tools/index.jd file.
 2014-11-07 00:13:48 +00:00
Luan Nguyen
db21261339 am 816b93cf: am 712c7ea3: Merge "cherrypick from klp-modular-docs docs: make fixes to Wear training material Change-Id: I27c2c754a027f7202a6388a60008ad3a594132c4" into lmp-docs 
* commit '816b93cf23c59a8a17e998ca706619b9eaa23793':
  cherrypick from klp-modular-docs docs: make fixes to Wear training material Change-Id: I27c2c754a027f7202a6388a60008ad3a594132c4
 2014-11-07 00:10:25 +00:00
Joe Fernandez
5851fb9b82 am d00ce6c5: am 1d295821: docs: fix for Brand inquiries form 
* commit 'd00ce6c537242d8bf6f01122f7faebfc07652e87':
  docs: fix for Brand inquiries form
 2014-11-07 00:10:21 +00:00
Yohei Yukawa
d1f629f36b am 42be51bd: Merge "Minimize the number of default enabled IMEs part 4" into lmp-mr1-dev automerge: 50ef3d9 
* commit '42be51bd98660b608596e6a8db63735ae552c996':
  Minimize the number of default enabled IMEs part 4
 2014-11-07 00:09:50 +00:00
destradaa
031550a31e am 9ed36c42: Merge "Add support for GPS measurement/navigation message capabilities. b/16727892 b/16815124" into lmp-mr1-dev automerge: 992b9aa 
* commit '9ed36c42d8c3731b8ca631292881110eb8897cec':
  Add support for GPS measurement/navigation message capabilities. b/16727892 b/16815124
 2014-11-07 00:07:30 +00:00
Craig Mautner
587cdde2e2 am bc1fdca0: Add logging for failure to finish. automerge: a11bb74 
* commit 'bc1fdca0bbc5a2295e15c0d5a84912cc325dd0ac':
  Add logging for failure to finish.
 2014-11-07 00:07:24 +00:00
Sreeram Ramachandran
64105c8f3a am 2663cdcb: Merge "Send broadcasts when VPNs come and go." into lmp-mr1-dev automerge: 0cb1bc4 
* commit '2663cdcb39cbb319c5d778b3bc0a6ebc6c6ea1b4':
  Send broadcasts when VPNs come and go.
 2014-11-07 00:07:19 +00:00
destradaa
91c962ad9c am a084d357: Merge "Fix reference leak in GPS measurement JNI layer. b/16727892 b/17075171" into lmp-mr1-dev automerge: c3e5599 
* commit 'a084d357d3fd0a5696998e786aeb10ff394f24d5':
  Fix reference leak in GPS measurement JNI layer. b/16727892 b/17075171
 2014-11-07 00:07:12 +00:00