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

180421 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jinsuk Kim
4d37a3584c am bbfec56d: Merge "CEC: Make TV try to allocate logical address 0 first" into lmp-mr1-dev 
* commit 'bbfec56dfcb1fdcb0307b3df83e2ad855c0b0b88':
  CEC: Make TV try to allocate logical address 0 first
 2015-01-19 02:25:44 +00:00
Jinsuk Kim
5b8cb00b8a CEC: Process new options for CEC/MHL HAL 
1) Inform MHL HAL of OPTION_MHL_SERVICE_CONTROL at system
ready/standby event.

2) Call OPTION_CEC_SET_LANGUAGE with current system language info
for HAL to be able to respond to <Get Menu Language> while in standby
mode.

Bug: 19054079
Change-Id: I92c9f392a94f70e11157d20a33163ef2d8bc832f
 2015-01-19 02:22:05 +00:00
Jinsuk Kim
bbfec56dfc Merge "CEC: Make TV try to allocate logical address 0 first" into lmp-mr1-dev 2015-01-19 02:20:18 +00:00
Jinsuk Kim
d47abefc82 CEC: Make TV try to allocate logical address 0 first 
HDMI Spec says TV shall try to allocate TV() logical address, unlike
other kinds of devices that are recommended to use the previously
allocated one.

Also included are small changes:

- reply with 'can not provide source' if TV has no source to provide
- return the present device info if we have one at the given path

Bug: 19045081
Change-Id: Icf17cb581f0ef2274e252ec5665f80bb1c08b494
 2015-01-19 10:44:38 +09:00
Sanket Padawe
c0fa70ee19 am 60b41e6a: am 543348eb: am d2dd69ae: Merge "Modify getDeviceId() to get device id independent of Subscription." into lmp-mr1-dev 
* commit '60b41e6aa7a93bf90cb1b7715a2429dbe7c975fe':
  Modify getDeviceId() to get device id independent of Subscription.
 2015-01-17 22:37:03 +00:00
Sanket Padawe
60b41e6aa7 am 543348eb: am d2dd69ae: Merge "Modify getDeviceId() to get device id independent of Subscription." into lmp-mr1-dev 
* commit '543348eb94624907102c1baffe5bdaf1087fede8':
  Modify getDeviceId() to get device id independent of Subscription.
 2015-01-17 22:30:25 +00:00
Sanket Padawe
543348eb94 am d2dd69ae: Merge "Modify getDeviceId() to get device id independent of Subscription." into lmp-mr1-dev 
* commit 'd2dd69ae8d81defc5f2286690b3dd246d4118fcc':
  Modify getDeviceId() to get device id independent of Subscription.
 2015-01-17 22:20:19 +00:00
Sanket Padawe
d2dd69ae8d Merge "Modify getDeviceId() to get device id independent of Subscription." into lmp-mr1-dev 2015-01-17 22:15:56 +00:00
Scott Rowe
bd74a7022c am cee634df: am 11ce4b75: am c68ab86a: am ae15e779: am 224624e8: am c987ca05: Merge "docs: removing code captions" into lmp-docs 
* commit 'cee634df2c8fe3a10a3aef754b3e168c646d47f3':
  docs: removing code captions
 2015-01-17 05:38:02 +00:00
Scott Rowe
9d6f65e0a8 am ec015c50: am e019bbb1: am 278f5e2a: am 49caa638: am 78001f93: am ab18d6c8: Merge "docs: Add screenshot" into lmp-docs 
* commit 'ec015c504fe2cb4c3171e0f405d1b3df0567b5f4':
  docs: Add screenshot
 2015-01-17 05:37:55 +00:00
Scott Rowe
cee634df2c am 11ce4b75: am c68ab86a: am ae15e779: am 224624e8: am c987ca05: Merge "docs: removing code captions" into lmp-docs 
* commit '11ce4b759497546f4182b00cc6b92cfe42acf32e':
  docs: removing code captions
 2015-01-17 05:31:43 +00:00
