OSDN Git Service
Tom Taylor [Tue, 4 Nov 2014 18:50:31 +0000 (18:50 +0000)]
am
d7044fe1: am
b2e54c1b: am
75e7fbaa: am
37906e6e: am
44f6d0d5: am
4c5b16d7: am
66aa87ae: am
90743d64: am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
d7044fe1f12b48cc7ba6803772ec4a2f2fe14c19':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Tue, 4 Nov 2014 18:39:38 +0000 (18:39 +0000)]
am
b2e54c1b: am
75e7fbaa: am
37906e6e: am
44f6d0d5: am
4c5b16d7: am
66aa87ae: am
90743d64: am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
b2e54c1b46c275d017fb5bef17add3eb4c465508':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Tue, 4 Nov 2014 18:30:23 +0000 (18:30 +0000)]
am
75e7fbaa: am
37906e6e: am
44f6d0d5: am
4c5b16d7: am
66aa87ae: am
90743d64: am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
75e7fbaa83448753a1db9647e58693f1a281900c':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Tue, 4 Nov 2014 18:23:51 +0000 (18:23 +0000)]
am
37906e6e: am
44f6d0d5: am
4c5b16d7: am
66aa87ae: am
90743d64: am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
37906e6ebc1985ad4b7151116b7cf4fef8322b19':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Tue, 4 Nov 2014 18:18:16 +0000 (18:18 +0000)]
am
44f6d0d5: am
4c5b16d7: am
66aa87ae: am
90743d64: am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
44f6d0d5810ce507394cc514481d977315d2496f':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Tue, 4 Nov 2014 18:11:02 +0000 (18:11 +0000)]
am
4c5b16d7: am
66aa87ae: am
90743d64: am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
4c5b16d7409bbd947af3e0dadf4b1901b48e4cd7':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Tue, 4 Nov 2014 18:03:07 +0000 (18:03 +0000)]
am
66aa87ae: am
90743d64: am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
66aa87ae0355a4e6c8ed56704fec4fb225ed18f6':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Tue, 4 Nov 2014 17:53:14 +0000 (17:53 +0000)]
am
90743d64: am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
90743d6409eaecdc869fdcf891ffff8b0a5757ec':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Tue, 4 Nov 2014 17:43:41 +0000 (17:43 +0000)]
am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
bfb7ffeb3e240784c1ea2a50187c120e6445b20e':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Wed, 15 Oct 2014 16:45:39 +0000 (09:45 -0700)]
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Bug
17969135
Use query (instead of rawQuery) and pass in arguments instead of building
the query with a giant string. Add a unit test that fails with the old
code but passes with the new code.
Change-Id: Id04a1db6fb95fcd923e1f36f5ab3b94402590918
Deepanshu Gupta [Fri, 26 Sep 2014 05:20:48 +0000 (05:20 +0000)]
am
2889942f: am
bfeeee8e: (-s ours) am
ecbe6045: am
6950920f: am
1fce990c: am
04861ed4: am
91043364: am
52be792b: am
27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
2889942f4ee7762cdbd097cf3ceea16444f8841a':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 05:09:54 +0000 (05:09 +0000)]
am
bfeeee8e: (-s ours) am
ecbe6045: am
6950920f: am
1fce990c: am
04861ed4: am
91043364: am
52be792b: am
27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
bfeeee8e4a9cf4bf32067c2ca5807cd612564a99':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 05:02:22 +0000 (05:02 +0000)]
am
ecbe6045: am
6950920f: am
1fce990c: am
04861ed4: am
91043364: am
52be792b: am
27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
ecbe6045911ac7c05a1e999b966577ef7b1bdc18':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 04:57:59 +0000 (04:57 +0000)]
am
7d23e405: am
f1033174: (-s ours) am
93b185e3: am
363f4d4e: am
8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
7d23e405bd3a18f871bcf9856b5a9bcc0ccb1236':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 04:49:31 +0000 (04:49 +0000)]
am
6950920f: am
1fce990c: am
04861ed4: am
91043364: am
52be792b: am
27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
6950920f19980a2416e156d2337b93e386b3f8be':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 04:40:53 +0000 (04:40 +0000)]
am
f1033174: (-s ours) am
93b185e3: am
363f4d4e: am
8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
f103317499bdb12cbcac1754899756d22acde986':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 04:37:23 +0000 (04:37 +0000)]
am
1fce990c: am
04861ed4: am
91043364: am
52be792b: am
27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
1fce990ce9098afe96e75ec1583c771826c50637':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 04:22:39 +0000 (04:22 +0000)]
am
04861ed4: am
91043364: am
52be792b: am
27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
04861ed488f5aaa62acbaf903e359ea9edd8e9f9':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 00:59:08 +0000 (00:59 +0000)]
am
91043364: am
52be792b: am
27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
91043364b95fe58225437e2220d497ef6e33edf6':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 00:58:23 +0000 (00:58 +0000)]
am
93b185e3: am
363f4d4e: am
8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
93b185e39c5e6a90d413ffa5a2eea740feb7364b':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 00:46:07 +0000 (00:46 +0000)]
am
52be792b: am
27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
52be792bad7cbd059daab02a23e28ef1df61f2ce':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 00:45:42 +0000 (00:45 +0000)]
am
363f4d4e: am
8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
363f4d4e2a53774b7b7c1ea995fc912291f5b84e':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 00:36:41 +0000 (00:36 +0000)]
am
27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
27d3b9264e2dcfb86400a60891a5e39cdf027d55':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 00:34:21 +0000 (00:34 +0000)]
am
8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
8bf221bd706a1bcb18f2c14cacbe4edbbc0a3a61':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 00:34:13 +0000 (00:34 +0000)]
am
43214e0c: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
43214e0c19c13acbf1ecd714167abf03283d54ef':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Thu, 25 Sep 2014 22:42:15 +0000 (15:42 -0700)]
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
A bug in the framework leads to the wrong argument being passed to
defStyleRes when obtaining styled attributes. The framework however just
ignores the attribute in such a case. LayoutLib logs an error to help
developers find bugs in their code.
The bug was seen when using list as the actionBarNavMode.
This change ignores the attribute if it detects that it's the framework
bug. Also, we change the error to a warning.
Change-Id: I58e1fe4469de0329a27b577d75c0a59c48d0381b
Deepanshu Gupta [Thu, 25 Sep 2014 22:42:15 +0000 (15:42 -0700)]
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
A bug in the framework leads to the wrong argument being passed to
defStyleRes when obtaining styled attributes. The framework however just
ignores the attribute in such a case. LayoutLib logs an error to help
developers find bugs in their code.
The bug was seen when using list as the actionBarNavMode.
This change ignores the attribute if it detects that it's the framework
bug. Also, we change the error to a warning.
Change-Id: I58e1fe4469de0329a27b577d75c0a59c48d0381b
Deepanshu Gupta [Thu, 25 Sep 2014 22:42:15 +0000 (15:42 -0700)]
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
A bug in the framework leads to the wrong argument being passed to
defStyleRes when obtaining styled attributes. The framework however just
ignores the attribute in such a case. LayoutLib logs an error to help
developers find bugs in their code.
The bug was seen when using list as the actionBarNavMode.
This change ignores the attribute if it detects that it's the framework
bug. Also, we change the error to a warning.
Change-Id: I58e1fe4469de0329a27b577d75c0a59c48d0381b
Jeff Vander Stoep [Tue, 23 Sep 2014 16:24:36 +0000 (16:24 +0000)]
am
e2adb1ff: Merge "Sanity-check paths of files to be restored" into jb-mr2-dev
* commit '
e2adb1ff4af09d66096df64461c80d4126ab2692':
Sanity-check paths of files to be restored
Jeff Vander Stoep [Tue, 23 Sep 2014 16:13:41 +0000 (16:13 +0000)]
Merge "Sanity-check paths of files to be restored" into jb-mr2-dev
Jeff Vander Stoep [Mon, 22 Sep 2014 22:15:58 +0000 (15:15 -0700)]
Sanity-check paths of files to be restored
(cherry picked from commit
7d51cc701a6735cf455af8479f56c9c0b2109e02)
Bug:
16298491
Change-Id: I0c2d6523c9d152dad4d27d06d3853afd432e5af7
Jeff Vander Stoep [Thu, 11 Sep 2014 18:47:53 +0000 (18:47 +0000)]
am
59c1202e: Merge "Change permission guard on bindBackupAgent()" into jb-mr2-dev
* commit '
59c1202e10c53587222a98e8c2f6ee3ff0fa1c3f':
Change permission guard on bindBackupAgent()
Jeff Vander Stoep [Thu, 11 Sep 2014 18:41:09 +0000 (18:41 +0000)]
Merge "Change permission guard on bindBackupAgent()" into jb-mr2-dev
Jeff Vander Stoep [Wed, 10 Sep 2014 21:20:14 +0000 (14:20 -0700)]
Change permission guard on bindBackupAgent()
Bug:
15829193
Change-Id: I6c1c39923b7b1a9f528f97da10913cb7f2d7e8f9
Jean-Michel Trivi [Wed, 10 Sep 2014 20:47:57 +0000 (20:47 +0000)]
am
60f22fbf: Do not restore the media button event receiver
* commit '
60f22fbf67a69e8f3604afb46ccd7c3bd2819cb1':
Do not restore the media button event receiver
Jean-Michel Trivi [Wed, 10 Sep 2014 16:15:50 +0000 (09:15 -0700)]
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
Deepanshu Gupta [Thu, 4 Sep 2014 17:22:13 +0000 (17:22 +0000)]
am
033a54ec: 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 '
033a54ec746bd8a4c5913f8290deb4a4ec653c50':
Resolve color xml attributes properly. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 17:22:10 +0000 (17:22 +0000)]
am
5d1755e9: 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 '
5d1755e9f51f81d54a3566aa6304919fbf467091':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 17:22:07 +0000 (17:22 +0000)]
am
f4ba8731: 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 '
f4ba8731441035d8f3bc4dc622e2eca6eeb47a3d':
Resolve color xml attributes properly. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 17:22:04 +0000 (17:22 +0000)]
am
296b120c: 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 '
296b120c3053db8b92fb84cb7f433da7f4e99a25':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Jean-Michel Trivi [Thu, 4 Sep 2014 17:22:01 +0000 (17:22 +0000)]
am
5c6248c9: am
1310a1cd: (-s ours) am
ec50dfc0: am
20fc473c: am
f0336eb8: am
2cb287f9: am
9ea996a3: Do not restore the media button event receiver
* commit '
5c6248c9321990f0fbe8ac7c061f0e61ba0725f1':
Do not restore the media button event receiver
Deepanshu Gupta [Thu, 4 Sep 2014 17:14:58 +0000 (17:14 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 17:14:53 +0000 (17:14 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 17:14:49 +0000 (17:14 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 17:14:46 +0000 (17:14 +0000)]
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]
Jean-Michel Trivi [Thu, 4 Sep 2014 17:14:42 +0000 (17:14 +0000)]
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
Deepanshu Gupta [Thu, 4 Sep 2014 05:33:14 +0000 (05:33 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 05:33:10 +0000 (05:33 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 05:32:41 +0000 (05:32 +0000)]
am
1eb506aa: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev
* commit '
1eb506aa8cd2045f1d7c75d7c9e59df6a103c1e5':
Resolve color xml attributes properly. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 05:32:32 +0000 (05:32 +0000)]
am
6a9c6c6b: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
* commit '
6a9c6c6baedb994a619573388056c95475f84abf':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 05:22:43 +0000 (05:22 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 05:22:40 +0000 (05:22 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 05:12:31 +0000 (05:12 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 05:12:28 +0000 (05:12 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 04:59:40 +0000 (04:59 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 04:59:34 +0000 (04:59 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 04:46:39 +0000 (04:46 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 04:46:28 +0000 (04:46 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 04:32:46 +0000 (04:32 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 04:32:42 +0000 (04:32 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 04:31:01 +0000 (04:31 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 04:27:43 +0000 (04:27 +0000)]
am
63889480: am
6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
* commit '
638894803cc8bb57d73ea6aaddd1accbeb52643e':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 03:18:39 +0000 (03:18 +0000)]
am
d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev
* commit '
d181ffe6881d0a1b49193b5f70dac0cc7cc9aae3':
Resolve color xml attributes properly. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 03:18:27 +0000 (03:18 +0000)]
am
6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
* commit '
6530cca1edf79ddcd520e2e5bc2695adfb0d3680':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 02:15:06 +0000 (02:15 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 02:15:02 +0000 (02:15 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 02:02:20 +0000 (02:02 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 02:01:59 +0000 (02:01 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 01:54:08 +0000 (01:54 +0000)]
Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev
Deepanshu Gupta [Thu, 4 Sep 2014 01:53:58 +0000 (01:53 +0000)]
Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev
Deepanshu Gupta [Thu, 4 Sep 2014 01:53:48 +0000 (01:53 +0000)]
Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev
Deepanshu Gupta [Thu, 4 Sep 2014 01:50:45 +0000 (01:50 +0000)]
Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into jb-mr1.1-dev
Jean-Michel Trivi [Fri, 29 Aug 2014 17:34:24 +0000 (17:34 +0000)]
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
Jean-Michel Trivi [Fri, 29 Aug 2014 17:21:43 +0000 (17:21 +0000)]
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
Jean-Michel Trivi [Fri, 29 Aug 2014 17:08:50 +0000 (17:08 +0000)]
am
f0336eb8: am
2cb287f9: am
9ea996a3: Do not restore the media button event receiver
* commit '
f0336eb87d32414eb14865044be41ea590e7a6ac':
Do not restore the media button event receiver
Jean-Michel Trivi [Fri, 29 Aug 2014 16:54:22 +0000 (16:54 +0000)]
am
2cb287f9: am
9ea996a3: Do not restore the media button event receiver
* commit '
2cb287f9cc79b0cd9e8ea37adf4b3411253eb244':
Do not restore the media button event receiver
Jean-Michel Trivi [Fri, 29 Aug 2014 16:41:10 +0000 (16:41 +0000)]
am
9ea996a3: Do not restore the media button event receiver
* commit '
9ea996a330a21af89f308bdf52e02a470643013b':
Do not restore the media button event receiver
Deepanshu Gupta [Tue, 19 Aug 2014 23:15:37 +0000 (16:15 -0700)]
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Bug: http://b.android.com/74072
Change-Id: Ib84906d86772ac3df2407e71ad2167797bec4542
(cherry picked from commit
c9cd725f1013bed27e6f6594b176c10a6a4c0f16)
Deepanshu Gupta [Tue, 19 Aug 2014 23:15:37 +0000 (16:15 -0700)]
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Bug: http://b.android.com/74072
Change-Id: Ib84906d86772ac3df2407e71ad2167797bec4542
(cherry picked from commit
c9cd725f1013bed27e6f6594b176c10a6a4c0f16)
Deepanshu Gupta [Tue, 19 Aug 2014 23:15:37 +0000 (16:15 -0700)]
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Bug: http://b.android.com/74072
Change-Id: Ib84906d86772ac3df2407e71ad2167797bec4542
(cherry picked from commit
c9cd725f1013bed27e6f6594b176c10a6a4c0f16)
Deepanshu Gupta [Sat, 9 Aug 2014 21:14:45 +0000 (14:14 -0700)]
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)
Deepanshu Gupta [Sat, 9 Aug 2014 21:14:45 +0000 (14:14 -0700)]
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)
Deepanshu Gupta [Sat, 9 Aug 2014 21:14:45 +0000 (14:14 -0700)]
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)
Jean-Michel Trivi [Mon, 25 Aug 2014 18:23:36 +0000 (11:23 -0700)]
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
Deepanshu Gupta [Wed, 6 Aug 2014 22:25:50 +0000 (22:25 +0000)]
am
db94ea9e: am
f970d2c2: am
79c3f678: am
206c691b: am
72cf03a2: am
3a544a81: resolved conflicts for merge of
a232a68d to jb-mr1.1-docs
* commit '
db94ea9ed03dbaa0ca075a433a986d7e414e8f8d':
Fix SystemProperties in LayoutLib.
Deepanshu Gupta [Wed, 6 Aug 2014 22:21:54 +0000 (22:21 +0000)]
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.
Deepanshu Gupta [Wed, 6 Aug 2014 22:18:04 +0000 (22:18 +0000)]
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.
Deepanshu Gupta [Wed, 6 Aug 2014 22:13:18 +0000 (22:13 +0000)]
am
206c691b: am
72cf03a2: am
3a544a81: resolved conflicts for merge of
a232a68d to jb-mr1.1-docs
* commit '
206c691bfdb3a6b78d35c7481365980dd387b8c9':
Fix SystemProperties in LayoutLib.
Deepanshu Gupta [Wed, 6 Aug 2014 22:09:13 +0000 (22:09 +0000)]
am
72cf03a2: am
3a544a81: resolved conflicts for merge of
a232a68d to jb-mr1.1-docs
* commit '
72cf03a27a73e91d4a3eabf74e0384b310f4a5b2':
Fix SystemProperties in LayoutLib.
Deepanshu Gupta [Wed, 6 Aug 2014 22:05:38 +0000 (22:05 +0000)]
am
3a544a81: resolved conflicts for merge of
a232a68d to jb-mr1.1-docs
* commit '
3a544a81b3d2d529b2995f4b5db2077760d440b5':
Fix SystemProperties in LayoutLib.
Deepanshu Gupta [Wed, 6 Aug 2014 22:00:14 +0000 (15:00 -0700)]
resolved conflicts for merge of
a232a68d to jb-mr1.1-docs
Change-Id: I1ea220e3e0a81880db68abab87beab56dc4a336c
Deepanshu Gupta [Wed, 6 Aug 2014 21:41:02 +0000 (14:41 -0700)]
resolved conflicts for merge of
5476cfee to jb-mr1-dev
Change-Id: I5197271e6fdd36fed9ca9f9b7221d9a99141a4b4
Deepanshu Gupta [Wed, 6 Aug 2014 21:28:24 +0000 (21:28 +0000)]
am
505c675c: Fix SystemProperties in LayoutLib.
* commit '
505c675c3a536ac7c6ad264eb62542537532119c':
Fix SystemProperties in LayoutLib.
Deepanshu Gupta [Wed, 6 Aug 2014 00:33:35 +0000 (17:33 -0700)]
Fix SystemProperties in LayoutLib.
Not all System Properties were used via Build class. Also, properties
like SDK_INT which called SystemProperties directly were not initialized
properly.
This change is essentially cherry picking of the relevant parts from the
following commits:
984749bf75c9ce9d3401b8410ea7d6276544b6ee
167bc25bceea9280bbe4858db4cb8233f86ce325
Bug: http://b.android.com/73046
Change-Id: Ia0fb467ee6d5fdedda500d57d02be20006f115df
Deepanshu Gupta [Fri, 18 Jul 2014 22:17:00 +0000 (22:17 +0000)]
am
14a4e69c: am
c7351974: (-s ours) am
a3966c66: am
62743940: am
8c71ff29: am
87234e85: am
9c48ab82: am
ccf7b2aa: am
5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]
* commit '
14a4e69cc656b60c705d2f05229aed2a7049693c':
Fix style resolution for styles with '.' [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 22:12:02 +0000 (22:12 +0000)]
am
c7351974: (-s ours) am
a3966c66: am
62743940: am
8c71ff29: am
87234e85: am
9c48ab82: am
ccf7b2aa: am
5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]
* commit '
c735197420948ffff757dbe6d00028a87ed09c15':
Fix style resolution for styles with '.' [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 22:07:40 +0000 (22:07 +0000)]
am
a3966c66: am
62743940: am
8c71ff29: am
87234e85: am
9c48ab82: am
ccf7b2aa: am
5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]
* commit '
a3966c66ee24109ca4b71f591f0d740ee37987de':
Fix style resolution for styles with '.' [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 22:01:45 +0000 (22:01 +0000)]
am
62743940: am
8c71ff29: am
87234e85: am
9c48ab82: am
ccf7b2aa: am
5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]
* commit '
627439401ec86a083eefdc61728d6aa75ce9a4e5':
Fix style resolution for styles with '.' [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 21:58:42 +0000 (21:58 +0000)]
am
8c71ff29: am
87234e85: am
9c48ab82: am
ccf7b2aa: am
5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]
* commit '
8c71ff298b10ebdd3e5dec6f69f70176161b7e0a':
Fix style resolution for styles with '.' [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 21:55:21 +0000 (21:55 +0000)]
am
87234e85: am
9c48ab82: am
ccf7b2aa: am
5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]
* commit '
87234e8544370d86b305fc55d6a5021c38b65495':
Fix style resolution for styles with '.' [DO NOT MERGE]
OSDN Git Service
