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

178989 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
e66e10b563 Import translations. DO NOT MERGE 
Change-Id: Ibe706a89d57655a9fb5890533887ca7a793190aa
Auto-generated-cl: translation import
 2015-01-05 06:19:02 -08:00
Jaewan Kim
64616f2fc7 Merge "Support quatation mark for text command" 2015-01-05 08:32:01 +00:00
Jinsuk Kim
a8f6c40f8a am 877919bb: am 6cfb4495: Merge "CEC: Let MHL device be of type \'source\'" into lmp-mr1-dev 
automerge: fe3cdf0

* commit 'fe3cdf015e42168954f20125e7c9f4495f9d4647':
  CEC: Let MHL device be of type 'source'
 2015-01-05 07:25:06 +00:00
Jinsuk Kim
fe3cdf015e am 877919bb: am 6cfb4495: Merge "CEC: Let MHL device be of type \'source\'" into lmp-mr1-dev 
* commit '877919bb182dbd8c87901cb94f318cf5d5408bc8':
  CEC: Let MHL device be of type 'source'
 2015-01-05 07:23:05 +00:00
Jinsuk Kim
877919bb18 am 6cfb4495: Merge "CEC: Let MHL device be of type \'source\'" into lmp-mr1-dev 
* commit '6cfb44952a76303fe1c7cc75b545cb8aad72eecf':
  CEC: Let MHL device be of type 'source'
 2015-01-05 07:16:24 +00:00
Jinsuk Kim
6cfb44952a Merge "CEC: Let MHL device be of type 'source'" into lmp-mr1-dev 2015-01-05 07:10:08 +00:00
Jinsuk Kim
e416d0f67b CEC: Let MHL device be of type 'source' 
MHL devices should be of type source that can stream AV contents
to the connected TV. This should be supported by the API
HdmiDeviceInfo.isSourceType().

Bug: 18897172
Change-Id: I7dcbd7773127bf26797c204504a12c3e2ebbd83b
 2015-01-05 16:07:28 +09:00
Sungsoo Lim
1f5fa2f198 am 269aad53: am b65ad80d: Merge "DO NOT MERGE Make mute/unmute work" into lmp-mr1-dev 
automerge: 64a5234  -s ours

* commit '64a5234a3a04108e259730cbdbbb03fd70ff24ed':
  DO NOT MERGE Make mute/unmute work
 2015-01-05 04:39:27 +00:00
Sungsoo Lim
64a5234a3a am 269aad53: am b65ad80d: Merge "DO NOT MERGE Make mute/unmute work" into lmp-mr1-dev 
* commit '269aad530493ccdd7ec78c1704eebd4476348b5d':
  DO NOT MERGE Make mute/unmute work
 2015-01-05 04:36:57 +00:00
Sungsoo Lim
269aad5304 am b65ad80d: Merge "DO NOT MERGE Make mute/unmute work" into lmp-mr1-dev 
* commit 'b65ad80de116f42fb3f2821363d52ce71e553517':
  DO NOT MERGE Make mute/unmute work
 2015-01-05 04:29:23 +00:00
Sungsoo Lim
b65ad80de1 Merge "DO NOT MERGE Make mute/unmute work" into lmp-mr1-dev 2015-01-05 04:25:12 +00:00
Sungsoo Lim
48248c80e5 DO NOT MERGE Make mute/unmute work 
Bug: 18844550
Change-Id: I431a223d55430aa8e1bb28f0275e11876ed0e0bb
(cherry picked from commit d1851e6e4e49b6a45d9e013de2e1384711975328)
 2015-01-05 11:50:49 +09:00
Dongwon Kang
2806cb5157 am e9a205ce: am 017bb852: DO NOT MERGE TIF: Add a null checking in TvInputHardwareManager. 
automerge: 871a962  -s ours

* commit '871a962b7961a3d5ac7f0a9c7d55f25dbcb4ab2c':
  DO NOT MERGE TIF: Add a null checking in TvInputHardwareManager.
 2015-01-05 02:44:32 +00:00
Dongwon Kang
871a962b79 am e9a205ce: am 017bb852: DO NOT MERGE TIF: Add a null checking in TvInputHardwareManager. 
* commit 'e9a205cec4001faab38a1fdba88b29125bfe37d1':
  DO NOT MERGE TIF: Add a null checking in TvInputHardwareManager.
 2015-01-05 02:42:06 +00:00
Dongwon Kang
e9a205cec4 am 017bb852: DO NOT MERGE TIF: Add a null checking in TvInputHardwareManager. 
* commit '017bb8523dd7c3dbfd00c055fde241de4dca9da2':
  DO NOT MERGE TIF: Add a null checking in TvInputHardwareManager.
 2015-01-05 02:26:15 +00:00
