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
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
RoboErik
fcfe6f5c7e am bd94aff2: Merge changes If4c38bfe,Id9878186 into lmp-mr1-dev automerge: b1d52e1 
* commit 'bd94aff236502f5b4fe19bd773a10d0fd1ccfe49':
  Update metadata artwork and uri docs
  skip MediaController callbacks if it's been unregistered
 2014-11-07 00:07:06 +00:00
Sailesh Nepal
11db847774 am fe319eab: Merge "Make APIs to get system phone accounts public" into lmp-mr1-dev automerge: 7d901cb 
* commit 'fe319eabbc3d21dfcf76a55525f0de508d3978c7':
  Make APIs to get system phone accounts public
 2014-11-07 00:07:00 +00:00
Jeremy Joslin
93f515f990 am 91fff05b: Merge "Implemented requestNetwork with a PendingIntent." into lmp-mr1-dev automerge: 1a2b99e 
* commit '91fff05ba93b6c78e1744159f97bc0448e22115c':
  Implemented requestNetwork with a PendingIntent.
 2014-11-07 00:06:54 +00:00
Amith Yamasani
f6c8169a68 am 26d8d1d5: Merge "Fix singleUser provider grants" into lmp-mr1-dev automerge: 775d104 
* commit '26d8d1d5cb6553686028948a63c5d3c507f0b40c':
  Fix singleUser provider grants
 2014-11-07 00:06:48 +00:00
Craig Mautner
22254f504f am 39f6be12: Merge "More fixes for keyguard animations." into lmp-mr1-dev automerge: 7b1b0f6 
* commit '39f6be121627303d9c485832c4b730867151d9f8':
  More fixes for keyguard animations.
 2014-11-07 00:06:42 +00:00
Vinod Krishnan
df7ba46332 am c6c5c7d6: am efec89f2: am 1d6d4272: Adding wallpaper animations 
* commit 'c6c5c7d6db61fac9eb3c4637a6d9573a18e43f67':
  Adding wallpaper animations
 2014-11-07 00:06:36 +00:00
Ricardo Cervera
61b73f345b 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 '5c3ba706348caec30039ae0b3cfcdc4e28422347':
  docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200
 2014-11-07 00:06:31 +00:00
Paul Lawrence
c7579101c9 am 202ab298: am b282cc30: am 3bde026a: am afb6b50e: Merge "DO NOT MERGE: Don\'t log passwords returned from vdc" into lmp-dev 
* commit '202ab2986c2ab61ea32845ea94af6e329c1fd83c':
  DO NOT MERGE: Don't log passwords returned from vdc
 2014-11-07 00:06:25 +00:00
Andres Morales
3e5d6aa04b am f33d9db4: am b1477d11: Merge "[DO NOT MERGE] Increase min free levels for cached processes on 64bit" into lmp-dev 
* commit 'f33d9db43a30299e2dfd3585c0964af953766a09':
  [DO NOT MERGE] Increase min free levels for cached processes on 64bit
 2014-11-07 00:06:25 +00:00
Ricardo Cervera
424518fff4 am 1e9f44f1: am f90d9c23: am 0a285d4a: am 9bc1b15a: am cc0753b0: docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200 
* commit '1e9f44f1322d8500cc91bfaf74d41e992ba184a7':
  docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200
 2014-11-07 00:06:20 +00:00
Dirk Dougherty
8345fb9731 am ac70173d: am 1d270087: am 61a76f2d: am f15017fc: am 326c70ef: Doc change: Add play dev guide page with index card and shareable download. 
* commit 'ac70173db22d8632466c46f338a334c7f83635ba':
  Doc change: Add play dev guide page with index card and shareable download.
 2014-11-07 00:06:15 +00:00
Dirk Dougherty
14f77b4ffb 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 '3c7e1f4a71e43dcaeadeb868dfbada198eed61d4':
  Doc change: Add play dev guide page with index card and shareable download.
 2014-11-07 00:06:09 +00:00
