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

88471 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
d181ffe688 Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev 2014-09-04 01:54:08 +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
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
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
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
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
5af7324ace Fix style resolution for styles with '.' [DO NOT MERGE] 
Bug: b.android.com/72698
Change-Id: I96fb549cf5787d9e8cde2245524a8173471a60ca
(cherry picked from commit f2fa79e9b56b71f8aa30e6675255df69f88a173d)
 2014-07-10 00:30:03 +00:00
Deepanshu Gupta
8782a12005 resolved conflicts for merge of 61fb5784 to jb-mr1-dev 
Change-Id: I079d5db0d69fd1972e6754cdd1829dfd1645202d
 2014-06-04 12:43:01 -07:00
Deepanshu Gupta
61fb578432 am 3ff08eb6: Distinguish between menus in ActionBar and popup. [DO NOT MERGE] 
* commit '3ff08eb6bf68868d4f4e872fbbf1ecaf521934a9':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 19:32:05 +00:00
Deepanshu Gupta
5f56ea8d80 am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit 'f48ab8feec71419e574a2d2f08a29be87743ef07':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:24:25 +00:00
Deepanshu Gupta
f48ab8feec am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '3b7c09b4336f421c489523c10278ecfbfb0708a7':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:21:10 +00:00
Deepanshu Gupta
3ff08eb6bf Distinguish between menus in ActionBar and popup. [DO NOT MERGE] 
Mark the menus in the ActionBar and the ones in the Overflow popup
separately. This enables the IDE to differentiate between the two and
enable gestures such as double-click to open the menu xml for menus in
the ActionBar and single click for the menus in the Overflow popup.

Change-Id: I7a23f87d34d618a134ffbe3a665be695915d4bae
(cherry picked from commit 03c0735017a34bac9ea69600b8cf980775331f0e)
 2014-05-30 14:50:55 -07:00
Deepanshu Gupta
3b7c09b433 LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
?attr/foo in platform files wasn't resolved properly. The IDE checked
the app namespace for the attribute even though it is being referenced
from a platform file.

Change-Id: I7db6dfef5b540d99804c298120578da9d060b886
(cherry picked from commit 08d2007b33838570a96c8df890f0757fa920904c)
 2014-05-30 14:50:39 -07:00
Deepanshu Gupta
40bfb60efa Fix build due to incorrect merges [DO NOT MERGE] 
Change-Id: Ib3b4dafeed6ba4c07450d13d9908fb05a1a4542f
 2014-05-13 15:52:39 -07:00
Deepanshu Gupta
1c55797d0e Fix build 
remove a line that shouldn't have been merged into this branch.

The build will still be broken for this branch, but this will fix it for
many branches downstream.

Change-Id: I2f556636640eb823dc2834afae7b536e79b79607
 2014-05-13 15:47:04 -07:00
Deepanshu Gupta
bd5a3e6510 am 1677a9bd: Merge "resolve conflicts for merge 5a7b3b65 correctly" into jb-dev-plus-aosp 
* commit '1677a9bdeba3961625236925e754920fca1b7e89':
  resolve conflicts for merge 5a7b3b65 correctly
 2014-05-13 17:53:55 +00:00
Deepanshu Gupta
0ad4f2cedd resolved conflicts for merge of 7377c7be to jb-mr1-dev 
Change-Id: I26d2e3478536826608413094e17cd36da43b4e23
 2014-05-13 10:44:24 -07:00
Deepanshu Gupta
5dae7fda38 am 9359dc2e: am 2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE] 
* commit '9359dc2e7d6bc671af3fee0c1dc540dd3685365c':
  Support actionProviderClass attribute for menus [DO NOT MERGE]
 2014-05-13 17:40:55 +00:00
Deepanshu Gupta
b6de60e002 am df2da3d7: am 7bc363ba: Add special system view cookie to OverflowButton. [DO NOT MERGE] 
* commit 'df2da3d7c9f82ff2304f630f4ff9fc2cb3001c6f':
  Add special system view cookie to OverflowButton. [DO NOT MERGE]
 2014-05-13 17:40:52 +00:00
Deepanshu Gupta
ae5e0c7b9f am 4eab4e14: am 5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE] 
* commit '4eab4e14c8453a0b41923c714a05dccdd72d7829':
  Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
 2014-05-13 17:40:49 +00:00
Deepanshu Gupta
673d9734c2 resolved conflicts for merge of 00d09649 to jb-mr1-dev 
Change-Id: Ib3c34a1989d4251c3ac4755c52fe05a81644930a
 2014-05-13 10:17:09 -07:00