Dongwon Kang
017bb8523d DO NOT MERGE TIF: Add a null checking in TvInputHardwareManager. 
Bug: 18688119
Change-Id: I17fd89bfbb34666ad5e14bb6e946aa5347975d4c
(cherry picked from commit b61077357eb6d8b95b303ef107b15db243a9621b)
 2015-01-05 02:12:44 +00:00
Dongwon Kang
766dc9e6ab Merge "TIF: Add a null checking in TvInputHardwareManager." 2015-01-05 01:20:43 +00:00
Sungsoo Lim
9dcba434e2 Fix typo 
Change-Id: I0c738602616fda510b765e03f8a25abfc8316b84
 2015-01-05 09:13:20 +09:00
Jinsuk Kim
65e644b449 am 270686b6: am ad1e3d7d: CEC: Buffer <Set System Audio Mode> 
automerge: e82e47e

* commit 'e82e47e9cb01a19e88a89f8a43a7a15540b96869':
  CEC: Buffer <Set System Audio Mode>
 2015-01-03 21:27:36 +00:00
Jinsuk Kim
e82e47e9cb am 270686b6: am ad1e3d7d: CEC: Buffer <Set System Audio Mode> 
* commit '270686b681e74622a09bb3081b1e03c55f692c3f':
  CEC: Buffer <Set System Audio Mode>
 2015-01-03 21:25:40 +00:00
Jinsuk Kim
270686b681 am ad1e3d7d: CEC: Buffer <Set System Audio Mode> 
* commit 'ad1e3d7df42376cd2a257b6c3b2fed540658a6e3':
  CEC: Buffer <Set System Audio Mode>
 2015-01-03 21:20:30 +00:00
Narayan Kamath
fc7bfe6973 am 3d6cfe0e: am 873b291b: Merge "fix issuse 65774" 
automerge: 0699722

* commit '0699722a13c0a8cee6477dc88c843353f201d742':
  fix issuse 65774
 2015-01-02 10:36:08 +00:00
Narayan Kamath
0699722a13 am 3d6cfe0e: am 873b291b: Merge "fix issuse 65774" 
* commit '3d6cfe0eb1c9fcfabaf7b02548dd6d5cc16203d6':
  fix issuse 65774
 2015-01-02 10:34:03 +00:00
Narayan Kamath
3d6cfe0eb1 am 873b291b: Merge "fix issuse 65774" 
* commit '873b291b15c35ae1ec7ea29de4c012275e13e761':
  fix issuse 65774
 2015-01-02 10:28:22 +00:00
Narayan Kamath
873b291b15 Merge "fix issuse 65774" 2015-01-02 10:22:21 +00:00
Paul Quei
65e37ee936 fix issuse 65774 
"Some vendors have there own well defined specifications ...". Should be "Some vendors have their own well defined specifications ..."

Change-Id: I0d770ac0591812c1c61389eb0078493098784323
Signed-off-by: Paul Quei <paulquei@gmail.com>
 2015-01-02 10:21:55 +00:00
Jinsuk Kim
ad1e3d7df4 CEC: Buffer <Set System Audio Mode> 
<Set System Audio Mode> is another command that needs to be buffered
in case the command arrives before the system is ready to process it.
When processed, system audio mode will be enabled based on the
global setting.

Bug: 18809965

Change-Id: Ia6ebc4e2919e1b94498ca28f652c6db95f907f9c
 2015-01-02 16:08:56 +09:00
Baligh Uddin
9939422efa Import translations. DO NOT MERGE 
Change-Id: I941e39b33f0dd49c4e0385d22787823acef5d93a
Auto-generated-cl: translation import
 2014-12-31 11:16:03 -08:00
Robin Lee
68469c799c Merge "Remove deprecated upgrade path for relatedGroupId" 2014-12-31 13:59:32 +00:00
Narayan Kamath
6d5ba6537b am d3d95172: am 38c2dae5: Merge "Remove hardcoded include paths." 
automerge: bdc3992

* commit 'bdc399299edf7f5f86c816dafe581e85e65dd2bd':
  Remove hardcoded include paths.
 2014-12-31 10:21:39 +00:00
Narayan Kamath
bdc399299e am d3d95172: am 38c2dae5: Merge "Remove hardcoded include paths." 
* commit 'd3d95172c3645a1d7a12e540638207ae4fb69cae':
  Remove hardcoded include paths.
 2014-12-31 10:19:00 +00:00
Narayan Kamath
d3d95172c3 am 38c2dae5: Merge "Remove hardcoded include paths." 
* commit '38c2dae5f12003ff39a5b1a5e46f079174fcedca':
  Remove hardcoded include paths.
 2014-12-31 10:13:23 +00:00
