Jean-Michel Trivi
60f22fbf67
Do not restore the media button event receiver
...
Do not restore the media button event receiver on behalf of the
application that registered. Prevents reported vulnerability.
Bug 15428797
Change-Id: If40ee6bc0c77c191643129daa92eb26755e70cb0
2014-09-10 09:15:50 -07:00
Deepanshu Gupta
033a54ec74
am c33fc8de: (-s ours) am 48349ea9: am 66224e25: am 12bbbb2b: am d3328343: am f264080d: am 3ce96efc: am d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev
...
* commit 'c33fc8de1ddd2d27a499c146169b870513afca3b':
Resolve color xml attributes properly. [DO NOT MERGE]
2014-09-04 17:14:58 +00:00
Deepanshu Gupta
5d1755e9f5
am c634383a: (-s ours) am 8bc68f96: am 52ee9b99: am ffd0e8bf: am a6f32d7f: am 64d4ef8c: am 63889480: am 6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
...
* commit 'c634383ac49b03cd8fd152b4278cad1b94b84bcf':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
2014-09-04 17:14:53 +00:00
Deepanshu Gupta
f4ba873144
am 338e32ba: (-s ours) am 6c1bf6b1: am 2db4037c: am 4f53d92c: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev
...
* commit '338e32ba521df8cbd295e69d8f20626452baa4a5':
Resolve color xml attributes properly. [DO NOT MERGE]
2014-09-04 17:14:49 +00:00
Deepanshu Gupta
296b120c30
am a82db08e: (-s ours) am e73e14fd: am 8ed784e2: am edc8b857: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into jb-mr1.1-dev
...
* commit 'a82db08e1d5f2c7b1751a93bc10d0fc5d231f9e4':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
2014-09-04 17:14:46 +00:00
Jean-Michel Trivi
5c6248c932
am 1310a1cd: (-s ours) am ec50dfc0: am 20fc473c: am f0336eb8: am 2cb287f9: am 9ea996a3: Do not restore the media button event receiver
...
* commit '1310a1cdba8a0f5e1c8741a5fbcf81eb76c6c2b2':
Do not restore the media button event receiver
2014-09-04 17:14:42 +00:00
Deepanshu Gupta
c33fc8de1d
am 48349ea9: am 66224e25: am 12bbbb2b: am d3328343: am f264080d: am 3ce96efc: am d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev
...
* commit '48349ea91823112e3fd2d431116027aed743b1a4':
Resolve color xml attributes properly. [DO NOT MERGE]
2014-09-04 05:33:14 +00:00
Deepanshu Gupta
c634383ac4
am 8bc68f96: am 52ee9b99: am ffd0e8bf: am a6f32d7f: am 64d4ef8c: am 63889480: am 6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
...
* commit '8bc68f964801f3dcb36a76628cd3d289f3f279ca':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
2014-09-04 05:33:10 +00:00
Deepanshu Gupta
48349ea918
am 66224e25: am 12bbbb2b: am d3328343: am f264080d: am 3ce96efc: am d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev
...
* commit '66224e2524e9b6723c783f14598c2e02118ea7f5':
Resolve color xml attributes properly. [DO NOT MERGE]
2014-09-04 05:22:43 +00:00
Deepanshu Gupta
8bc68f9648
am 52ee9b99: am ffd0e8bf: am a6f32d7f: am 64d4ef8c: am 63889480: am 6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
...
* commit '52ee9b99f55cd17c484fcaf2433c688967284468':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
2014-09-04 05:22:40 +00:00
Deepanshu Gupta
66224e2524
am 12bbbb2b: am d3328343: am f264080d: am 3ce96efc: am d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev
...
* commit '12bbbb2bb71a532f3b3ec59fd9232902420cf3d2':
Resolve color xml attributes properly. [DO NOT MERGE]
2014-09-04 05:12:31 +00:00
Deepanshu Gupta
52ee9b99f5
am ffd0e8bf: am a6f32d7f: am 64d4ef8c: am 63889480: am 6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
...
* commit 'ffd0e8bf9f803e4881736d1b2e8b54e31888e980':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
2014-09-04 05:12:28 +00:00
Deepanshu Gupta
12bbbb2bb7
am d3328343: am f264080d: am 3ce96efc: am d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev
...
* commit 'd3328343deaff01cfe5eadf57ac27da30832aabe':
Resolve color xml attributes properly. [DO NOT MERGE]
2014-09-04 04:59:40 +00:00
Deepanshu Gupta
ffd0e8bf9f
am a6f32d7f: am 64d4ef8c: am 63889480: am 6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
...
* commit 'a6f32d7ff19319c5ed61d113672f112a6f54c938':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
2014-09-04 04:59:34 +00:00
Deepanshu Gupta
d3328343de
am f264080d: am 3ce96efc: am d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev
...
* commit 'f264080d227617d431804e110e65cc154e8a8d17':
Resolve color xml attributes properly. [DO NOT MERGE]
2014-09-04 04:46:39 +00:00
Deepanshu Gupta
a6f32d7ff1
am 64d4ef8c: am 63889480: am 6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
...
* commit '64d4ef8cf2f9ec6b7af6795fa9feb18cc07ba3d9':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
2014-09-04 04:46:28 +00:00
Deepanshu Gupta
338e32ba52
am 6c1bf6b1: am 2db4037c: am 4f53d92c: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev
...
* commit '6c1bf6b161cf3c18b49831eba71811d3fa00d108':
Resolve color xml attributes properly. [DO NOT MERGE]
2014-09-04 04:32:46 +00:00
Deepanshu Gupta
a82db08e1d
am e73e14fd: am 8ed784e2: am edc8b857: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into jb-mr1.1-dev
...
* commit 'e73e14fd02f50e0e9b3fb3ca890de7cb96d8d48b':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
2014-09-04 04:32:42 +00:00
Deepanshu Gupta
f264080d22
am 3ce96efc: am d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev
...
* commit '3ce96efc2ceeb1666db330ad837409fd494ec108':
Resolve color xml attributes properly. [DO NOT MERGE]
2014-09-04 04:31:01 +00:00
Deepanshu Gupta
64d4ef8cf2
am 63889480: am 6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
...
* commit '638894803cc8bb57d73ea6aaddd1accbeb52643e':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
2014-09-04 04:27:43 +00:00
Deepanshu Gupta
3ce96efc2c
am d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev
...
* commit 'd181ffe6881d0a1b49193b5f70dac0cc7cc9aae3':
Resolve color xml attributes properly. [DO NOT MERGE]
2014-09-04 03:18:39 +00:00
Deepanshu Gupta
638894803c
am 6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
...
* commit '6530cca1edf79ddcd520e2e5bc2695adfb0d3680':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
2014-09-04 03:18:27 +00:00
Deepanshu Gupta
6c1bf6b161
am 2db4037c: am 4f53d92c: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev
...
* commit '2db4037c628c70f6206a05ade4e606e0b47e9f7c':
Resolve color xml attributes properly. [DO NOT MERGE]
2014-09-04 02:15:06 +00:00
Deepanshu Gupta
e73e14fd02
am 8ed784e2: am edc8b857: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into jb-mr1.1-dev
...
* commit '8ed784e2893c79d943b6184d25167ecf72a9a9ed':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
2014-09-04 02:15:02 +00:00
Deepanshu Gupta
2db4037c62
am 4f53d92c: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev
...
* commit '4f53d92c2f10f774cfdcf17ded82551ea19924be':
Resolve color xml attributes properly. [DO NOT MERGE]
2014-09-04 02:02:20 +00:00
Deepanshu Gupta
8ed784e289
am edc8b857: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into jb-mr1.1-dev
...
* commit 'edc8b8579ba9f47bbca0ac0c2f0eb11d0eadab09':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
2014-09-04 02:01:59 +00:00
Deepanshu Gupta
d181ffe688
Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev
2014-09-04 01:54:08 +00:00
Deepanshu Gupta
4f53d92c2f
Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev
2014-09-04 01:53:59 +00:00
Deepanshu Gupta
1eb506aa8c
Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev
2014-09-04 01:53:49 +00:00
Deepanshu Gupta
edc8b8579b
Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into jb-mr1.1-dev
2014-09-04 01:50:46 +00:00
Jean-Michel Trivi
1310a1cdba
am ec50dfc0: am 20fc473c: am f0336eb8: am 2cb287f9: am 9ea996a3: Do not restore the media button event receiver
...
* commit 'ec50dfc03ca90e4a8528da77297fe141cc62d3ff':
Do not restore the media button event receiver
2014-08-29 17:34:24 +00:00
Jean-Michel Trivi
ec50dfc03c
am 20fc473c: am f0336eb8: am 2cb287f9: am 9ea996a3: Do not restore the media button event receiver
...
* commit '20fc473c69ae9c564ceb7fd357acc09c6b9e1aaf':
Do not restore the media button event receiver
2014-08-29 17:21:43 +00:00
Jean-Michel Trivi
20fc473c69
am f0336eb8: am 2cb287f9: am 9ea996a3: Do not restore the media button event receiver
...
* commit 'f0336eb87d32414eb14865044be41ea590e7a6ac':
Do not restore the media button event receiver
2014-08-29 17:08:50 +00:00
Jean-Michel Trivi
f0336eb87d
am 2cb287f9: am 9ea996a3: Do not restore the media button event receiver
...
* commit '2cb287f9cc79b0cd9e8ea37adf4b3411253eb244':
Do not restore the media button event receiver
2014-08-29 16:54:22 +00:00
Jean-Michel Trivi
2cb287f9cc
am 9ea996a3: Do not restore the media button event receiver
...
* commit '9ea996a330a21af89f308bdf52e02a470643013b':
Do not restore the media button event receiver
2014-08-29 16:41:10 +00:00
Deepanshu Gupta
6530cca1ed
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
...
Bug: http://b.android.com/74072
Change-Id: Ib84906d86772ac3df2407e71ad2167797bec4542
(cherry picked from commit c9cd725f1013bed27e6f6594b176c10a6a4c0f16)
2014-08-26 00:51:54 +00:00
Deepanshu Gupta
c39afe45d4
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
...
Bug: http://b.android.com/74072
Change-Id: Ib84906d86772ac3df2407e71ad2167797bec4542
(cherry picked from commit c9cd725f1013bed27e6f6594b176c10a6a4c0f16)
2014-08-26 00:48:59 +00:00
Deepanshu Gupta
6a9c6c6bae
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
...
Bug: http://b.android.com/74072
Change-Id: Ib84906d86772ac3df2407e71ad2167797bec4542
(cherry picked from commit c9cd725f1013bed27e6f6594b176c10a6a4c0f16)
2014-08-26 00:48:37 +00:00
Deepanshu Gupta
f2e26413fb
Resolve color xml attributes properly. [DO NOT MERGE]
...
Color attributes were not being converted to int properly. The
conversion to int was a simple string to int using base 16. This change
resolves the colors as per #RGB, #ARGB, #RRGGBB or #AARRGGBB format
depending on the length of the attribute. All values that begin with '#'
are treated as colors.
Bug: http://b.android.com/73845
Change-Id: I8ad089b821af1e290b9b95771b50213fe2fdd784
(cherry picked from commit 81564dfe60020fa977d39d168f682e9d61825660)
2014-08-26 00:28:18 +00:00
Deepanshu Gupta
26819e76ff
Resolve color xml attributes properly. [DO NOT MERGE]
...
Color attributes were not being converted to int properly. The
conversion to int was a simple string to int using base 16. This change
resolves the colors as per #RGB, #ARGB, #RRGGBB or #AARRGGBB format
depending on the length of the attribute. All values that begin with '#'
are treated as colors.
Bug: http://b.android.com/73845
Change-Id: I8ad089b821af1e290b9b95771b50213fe2fdd784
(cherry picked from commit 81564dfe60020fa977d39d168f682e9d61825660)
2014-08-26 00:27:57 +00:00
Deepanshu Gupta
095cdf85d1
Resolve color xml attributes properly. [DO NOT MERGE]
...
Color attributes were not being converted to int properly. The
conversion to int was a simple string to int using base 16. This change
resolves the colors as per #RGB, #ARGB, #RRGGBB or #AARRGGBB format
depending on the length of the attribute. All values that begin with '#'
are treated as colors.
Bug: http://b.android.com/73845
Change-Id: I8ad089b821af1e290b9b95771b50213fe2fdd784
(cherry picked from commit 81564dfe60020fa977d39d168f682e9d61825660)
2014-08-26 00:27:23 +00:00
Jean-Michel Trivi
9ea996a330
Do not restore the media button event receiver
...
Do not restore the media button event receiver on behalf of the
application that registered. Prevents reported vulnerability.
Bug 15428797
Change-Id: I507faefd211def0d2ea074706de76c0d06157c5a
2014-08-25 11:23:36 -07:00
Deepanshu Gupta
db94ea9ed0
am f970d2c2: am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs
...
* commit 'f970d2c201649843b8d51d094b865f16b15bc0bc':
Fix SystemProperties in LayoutLib.
2014-08-06 22:21:54 +00:00
Deepanshu Gupta
f970d2c201
am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs
...
* commit '79c3f678d21f6b3c058623217cbe5dd57a553fe8':
Fix SystemProperties in LayoutLib.
2014-08-06 22:18:04 +00:00
Deepanshu Gupta
79c3f678d2
am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs
...
* commit '206c691bfdb3a6b78d35c7481365980dd387b8c9':
Fix SystemProperties in LayoutLib.
2014-08-06 22:13:18 +00:00
Deepanshu Gupta
206c691bfd
am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs
...
* commit '72cf03a27a73e91d4a3eabf74e0384b310f4a5b2':
Fix SystemProperties in LayoutLib.
2014-08-06 22:09:13 +00:00
Deepanshu Gupta
72cf03a27a
am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs
...
* commit '3a544a81b3d2d529b2995f4b5db2077760d440b5':
Fix SystemProperties in LayoutLib.
2014-08-06 22:05:38 +00:00
Deepanshu Gupta
3a544a81b3
resolved conflicts for merge of a232a68d to jb-mr1.1-docs
...
Change-Id: I1ea220e3e0a81880db68abab87beab56dc4a336c
2014-08-06 15:00:14 -07:00
Deepanshu Gupta
a232a68d4c
resolved conflicts for merge of 5476cfee to jb-mr1-dev
...
Change-Id: I5197271e6fdd36fed9ca9f9b7221d9a99141a4b4
2014-08-06 14:41:02 -07:00
Deepanshu Gupta
5476cfee6b
am 505c675c: Fix SystemProperties in LayoutLib.
...
* commit '505c675c3a536ac7c6ad264eb62542537532119c':
Fix SystemProperties in LayoutLib.
2014-08-06 21:28:24 +00:00