Deepanshu Gupta
5280c911d8 am 0df5ae65: am 0f209967: Add view cookies for action bar menus. [DO NOT MERGE] 
* commit '0df5ae65a91174c99d1af633b45b3a1a7861cd1c':
  Add view cookies for action bar menus. [DO NOT MERGE]
 2014-05-13 17:11:26 +00:00
Deepanshu Gupta
f192096a13 am 17585160: am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE] 
* commit '175851600c7757c73f91d1be0f960de157228b1c':
  Add missing layout params to xlarge action bar. [DO NOT MERGE]
 2014-05-13 17:11:23 +00:00
Deepanshu Gupta
1867f58d6c am 3027b69e: am f7e57949: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE] 
* commit '3027b69e154cffc6e286caf90b0f9af01c473c14':
  Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
 2014-05-13 17:11:20 +00:00
Deepanshu Gupta
a5461ebfae resolved conflicts for merge of 6d3c4ab2 to jb-mr1-dev 
Change-Id: I5c4634897882deb663f32d8148202d7c9189521d
 2014-05-13 09:40:35 -07:00
Deepanshu Gupta
9053261a54 am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE] 
* commit '052e0c589e5cf714ca71bc8d7b3ce8b3f6c4cb96':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]
 2014-05-13 16:32:02 +00:00
Deepanshu Gupta
5594616c4f am 9602fc1c: am 87665388: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE] 
* commit '9602fc1c00e5e5cdf26cdc3fe22022ffcd115361':
  Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
 2014-05-13 16:31:59 +00:00
Deepanshu Gupta
45693e50ec am c9a4badb: am d915dcac: Layoutlib tests now check methods return value [DO NOT MERGE] 
* commit 'c9a4badb54320f8c52d2da06a762b5e6eef00ee0':
  Layoutlib tests now check methods return value [DO NOT MERGE]
 2014-05-13 16:31:53 +00:00
Deepanshu Gupta
e3b43270e8 am bdd8fbf6: am 877ae535: Set default text style in layoutlib as NORMAL [DO NOT MERGE] 
* commit 'bdd8fbf6eae886dc3b2cd716745ede918773a2c4':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
 2014-05-13 16:31:50 +00:00
Deepanshu Gupta
45ca5ba7dc am 01cdd312: am 669792b3: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE] 
* commit '01cdd3123f408dc41a2bd4786f3a943157ab6c69':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
 2014-05-13 16:31:47 +00:00
Deepanshu Gupta
9f9652587d am d094742d: am cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE] 
* commit 'd094742d2e19371291409886bb80f070df099533':
  Fix a bug in Nine Patch library. [DO NOT MERGE]
 2014-05-13 16:31:44 +00:00
Deepanshu Gupta
8c5c2410ae am 7bb8de58: am a2b34c96: Optimize layout rendering in layoutlib [DO NOT MERGE] 
* commit '7bb8de580a451621480913d7839fd7eb784ab689':
  Optimize layout rendering in layoutlib [DO NOT MERGE]
 2014-05-13 16:31:41 +00:00
Deepanshu Gupta
48bf7b49bb am 69b3115e: am e183855c: Add methods for Time_Delegate [DO NOT MERGE] 
* commit '69b3115e1c02f2b22165b93bd9bcc5c90ec69b12':
  Add methods for Time_Delegate [DO NOT MERGE]
 2014-05-13 16:31:38 +00:00
Deepanshu Gupta
94d33cfce1 am 82d5bd98: am e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE] 
* commit '82d5bd98b77a9955e375b075e262639625c40232':
  Fix NPE in layoutlib. [DO NOT MERGE]
 2014-05-13 16:31:35 +00:00
Deepanshu Gupta
d4e6727d02 am d5de1bd6: am 30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE] 
* commit 'd5de1bd6305dc8885027504996602755b1e79099':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
 2014-05-13 16:31:31 +00:00
Deepanshu Gupta
ed98abecad am 8a70bcef: resolved conflicts for merge 5a7b3b65 to jb-dev-plus-aosp 
* commit '8a70bcef5a724906e3c35c58cb2266ee9c9e1b78':
  Remove references to non-std Java classes. [DO NOT MERGE]
 2014-05-13 16:31:28 +00:00
Deepanshu Gupta
2cbe100a9b am 40fea8b1: am 4b5da86d: Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE] 
* commit '40fea8b1bf689933e63941b5fa5e3379f82c88b5':
  Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
 2014-05-13 16:31:23 +00:00