Narayan Kamath
38c2dae5f1 Merge "Remove hardcoded include paths." 2014-12-31 10:08:49 +00:00
Narayan Kamath
bc2cc2f350 Remove hardcoded include paths. 
ICU, zlib & openssl export them using LOCAL_EXPORT_C_INCLUDE_DIRS.
The dependency on libc/dns/include was bogus and can be removed
trivially.

bug: 18581021
Change-Id: I4b8047ff0df1050ab48b61c0c886888b3f2f0c18
 2014-12-31 10:06:51 +00:00
Michael Wright
3979c0bf42 resolve merge conflicts of 342e903 to master. 
Change-Id: Id8404cce5c1c8e7818e5d164f93207a8c17cf7bb
 2014-12-30 12:59:10 -08:00
Michael Wright
342e903000 am 95700457: am a33424a5: Merge "Add MEDIA_PROJECTION_SERVICE to the ServiceName list." into lmp-mr1-dev 
* commit '95700457139803af54a5e731816cedf1c924f3a6':
  Add MEDIA_PROJECTION_SERVICE to the ServiceName list.
 2014-12-30 19:51:20 +00:00
Michael Wright
9570045713 am a33424a5: Merge "Add MEDIA_PROJECTION_SERVICE to the ServiceName list." into lmp-mr1-dev 
* commit 'a33424a540ea725d4b513ee713931c66e62721a2':
  Add MEDIA_PROJECTION_SERVICE to the ServiceName list.
 2014-12-30 19:45:47 +00:00
Michael Wright
a33424a540 Merge "Add MEDIA_PROJECTION_SERVICE to the ServiceName list." into lmp-mr1-dev 2014-12-30 19:40:52 +00:00
Robin Lee
290e91107c Remove deprecated upgrade path for relatedGroupId 
As per note this has been unused for upwards of 6 months and its
attribute string is no longer referenced anywhere else in Android.

Change-Id: I5f95ffa6b3d91fca203f2d030d40df3fd55b6a70
 2014-12-30 17:36:00 +00:00
Narayan Kamath
aa118f67a7 am a4c40c37: am 72d33849: Merge "Missing break in switch statement" 
automerge: 4d72e3e

* commit '4d72e3e07e23fb13d4ba7f97f4c088948fef3e64':
  Missing break in switch statement
 2014-12-30 12:32:40 +00:00
Narayan Kamath
4d72e3e07e am a4c40c37: am 72d33849: Merge "Missing break in switch statement" 
* commit 'a4c40c373477983622622186946d21802400876e':
  Missing break in switch statement
 2014-12-30 12:29:38 +00:00
Narayan Kamath
a4c40c3734 am 72d33849: Merge "Missing break in switch statement" 
* commit '72d33849fea5de45087bfa79e645fa282ce8fcef':
  Missing break in switch statement
 2014-12-30 12:20:56 +00:00
Narayan Kamath
72d33849fe Merge "Missing break in switch statement" 2014-12-30 09:43:03 +00:00
Marvin Paul
437d859c57 Merge "Don\'t backup ringtone on non-telephony devices." into lmp-mr1-dev automerge: a30fdf7 automerge: 8298afb 
automerge: 9ff2160

* commit '9ff2160eddf4dfbd118eb9b0656e7803603f215a':
  Don't backup ringtone on non-telephony devices.
 2014-12-30 03:18:54 +00:00
Marvin Paul
9ff2160edd Merge "Don\'t backup ringtone on non-telephony devices." into lmp-mr1-dev automerge: a30fdf7 
automerge: 8298afb

* commit '8298afbc78f2b2c609f2e52ca3fc7c6a2cd9797e':
  Don't backup ringtone on non-telephony devices.
 2014-12-30 03:15:55 +00:00
Marvin Paul
8298afbc78 Merge "Don\'t backup ringtone on non-telephony devices." into lmp-mr1-dev 
automerge: a30fdf7

* commit 'a30fdf790d66e241252c51d7dbdc401e021e51ad':
  Don't backup ringtone on non-telephony devices.
 2014-12-30 00:53:52 +00:00
Marvin Paul
a30fdf790d Merge "Don't backup ringtone on non-telephony devices." into lmp-mr1-dev 2014-12-29 23:18:17 +00:00
Baligh Uddin
60a5378bf6 Merge "Import translations. DO NOT MERGE" 2014-12-29 22:56:43 +00:00
Baligh Uddin
fbfa98aaac Merge "Import translations. DO NOT MERGE" 2014-12-29 22:56:27 +00:00
Baligh Uddin
4cb74d8d08 Import translations. DO NOT MERGE 
Change-Id: I260f664c1fc1196d913cd7daeacb6a20550f057c
Auto-generated-cl: translation import
 2014-12-29 13:22:41 -08:00