Scott Rowe
ec015c504f am e019bbb1: am 278f5e2a: am 49caa638: am 78001f93: am ab18d6c8: Merge "docs: Add screenshot" into lmp-docs 
* commit 'e019bbb1619700c952181fe9717060aaef7bce12':
  docs: Add screenshot
 2015-01-17 05:31:36 +00:00
Scott Rowe
11ce4b7594 am c68ab86a: am ae15e779: am 224624e8: am c987ca05: Merge "docs: removing code captions" into lmp-docs 
* commit 'c68ab86a8cef8b8ca4588e7eb482c5acf9821aa9':
  docs: removing code captions
 2015-01-17 05:25:25 +00:00
Scott Rowe
e019bbb161 am 278f5e2a: am 49caa638: am 78001f93: am ab18d6c8: Merge "docs: Add screenshot" into lmp-docs 
* commit '278f5e2a63961f468457ab00ceeaec84aff7bc61':
  docs: Add screenshot
 2015-01-17 05:25:20 +00:00
Scott Rowe
c68ab86a8c am ae15e779: am 224624e8: am c987ca05: Merge "docs: removing code captions" into lmp-docs 
* commit 'ae15e779c0a0a9005292efb0f39729454429fa7f':
  docs: removing code captions
 2015-01-17 05:20:28 +00:00
Scott Rowe
278f5e2a63 am 49caa638: am 78001f93: am ab18d6c8: Merge "docs: Add screenshot" into lmp-docs 
* commit '49caa6386c1423ad9ced3e3ad983dd233a76e2e4':
  docs: Add screenshot
 2015-01-17 05:20:23 +00:00
Scott Rowe
ae15e779c0 am 224624e8: am c987ca05: Merge "docs: removing code captions" into lmp-docs 
* commit '224624e8e68bd1debd0f76d1b614ae3bdc637cb2':
  docs: removing code captions
 2015-01-17 03:06:38 +00:00
Scott Rowe
49caa6386c am 78001f93: am ab18d6c8: Merge "docs: Add screenshot" into lmp-docs 
* commit '78001f9338b72876e95b7d25053b706804a21070':
  docs: Add screenshot
 2015-01-17 03:06:35 +00:00
Scott Rowe
224624e8e6 am c987ca05: Merge "docs: removing code captions" into lmp-docs 
* commit 'c987ca05010a8cc06572d5b04c93fb6404f8bf45':
  docs: removing code captions
 2015-01-17 02:28:51 +00:00
Scott Rowe
78001f9338 am ab18d6c8: Merge "docs: Add screenshot" into lmp-docs 
* commit 'ab18d6c82eb92732ef7ab54adffcd27faffd0c57':
  docs: Add screenshot
 2015-01-17 02:28:47 +00:00
Scott Rowe
c987ca0501 Merge "docs: removing code captions" into lmp-docs 2015-01-17 01:31:53 +00:00
Scott Rowe
ab18d6c82e Merge "docs: Add screenshot" into lmp-docs 2015-01-17 01:31:15 +00:00
David Friedman
8d53179c9c am 1cca3f6e: am 912a9394: am 91678a69: am ae71c8ea: am e255cb0f: am fa66fdd5: Merge "Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw" into lmp-docs 
* commit '1cca3f6e3939f59d1e17f35ca50339fa46d24c27':
  Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw
 2015-01-17 01:09:05 +00:00
David Friedman
1cca3f6e39 am 912a9394: am 91678a69: am ae71c8ea: am e255cb0f: am fa66fdd5: Merge "Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw" into lmp-docs 
* commit '912a9394398db1b47f0294ffdebc4d78600573fd':
  Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw
 2015-01-17 00:59:45 +00:00
David Friedman
912a939439 am 91678a69: am ae71c8ea: am e255cb0f: am fa66fdd5: Merge "Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw" into lmp-docs 
* commit '91678a69b26f218dd580704cd4f79c295c8c5951':
  Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw
 2015-01-17 00:51:42 +00:00
