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

90173 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Taylor
37906e6ebc 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
 2014-11-04 18:18:16 +00:00
Tom Taylor
44f6d0d581 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
 2014-11-04 18:11:02 +00:00
Tom Taylor
4c5b16d740 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
 2014-11-04 18:03:07 +00:00
Tom Taylor
66aa87ae03 am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager 
* commit '90743d6409eaecdc869fdcf891ffff8b0a5757ec':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-11-04 17:53:14 +00:00
Tom Taylor
90743d6409 am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager 
* commit 'bfb7ffeb3e240784c1ea2a50187c120e6445b20e':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-11-04 17:43:41 +00:00
Tom Taylor
bfb7ffeb3e 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
 2014-10-15 09:45:39 -07:00
Deepanshu Gupta
6950920f19 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]
 2014-09-26 04:37:23 +00:00
Deepanshu Gupta
1fce990ce9 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]
 2014-09-26 04:22:39 +00:00
Deepanshu Gupta
04861ed488 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]
 2014-09-26 00:59:08 +00:00
Deepanshu Gupta
91043364b9 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]
 2014-09-26 00:46:07 +00:00
Deepanshu Gupta
52be792bad am 27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '27d3b9264e2dcfb86400a60891a5e39cdf027d55':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 00:36:41 +00:00
Deepanshu Gupta
363f4d4e2a am 8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '8bf221bd706a1bcb18f2c14cacbe4edbbc0a3a61':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 00:34:21 +00:00
Deepanshu Gupta
8bf221bd70 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
 2014-09-25 23:00:17 +00:00
Deepanshu Gupta
27d3b9264e 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
 2014-09-25 22:59:58 +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
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
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
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
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
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
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
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
Deepanshu Gupta
505c675c3a 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
 2014-08-05 17:47:30 -07:00
Deepanshu Gupta
627439401e 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]
 2014-07-18 21:58:42 +00:00
Deepanshu Gupta
8c71ff298b 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]
 2014-07-18 21:55:21 +00:00
Deepanshu Gupta
87234e8544 am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] 
* commit '9c48ab82084828087c47086f2379b4927ec057e2':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:50:15 +00:00
Deepanshu Gupta
9c48ab8208 am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] 
* commit 'ccf7b2aac600b6069f03f7f420872b64cc5e6726':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:45:28 +00:00
Deepanshu Gupta
ccf7b2aac6 am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] 
* commit '5af7324ace4f318d7395b680beabec7a0f0e39b3':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:39:35 +00:00
Deepanshu Gupta
b8e4e8e1f4 am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev 
* commit 'd3ac01ff7616f7135b8b5044816690c93fba8548':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:38:39 +00:00
Deepanshu Gupta
37f54f4c1e am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE] 
* commit '357ebfc5e43ecb35da9207d78a9a8a6c117a1002':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:31:26 +00:00