Joe Fernandez
36b61f6a26 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 '03d3a6e48a4a5048c68aa90edbb98581dd3c2f3a':
  docs: Add more information for getting started with TV app
 2014-11-07 00:06:00 +00:00
Justin Koh
402a360111 am 4ca342cd: am 2d42f484: am b8038d58: Merge "Hide Surface#lockHardwareCanvas DO NOT MERGE" into lmp-sprout-dev 
* commit '4ca342cdba6fb2637415cfeb6e579cc662763daf':
  Hide Surface#lockHardwareCanvas DO NOT MERGE
 2014-11-07 00:05:54 +00:00
Dirk Dougherty
b3c715675a 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 '768344f73da843f9cb2cf5dd5261412fde97c938':
  Doc change: update behavior changes and move to separate doc. Add nogotofail to SSL best practices.
 2014-11-07 00:05:47 +00:00
Jason Parks
220b65d21d am 94c3e3bf: Merge "Fix NPE for CTS." into lmp-sprout-dev 
* commit '94c3e3bfcfe8d91283560082c737cb62e8d06742':
  Fix NPE for CTS.
 2014-11-07 00:05:47 +00:00
Jeff Hao
c02d9a73e3 am 2a83226c: Merge "Change boot screen title to "Android is starting" when not upgrading." into lmp-sprout-dev 
* commit '2a83226c7585895d08d3320a4bb881f3659ad0d9':
  Change boot screen title to "Android is starting" when not upgrading.
 2014-11-07 00:05:43 +00:00
Rich Slogar
1d793503bd am d47ab00c: am 830790ba: am b0af6987: Merge "docs:Remove tools/index.jd file." into lmp-docs 
* commit 'd47ab00cc4f15287c8b48ed5805c4e9766facb58':
  docs:Remove tools/index.jd file.
 2014-11-07 00:05:38 +00:00
Luan Nguyen
816b93cf23 am 712c7ea3: Merge "cherrypick from klp-modular-docs docs: make fixes to Wear training material Change-Id: I27c2c754a027f7202a6388a60008ad3a594132c4" into lmp-docs 
* commit '712c7ea3d87be2afb7ecaf0d87ea9f9eb1a0007c':
  cherrypick from klp-modular-docs docs: make fixes to Wear training material Change-Id: I27c2c754a027f7202a6388a60008ad3a594132c4
 2014-11-07 00:05:20 +00:00
Joe Fernandez
d00ce6c537 am 1d295821: docs: fix for Brand inquiries form 
* commit '1d295821355c6a1ffcb01866e38664343570129e':
  docs: fix for Brand inquiries form
 2014-11-07 00:05:16 +00:00
ztenghui
0b70c09c1d am 7ae6fc81: Merge "A better looking and faster spot shadow." into lmp-mr1-dev 
* commit '7ae6fc81efd05a7561ee2de853184d2a3788b88d':
  A better looking and faster spot shadow.
 2014-11-07 00:04:34 +00:00
ztenghui
7ae6fc81ef Merge "A better looking and faster spot shadow." into lmp-mr1-dev 2014-11-06 23:59:17 +00:00
Andres Morales
f33d9db43a am b1477d11: Merge "[DO NOT MERGE] Increase min free levels for cached processes on 64bit" into lmp-dev 
* commit 'b1477d11ca873db761dd378a5fea93b26d695f78':
  [DO NOT MERGE] Increase min free levels for cached processes on 64bit
 2014-11-06 23:57:25 +00:00
Yohei Yukawa
42be51bd98 Merge "Minimize the number of default enabled IMEs part 4" into lmp-mr1-dev 
automerge: 50ef3d9

* commit '50ef3d93adf2614d8394664626b706ab0d7f7de7':
  Minimize the number of default enabled IMEs part 4
 2014-11-06 23:57:17 +00:00
Andres Morales
b1477d11ca Merge "[DO NOT MERGE] Increase min free levels for cached processes on 64bit" into lmp-dev 2014-11-06 23:51:00 +00:00
Yohei Yukawa
50ef3d93ad Merge "Minimize the number of default enabled IMEs part 4" into lmp-mr1-dev 2014-11-06 23:45:23 +00:00