David Friedman
91678a69b2 am ae71c8ea: am e255cb0f: am fa66fdd5: Merge "Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw" into lmp-docs 
* commit 'ae71c8ea52af7e4205ae838e73837d145f416e1a':
  Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw
 2015-01-17 00:43:30 +00:00
David Friedman
ae71c8ea52 am e255cb0f: am fa66fdd5: Merge "Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw" into lmp-docs 
* commit 'e255cb0f9e0ecd5f0aa2c963f1a6d4c7029c85af':
  Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw
 2015-01-17 00:36:27 +00:00
Mike Lockwood
3d0fb88138 Merge "Replace broadcasts with calls to IAudioService.setWiredDeviceConnectionState() to report USB device status" 2015-01-17 00:33:42 +00:00
David Friedman
e255cb0f9e am fa66fdd5: Merge "Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw" into lmp-docs 
* commit 'fa66fdd57a494bed0a92d9fb0aadf332395f371f':
  Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw
 2015-01-17 00:30:18 +00:00
David Friedman
fa66fdd57a Merge "Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw" into lmp-docs 2015-01-17 00:23:30 +00:00
David Friedman
d28a49fb73 Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw 
Change-Id: I6555b9894a9ae4dc9365f21b40a75627fb7ed63f
 2015-01-16 15:42:26 -08:00
Alan Viverette
2ef9d1af45 Merge "Ensure spinner variables are initialized correctly" 2015-01-16 23:31:53 +00:00
RoboErik
864c4f42f8 am b2949e1b: am 694940be: am d5ff63ba: Merge "Notify the system of all remote volume changes" into lmp-mr1-dev 
* commit 'b2949e1b957e8b74980a2c3124e834d13f53f29d':
  Notify the system of all remote volume changes
 2015-01-16 23:14:20 +00:00
RoboErik
b2949e1b95 am 694940be: am d5ff63ba: Merge "Notify the system of all remote volume changes" into lmp-mr1-dev 
* commit '694940be699165aedc05d5f1ae9381cd61a368a7':
  Notify the system of all remote volume changes
 2015-01-16 23:08:32 +00:00
RoboErik
694940be69 am d5ff63ba: Merge "Notify the system of all remote volume changes" into lmp-mr1-dev 
* commit 'd5ff63ba0ce8597155e0201fd20fe18fbf0aa053':
  Notify the system of all remote volume changes
 2015-01-16 23:04:10 +00:00
RoboErik
d5ff63ba0c Merge "Notify the system of all remote volume changes" into lmp-mr1-dev 2015-01-16 22:56:54 +00:00
Quddus Chong
7a11b88bcd am 6e2661f0: am 20eb8093: am 2f63207d: am a6491229: am 930ac01f: am de0a8700: Merge "docs: Fixed typos in Game Controller training code snippets. bug: 17959906" into lmp-docs 
* commit '6e2661f086327c7ebbbda03f3387b673f0bf87df':
  docs: Fixed typos in Game Controller training code snippets. bug: 17959906
 2015-01-16 22:56:45 +00:00
Quddus Chong
6e2661f086 am 20eb8093: am 2f63207d: am a6491229: am 930ac01f: am de0a8700: Merge "docs: Fixed typos in Game Controller training code snippets. bug: 17959906" into lmp-docs 
* commit '20eb8093b634704ac29fda85e9c1c916a31bde29':
  docs: Fixed typos in Game Controller training code snippets. bug: 17959906
 2015-01-16 22:50:17 +00:00
Joe Fernandez
090c5e01be am 6a8c2b03: am ff96449f: am 35aecbe9: am cd500663: am 90d2aca7: am 217d145d: Merge "docs: adding studio-sample-in-editor.png file" into lmp-docs 
* commit '6a8c2b038c1d16856c642f80bf315828d1b96ad1':
  docs: adding studio-sample-in-editor.png file
 2015-01-16 22:47:10 +00:00
