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

105245 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Todd Kennedy
7dba93c087 DO NOT MERGE Restore calling identity before checking permission 
Using the system service identity to check the CHANGE_CONFIGURATION
permission isn't likely to catch a security violation. Changing
back to the original caller and then checking permissions is
preferred.

Cherry picked from lmp. Fixes bug 15989465.

Change-Id: Iff08d04422bcc052a487194154f1fd0d727d38f4
 2015-01-14 15:33:21 -08:00
Eric Laurent
1c2b0d5214 AudioEffect JNI: use new max preprocessing constant 
Bug: 18226810.
Change-Id: Ica5677da247268306b34dfce38f25394586817fd
(cherry picked from commit b27a8a5bcc40054f6d775d070bc2de6eb996d1c2)
 2014-11-10 19:44:15 +00:00
Tom Taylor
d7044fe1f1 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
 2014-11-04 18:39:38 +00:00
Tom Taylor
b2e54c1b46 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
 2014-11-04 18:30:23 +00:00
Tom Taylor
75e7fbaa83 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
 2014-11-04 18:23:51 +00:00
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
2889942f4e 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]
 2014-09-26 05:09:54 +00:00
Deepanshu Gupta
bfeeee8e4a 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]
 2014-09-26 05:02:22 +00:00
Deepanshu Gupta
ecbe604591 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]
 2014-09-26 04:49:31 +00:00
Deepanshu Gupta
7d23e405bd 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]
 2014-09-26 04:40:53 +00: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
f103317499 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]
 2014-09-26 00:58:23 +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
93b185e39c 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]
 2014-09-26 00:45:42 +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
43214e0c19 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:44 +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
Jeff Vander Stoep
e2adb1ff4a Merge "Sanity-check paths of files to be restored" into jb-mr2-dev 2014-09-23 16:13:42 +00:00
Jeff Vander Stoep
7bc601d5d7 Sanity-check paths of files to be restored 
(cherry picked from commit 7d51cc701a6735cf455af8479f56c9c0b2109e02)
Bug: 16298491
Change-Id: I0c2d6523c9d152dad4d27d06d3853afd432e5af7
 2014-09-22 23:21:20 +00:00
Jeff Vander Stoep
59c1202e10 Merge "Change permission guard on bindBackupAgent()" into jb-mr2-dev 2014-09-11 18:41:10 +00:00
Jeff Vander Stoep
a8f6d1bffc Change permission guard on bindBackupAgent() 
Bug: 15829193
Change-Id: I6c1c39923b7b1a9f528f97da10913cb7f2d7e8f9
 2014-09-10 14:20:14 -07:00
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