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

172400 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
destradaa
9ed36c42d8 Merge "Add support for GPS measurement/navigation message capabilities. b/16727892 b/16815124" into lmp-mr1-dev 
automerge: 992b9aa

* commit '992b9aa37b0b7dba45505593cc4715d5be5aecbb':
  Add support for GPS measurement/navigation message capabilities. b/16727892 b/16815124
 2014-11-06 23:34:06 +00:00
destradaa
992b9aa37b Merge "Add support for GPS measurement/navigation message capabilities. b/16727892 b/16815124" into lmp-mr1-dev 2014-11-06 23:22:46 +00:00
Craig Mautner
bc1fdca0bb Add logging for failure to finish. 
automerge: a11bb74

* commit 'a11bb7427171418681428754051d5ee4dce851ee':
  Add logging for failure to finish.
 2014-11-06 22:24:52 +00:00
Sreeram Ramachandran
2663cdcb39 Merge "Send broadcasts when VPNs come and go." into lmp-mr1-dev 
automerge: 0cb1bc4

* commit '0cb1bc488c6578fde1503c53405715c564f0f7a0':
  Send broadcasts when VPNs come and go.
 2014-11-06 22:23:36 +00:00
destradaa
a084d357d3 Merge "Fix reference leak in GPS measurement JNI layer. b/16727892 b/17075171" into lmp-mr1-dev 
automerge: c3e5599

* commit 'c3e5599cdc09a770d12433a98e7da93ec24d959d':
  Fix reference leak in GPS measurement JNI layer. b/16727892 b/17075171
 2014-11-06 22:22:35 +00:00
Craig Mautner
a11bb74271 Add logging for failure to finish. 
Will help with bug 17648830.

Change-Id: Ib73c14cee332649a3e57a4779814a394f7d13173
 2014-11-06 14:01:18 -08:00
Sreeram Ramachandran
0cb1bc488c Merge "Send broadcasts when VPNs come and go." into lmp-mr1-dev 2014-11-06 21:57:21 +00:00
destradaa
c3e5599cdc Merge "Fix reference leak in GPS measurement JNI layer. b/16727892 b/17075171" into lmp-mr1-dev 2014-11-06 21:50:40 +00:00
RoboErik
bd94aff236 Merge changes If4c38bfe,Id9878186 into lmp-mr1-dev 
automerge: b1d52e1

* commit 'b1d52e1d2095d0df986d4c338af43c5cd2b6efc5':
  Update metadata artwork and uri docs
  skip MediaController callbacks if it's been unregistered
 2014-11-06 21:42:55 +00:00
Sailesh Nepal
fe319eabbc Merge "Make APIs to get system phone accounts public" into lmp-mr1-dev 
automerge: 7d901cb

* commit '7d901cb6f54f31b01b9951599ba6abdcff580e42':
  Make APIs to get system phone accounts public
 2014-11-06 21:41:44 +00:00