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

107983 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jon Larimer
2982d64802 am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev 
* commit 'de9a76ed997c300a6c5f2f82c517719503af9045':
  Fix ParceledListSlice to enforce the same concrete types among its elements.
 2015-01-29 18:12:01 +00:00
Jon Larimer
76cdbb0475 am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev 
* commit 'd0318a63e51107d5589d8970b079c27d8f788c5a':
  DO NOT MERGE Restore calling identity before checking permission
 2015-01-29 18:11:57 +00:00
Jon Larimer
de9a76ed99 am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev 
* commit 'fc731e6e40f6f449b8e7ac72c2cd36a57c04a32b':
  Fix ParceledListSlice to enforce the same concrete types among its elements.
 2015-01-29 18:00:58 +00:00
Jon Larimer
d0318a63e5 am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev 
* commit '7dd12d7633663c7f5802bdaaf8e7232a48aba811':
  DO NOT MERGE Restore calling identity before checking permission
 2015-01-29 18:00:55 +00:00
Jon Larimer
fc731e6e40 Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev 2015-01-29 17:48:58 +00:00
Jon Larimer
7dd12d7633 Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev 2015-01-29 17:48:20 +00:00
Adam Lesinski
f741c37273 Fix ParceledListSlice to enforce the same concrete types among its elements. 
Bug:17671747
Change-Id: I896f75738e5b464ccb6c03290f139cc2fa72f966
(cherry picked from commit 3df1c38ee098872352086e03d6f1adb16796ee29)
 2015-01-28 10:47:54 +00:00
Leon Scroggins III
9352296810 am 01287549: am 9a6143fa: Handle bad ninepatch data. 
* commit '01287549ad415c51377683696eb37c362d43061a':
  Handle bad ninepatch data.
 2015-01-27 22:17:11 +00:00
Leon Scroggins III
01287549ad am 9a6143fa: Handle bad ninepatch data. 
* commit '9a6143fab7d93797e4b22a12b89e07c160e5c31d':
  Handle bad ninepatch data.
 2015-01-27 22:01:08 +00:00
Leon Scroggins III
9a6143fab7 Handle bad ninepatch data. 
Changes proposed by Ben Hawkes of Google Project Zero.

NinePatchPeeker.cpp:
Instead of asserting, return false for bad data.

ResourceTypes.h:
Store ninepatch values as unsigned.

BUG:19151999
Change-Id: Ibe35e7569f632c6bb8a34a7701e26bb6ed547ec2
(cherry picked from commit a730ef3f77fc495bc90199b4d45efab26d609782)
 2015-01-27 19:04:57 +00:00
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
e8c1a97fa3 am 3b92fc04: am 1c2b0d52: AudioEffect JNI: use new max preprocessing constant 
* commit '3b92fc04700a68dab3c3c4a873535837c4e51e8b':
  AudioEffect JNI: use new max preprocessing constant
 2014-11-10 23:20:06 +00:00
Eric Laurent
3b92fc0470 am 1c2b0d52: AudioEffect JNI: use new max preprocessing constant 
* commit '1c2b0d52144dc94a7d1dcefb7e4fbd7fb29f5202':
  AudioEffect JNI: use new max preprocessing constant
 2014-11-10 23:11:00 +00: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
192a390442 am 23fb2972: 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 '23fb29723c47b2aeb6aecc382a503630a8d8e983':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-11-04 19:00:42 +00:00
Tom Taylor
23fb29723c 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
 2014-11-04 18:50:31 +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
941a8f0359 am 0c4893ec: 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 '0c4893ece99418842538db496bb8d53b767b335b':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 05:32:09 +00:00
Deepanshu Gupta
0c4893ece9 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]
 2014-09-26 05:20:48 +00:00
Deepanshu Gupta
48d0fd99f0 am ee41b79c: am 7d23e405: am f1033174: (-s ours) am 93b185e3: am 363f4d4e: am 8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit 'ee41b79c5735bb3399108bb62de1145fffff3904':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 05:13:09 +00: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
ee41b79c57 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]
 2014-09-26 04:57:59 +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
a39b3b25b9 am 08523e68: am 43214e0c: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '08523e680e1ec1e4ec521c7e732e60fd85f553a4':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 00:48:26 +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
08523e680e am 43214e0c: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '43214e0c19c13acbf1ecd714167abf03283d54ef':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 00:34:13 +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
bba797957a am 25c866a8: am e2adb1ff: Merge "Sanity-check paths of files to be restored" into jb-mr2-dev 
* commit '25c866a8efa148886280b34c0413a1c2c20c247f':
  Sanity-check paths of files to be restored
 2014-09-23 16:34:53 +00:00
Jeff Vander Stoep
25c866a8ef 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
 2014-09-23 16:24:36 +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