Ricardo Cervera
ffff333c19 am eeb4cf8f: am 3fee7dc7: am 7a2e85c8: am 9273b33f: am 73f36d47: am e229751d: docs: Add browseable Wearable Support Lib Javadoc 
* commit 'eeb4cf8f43797f99543db1e404066d5291da6237':
  docs: Add browseable Wearable Support Lib Javadoc
 2015-01-16 22:47:05 +00:00
Quddus Chong
20eb8093b6 am 2f63207d: am a6491229: am 930ac01f: am de0a8700: Merge "docs: Fixed typos in Game Controller training code snippets. bug: 17959906" into lmp-docs 
* commit '2f63207d873fcd2c39488f78b5cb1b67f868f232':
  docs: Fixed typos in Game Controller training code snippets. bug: 17959906
 2015-01-16 22:44:07 +00:00
Joe Fernandez
6a8c2b038c am ff96449f: am 35aecbe9: am cd500663: am 90d2aca7: am 217d145d: Merge "docs: adding studio-sample-in-editor.png file" into lmp-docs 
* commit 'ff96449f1d3092182d61d5e553042742d5bf71c8':
  docs: adding studio-sample-in-editor.png file
 2015-01-16 22:41:01 +00:00
Ricardo Cervera
eeb4cf8f43 am 3fee7dc7: am 7a2e85c8: am 9273b33f: am 73f36d47: am e229751d: docs: Add browseable Wearable Support Lib Javadoc 
* commit '3fee7dc78af70ac9ca383f40e511ffaa378894b1':
  docs: Add browseable Wearable Support Lib Javadoc
 2015-01-16 22:40:55 +00:00
Alan Viverette
3f221cf325 Ensure spinner variables are initialized correctly 
Removes the popup context setter, since this property cannot change
after inflation without losing data from the AttributeSet.

Bug: 19046761
Change-Id: I622f50d1752446a5b5793706c388e67a46ad06da
 2015-01-16 14:40:04 -08:00
Quddus Chong
2f63207d87 am a6491229: am 930ac01f: am de0a8700: Merge "docs: Fixed typos in Game Controller training code snippets. bug: 17959906" into lmp-docs 
* commit 'a649122977a6f1c267329b9b67a692cabd839e98':
  docs: Fixed typos in Game Controller training code snippets. bug: 17959906
 2015-01-16 22:35:03 +00:00
Joe Fernandez
ff96449f1d am 35aecbe9: am cd500663: am 90d2aca7: am 217d145d: Merge "docs: adding studio-sample-in-editor.png file" into lmp-docs 
* commit '35aecbe92761c7608ce3942f5743bae8254fdaf6':
  docs: adding studio-sample-in-editor.png file
 2015-01-16 22:34:46 +00:00
Ricardo Cervera
3fee7dc78a am 7a2e85c8: am 9273b33f: am 73f36d47: am e229751d: docs: Add browseable Wearable Support Lib Javadoc 
* commit '7a2e85c83eabe113ca05d2ecf4633008d601a560':
  docs: Add browseable Wearable Support Lib Javadoc
 2015-01-16 22:34:42 +00:00
Svet Ganov
22a08757b2 am 605ba802: am 2004fdf8: am 830f39ad: Merge "Fixing a memory leak: activities are leaked." into lmp-mr1-dev 
* commit '605ba802778ed67ddd2ca1af7f55df6f2d257765':
  Fixing a memory leak: activities are leaked.
 2015-01-16 22:31:38 +00:00
Joe Fernandez
35aecbe927 am cd500663: am 90d2aca7: am 217d145d: Merge "docs: adding studio-sample-in-editor.png file" into lmp-docs 
* commit 'cd50066386887148f99dce9b449bed588a354bb3':
  docs: adding studio-sample-in-editor.png file
 2015-01-16 22:29:48 +00:00
Ricardo Cervera
7a2e85c83e am 9273b33f: am 73f36d47: am e229751d: docs: Add browseable Wearable Support Lib Javadoc 
* commit '9273b33f6ecfa20ff524ae6fcb88f2586c79b6da':
  docs: Add browseable Wearable Support Lib Javadoc
 2015-01-16 22:29:43 +00:00