Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
105,722 Commits 3 Branches 0 Tags
660af7eb1a55e2df7da45aa63ca227141ef86b34
Commit Graph

105722 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Vander Stoep
660af7eb1a am 59c1202e: Merge "Change permission guard on bindBackupAgent()" into jb-mr2-dev 
* commit '59c1202e10c53587222a98e8c2f6ee3ff0fa1c3f':
  Change permission guard on bindBackupAgent()
 2014-09-11 18:47:53 +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
e825f0eec5 am 60f22fbf: Do not restore the media button event receiver 
* commit '60f22fbf67a69e8f3604afb46ccd7c3bd2819cb1':
  Do not restore the media button event receiver
 2014-09-10 20:47:57 +00: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
a5176670c8 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]
 2014-09-04 17:22:13 +00:00
Deepanshu Gupta
44db2b3ef6 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]
 2014-09-04 17:22:10 +00:00
Deepanshu Gupta
b79bb54e92 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]
 2014-09-04 17:22:07 +00:00
Deepanshu Gupta
9ee1556d60 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]
 2014-09-04 17:22:04 +00:00
Jean-Michel Trivi
daf113b118 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
 2014-09-04 17:22:01 +00: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
ae6a52eb0b 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]
 2014-09-04 05:32:41 +00:00
Deepanshu Gupta
e9ea028b74 am 6a9c6c6b: Fix "@null" resource values in LayoutLib. [DO NOT MERGE] 
* commit '6a9c6c6baedb994a619573388056c95475f84abf':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 05:32:32 +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
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
6c1bf6b161 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]
 2014-09-04 02:15:06 +00:00
Deepanshu Gupta
e73e14fd02 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]
 2014-09-04 02:15:02 +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
1eb506aa8c Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev 2014-09-04 01:53:49 +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
1310a1cdba 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
 2014-08-29 17:34:24 +00:00
Jean-Michel Trivi
ec50dfc03c 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
 2014-08-29 17:21:43 +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
6a9c6c6bae 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:37 +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