OSDN Git Service
Jeff Vander Stoep [Thu, 11 Sep 2014 18:58:49 +0000 (18:58 +0000)]
am
660af7eb: am
59c1202e: Merge "Change permission guard on bindBackupAgent()" into jb-mr2-dev
* commit '
660af7eb1a55e2df7da45aa63ca227141ef86b34':
Change permission guard on bindBackupAgent()
Jeff Vander Stoep [Thu, 11 Sep 2014 18:47:53 +0000 (18:47 +0000)]
am
59c1202e: Merge "Change permission guard on bindBackupAgent()" into jb-mr2-dev
* commit '
59c1202e10c53587222a98e8c2f6ee3ff0fa1c3f':
Change permission guard on bindBackupAgent()
Jeff Vander Stoep [Thu, 11 Sep 2014 18:41:09 +0000 (18:41 +0000)]
Merge "Change permission guard on bindBackupAgent()" into jb-mr2-dev
Jeff Vander Stoep [Wed, 10 Sep 2014 21:20:14 +0000 (14:20 -0700)]
Change permission guard on bindBackupAgent()
Bug:
15829193
Change-Id: I6c1c39923b7b1a9f528f97da10913cb7f2d7e8f9
Jean-Michel Trivi [Wed, 10 Sep 2014 20:59:32 +0000 (20:59 +0000)]
am
e825f0ee: am
60f22fbf: Do not restore the media button event receiver
* commit '
e825f0eec571831ceb60e65ec7e2a6b1ed7be5bd':
Do not restore the media button event receiver
Jean-Michel Trivi [Wed, 10 Sep 2014 20:47:57 +0000 (20:47 +0000)]
am
60f22fbf: Do not restore the media button event receiver
* commit '
60f22fbf67a69e8f3604afb46ccd7c3bd2819cb1':
Do not restore the media button event receiver
Jean-Michel Trivi [Wed, 10 Sep 2014 16:15:50 +0000 (09:15 -0700)]
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
Deepanshu Gupta [Thu, 4 Sep 2014 17:33:28 +0000 (17:33 +0000)]
am
a5176670: 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 '
a5176670c8ef21b42e0a2e7db07c968e3ceacb39':
Resolve color xml attributes properly. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 17:33:25 +0000 (17:33 +0000)]
am
44db2b3e: 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 '
44db2b3ef65ff2b0aa340018a6db93cdd52caa60':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 17:33:21 +0000 (17:33 +0000)]
am
b79bb54e: 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 '
b79bb54e92b03bc032a91084f8a5ab7246136d9f':
Resolve color xml attributes properly. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 17:33:13 +0000 (17:33 +0000)]
am
9ee1556d: 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 '
9ee1556d601e1f1f60a01bb7137bad48a7923a3d':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Jean-Michel Trivi [Thu, 4 Sep 2014 17:33:09 +0000 (17:33 +0000)]
am
daf113b1: 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 '
daf113b118c658a493bac194d3b5ba8ab91dbd62':
Do not restore the media button event receiver
Deepanshu Gupta [Thu, 4 Sep 2014 17:22:13 +0000 (17:22 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 17:22:10 +0000 (17:22 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 17:22:07 +0000 (17:22 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 17:22:04 +0000 (17:22 +0000)]
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]
Jean-Michel Trivi [Thu, 4 Sep 2014 17:22:01 +0000 (17:22 +0000)]
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
Deepanshu Gupta [Thu, 4 Sep 2014 17:14:58 +0000 (17:14 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 17:14:53 +0000 (17:14 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 17:14:49 +0000 (17:14 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 17:14:46 +0000 (17:14 +0000)]
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]
Jean-Michel Trivi [Thu, 4 Sep 2014 17:14:42 +0000 (17:14 +0000)]
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
Deepanshu Gupta [Thu, 4 Sep 2014 05:48:37 +0000 (05:48 +0000)]
am
ae6a52eb: am
1eb506aa: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev
* commit '
ae6a52eb0b02eae92b8800b29dbaf34e647bc3ae':
Resolve color xml attributes properly. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 05:48:33 +0000 (05:48 +0000)]
am
e9ea028b: am
6a9c6c6b: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
* commit '
e9ea028b74950722163560d5dfb97b4403111cc4':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 05:33:14 +0000 (05:33 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 05:33:10 +0000 (05:33 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 05:32:41 +0000 (05:32 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 05:32:32 +0000 (05:32 +0000)]
am
6a9c6c6b: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
* commit '
6a9c6c6baedb994a619573388056c95475f84abf':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 05:22:43 +0000 (05:22 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 05:22:40 +0000 (05:22 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 05:12:31 +0000 (05:12 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 05:12:28 +0000 (05:12 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 04:59:40 +0000 (04:59 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 04:59:34 +0000 (04:59 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 04:46:39 +0000 (04:46 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 04:46:28 +0000 (04:46 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 04:32:46 +0000 (04:32 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 04:32:42 +0000 (04:32 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 04:31:01 +0000 (04:31 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 04:27:43 +0000 (04:27 +0000)]
am
63889480: am
6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
* commit '
638894803cc8bb57d73ea6aaddd1accbeb52643e':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 03:18:39 +0000 (03:18 +0000)]
am
d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev
* commit '
d181ffe6881d0a1b49193b5f70dac0cc7cc9aae3':
Resolve color xml attributes properly. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 03:18:27 +0000 (03:18 +0000)]
am
6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
* commit '
6530cca1edf79ddcd520e2e5bc2695adfb0d3680':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 02:15:06 +0000 (02:15 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 02:15:02 +0000 (02:15 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 02:02:20 +0000 (02:02 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 02:01:59 +0000 (02:01 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 01:54:08 +0000 (01:54 +0000)]
Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev
Deepanshu Gupta [Thu, 4 Sep 2014 01:53:58 +0000 (01:53 +0000)]
Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev
Deepanshu Gupta [Thu, 4 Sep 2014 01:53:48 +0000 (01:53 +0000)]
Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev
Deepanshu Gupta [Thu, 4 Sep 2014 01:50:45 +0000 (01:50 +0000)]
Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into jb-mr1.1-dev
Jean-Michel Trivi [Fri, 29 Aug 2014 17:34:24 +0000 (17:34 +0000)]
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
Jean-Michel Trivi [Fri, 29 Aug 2014 17:21:43 +0000 (17:21 +0000)]
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
Jean-Michel Trivi [Fri, 29 Aug 2014 17:08:50 +0000 (17:08 +0000)]
am
f0336eb8: am
2cb287f9: am
9ea996a3: Do not restore the media button event receiver
* commit '
f0336eb87d32414eb14865044be41ea590e7a6ac':
Do not restore the media button event receiver
Jean-Michel Trivi [Fri, 29 Aug 2014 16:54:22 +0000 (16:54 +0000)]
am
2cb287f9: am
9ea996a3: Do not restore the media button event receiver
* commit '
2cb287f9cc79b0cd9e8ea37adf4b3411253eb244':
Do not restore the media button event receiver
Jean-Michel Trivi [Fri, 29 Aug 2014 16:41:10 +0000 (16:41 +0000)]
am
9ea996a3: Do not restore the media button event receiver
* commit '
9ea996a330a21af89f308bdf52e02a470643013b':
Do not restore the media button event receiver
Deepanshu Gupta [Tue, 19 Aug 2014 23:15:37 +0000 (16:15 -0700)]
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Bug: http://b.android.com/74072
Change-Id: Ib84906d86772ac3df2407e71ad2167797bec4542
(cherry picked from commit
c9cd725f1013bed27e6f6594b176c10a6a4c0f16)
Deepanshu Gupta [Tue, 19 Aug 2014 23:15:37 +0000 (16:15 -0700)]
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Bug: http://b.android.com/74072
Change-Id: Ib84906d86772ac3df2407e71ad2167797bec4542
(cherry picked from commit
c9cd725f1013bed27e6f6594b176c10a6a4c0f16)
Deepanshu Gupta [Tue, 19 Aug 2014 23:15:37 +0000 (16:15 -0700)]
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Bug: http://b.android.com/74072
Change-Id: Ib84906d86772ac3df2407e71ad2167797bec4542
(cherry picked from commit
c9cd725f1013bed27e6f6594b176c10a6a4c0f16)
Deepanshu Gupta [Sat, 9 Aug 2014 21:14:45 +0000 (14:14 -0700)]
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)
Deepanshu Gupta [Sat, 9 Aug 2014 21:14:45 +0000 (14:14 -0700)]
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)
Deepanshu Gupta [Sat, 9 Aug 2014 21:14:45 +0000 (14:14 -0700)]
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)
Jean-Michel Trivi [Mon, 25 Aug 2014 18:23:36 +0000 (11:23 -0700)]
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
Deepanshu Gupta [Wed, 6 Aug 2014 22:30:06 +0000 (22:30 +0000)]
am
ba31d628: am
db94ea9e: am
f970d2c2: am
79c3f678: am
206c691b: am
72cf03a2: am
3a544a81: resolved conflicts for merge of
a232a68d to jb-mr1.1-docs
* commit '
ba31d628621f3d49195d141dabff30a7665f3b50':
Fix SystemProperties in LayoutLib.
Deepanshu Gupta [Wed, 6 Aug 2014 22:25:50 +0000 (22:25 +0000)]
am
db94ea9e: am
f970d2c2: am
79c3f678: am
206c691b: am
72cf03a2: am
3a544a81: resolved conflicts for merge of
a232a68d to jb-mr1.1-docs
* commit '
db94ea9ed03dbaa0ca075a433a986d7e414e8f8d':
Fix SystemProperties in LayoutLib.
Deepanshu Gupta [Wed, 6 Aug 2014 22:21:54 +0000 (22:21 +0000)]
am
f970d2c2: am
79c3f678: am
206c691b: am
72cf03a2: am
3a544a81: resolved conflicts for merge of
a232a68d to jb-mr1.1-docs
* commit '
f970d2c201649843b8d51d094b865f16b15bc0bc':
Fix SystemProperties in LayoutLib.
Deepanshu Gupta [Wed, 6 Aug 2014 22:18:04 +0000 (22:18 +0000)]
am
79c3f678: am
206c691b: am
72cf03a2: am
3a544a81: resolved conflicts for merge of
a232a68d to jb-mr1.1-docs
* commit '
79c3f678d21f6b3c058623217cbe5dd57a553fe8':
Fix SystemProperties in LayoutLib.
Deepanshu Gupta [Wed, 6 Aug 2014 22:13:18 +0000 (22:13 +0000)]
am
206c691b: am
72cf03a2: am
3a544a81: resolved conflicts for merge of
a232a68d to jb-mr1.1-docs
* commit '
206c691bfdb3a6b78d35c7481365980dd387b8c9':
Fix SystemProperties in LayoutLib.
Deepanshu Gupta [Wed, 6 Aug 2014 22:09:13 +0000 (22:09 +0000)]
am
72cf03a2: am
3a544a81: resolved conflicts for merge of
a232a68d to jb-mr1.1-docs
* commit '
72cf03a27a73e91d4a3eabf74e0384b310f4a5b2':
Fix SystemProperties in LayoutLib.
Deepanshu Gupta [Wed, 6 Aug 2014 22:05:38 +0000 (22:05 +0000)]
am
3a544a81: resolved conflicts for merge of
a232a68d to jb-mr1.1-docs
* commit '
3a544a81b3d2d529b2995f4b5db2077760d440b5':
Fix SystemProperties in LayoutLib.
Deepanshu Gupta [Wed, 6 Aug 2014 22:00:14 +0000 (15:00 -0700)]
resolved conflicts for merge of
a232a68d to jb-mr1.1-docs
Change-Id: I1ea220e3e0a81880db68abab87beab56dc4a336c
Deepanshu Gupta [Wed, 6 Aug 2014 21:41:02 +0000 (14:41 -0700)]
resolved conflicts for merge of
5476cfee to jb-mr1-dev
Change-Id: I5197271e6fdd36fed9ca9f9b7221d9a99141a4b4
Deepanshu Gupta [Wed, 6 Aug 2014 21:28:24 +0000 (21:28 +0000)]
am
505c675c: Fix SystemProperties in LayoutLib.
* commit '
505c675c3a536ac7c6ad264eb62542537532119c':
Fix SystemProperties in LayoutLib.
Deepanshu Gupta [Wed, 6 Aug 2014 00:33:35 +0000 (17:33 -0700)]
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
Deepanshu Gupta [Fri, 18 Jul 2014 22:22:24 +0000 (22:22 +0000)]
am
b9efa1e5: am
14a4e69c: am
c7351974: (-s ours) am
a3966c66: am
62743940: am
8c71ff29: am
87234e85: am
9c48ab82: am
ccf7b2aa: am
5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]
* commit '
b9efa1e5a11d1542d0bab9c945ce1e920b819764':
Fix style resolution for styles with '.' [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 22:17:00 +0000 (22:17 +0000)]
am
14a4e69c: am
c7351974: (-s ours) am
a3966c66: am
62743940: am
8c71ff29: am
87234e85: am
9c48ab82: am
ccf7b2aa: am
5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]
* commit '
14a4e69cc656b60c705d2f05229aed2a7049693c':
Fix style resolution for styles with '.' [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 22:12:02 +0000 (22:12 +0000)]
am
c7351974: (-s ours) am
a3966c66: am
62743940: am
8c71ff29: am
87234e85: am
9c48ab82: am
ccf7b2aa: am
5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]
* commit '
c735197420948ffff757dbe6d00028a87ed09c15':
Fix style resolution for styles with '.' [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 22:07:40 +0000 (22:07 +0000)]
am
a3966c66: am
62743940: am
8c71ff29: am
87234e85: am
9c48ab82: am
ccf7b2aa: am
5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]
* commit '
a3966c66ee24109ca4b71f591f0d740ee37987de':
Fix style resolution for styles with '.' [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 22:01:45 +0000 (22:01 +0000)]
am
62743940: am
8c71ff29: am
87234e85: am
9c48ab82: am
ccf7b2aa: am
5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]
* commit '
627439401ec86a083eefdc61728d6aa75ce9a4e5':
Fix style resolution for styles with '.' [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 21:58:42 +0000 (21:58 +0000)]
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]
Deepanshu Gupta [Fri, 18 Jul 2014 21:57:16 +0000 (21:57 +0000)]
am
2df48bed: am
1bdfeadb: am
610341b3: (-s ours) am
95bbeb96: am
b8e4e8e1: am
d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
2df48bed6afed4958835b8bdc2c8b44db32919fc':
Fix style resolution for styles with '.' [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 21:55:21 +0000 (21:55 +0000)]
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]
Deepanshu Gupta [Fri, 18 Jul 2014 21:53:15 +0000 (21:53 +0000)]
am
aa0c1c75: am
e83fa180: am
696eb4da: (-s ours) am
c39916f7: am
37f54f4c: am
357ebfc5: Fix default level flags for bidi. [DO NOT MERGE]
* commit '
aa0c1c755c15fec30f005d53bed6091180c4e521':
Fix default level flags for bidi. [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 21:53:11 +0000 (21:53 +0000)]
am
1bdfeadb: am
610341b3: (-s ours) am
95bbeb96: am
b8e4e8e1: am
d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
1bdfeadb61343a5331fcfda06b40a0e3042a2ae6':
Fix style resolution for styles with '.' [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 21:50:15 +0000 (21:50 +0000)]
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]
Deepanshu Gupta [Fri, 18 Jul 2014 21:49:13 +0000 (21:49 +0000)]
am
e83fa180: am
696eb4da: (-s ours) am
c39916f7: am
37f54f4c: am
357ebfc5: Fix default level flags for bidi. [DO NOT MERGE]
* commit '
e83fa180a874fb9222ae8e87c0d333411decc0c7':
Fix default level flags for bidi. [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 21:49:11 +0000 (21:49 +0000)]
am
610341b3: (-s ours) am
95bbeb96: am
b8e4e8e1: am
d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
610341b3eb99ef2f070c96d60ca30c28283f1dea':
Fix style resolution for styles with '.' [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 21:45:28 +0000 (21:45 +0000)]
am
ccf7b2aa: am
5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]
* commit '
ccf7b2aac600b6069f03f7f420872b64cc5e6726':
Fix style resolution for styles with '.' [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 21:45:20 +0000 (21:45 +0000)]
am
85c7b209: am
5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev
* commit '
85c7b209c3babea164f5bec13352e7f5f262ea58':
Fix style resolution for styles with '.' [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 21:45:19 +0000 (21:45 +0000)]
am
95bbeb96: am
b8e4e8e1: am
d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
95bbeb967243d453bf793cd06dd2dd914667fee9':
Fix style resolution for styles with '.' [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 21:44:11 +0000 (21:44 +0000)]
am
696eb4da: (-s ours) am
c39916f7: am
37f54f4c: am
357ebfc5: Fix default level flags for bidi. [DO NOT MERGE]
* commit '
696eb4da44097693a18e99e1f38d062ac1f0e147':
Fix default level flags for bidi. [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 21:41:18 +0000 (21:41 +0000)]
am
b8e4e8e1: am
d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
b8e4e8e1f4fb1139368dc3f36e2d7bcf59dc32e9':
Fix style resolution for styles with '.' [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 21:39:35 +0000 (21:39 +0000)]
am
5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]
* commit '
5af7324ace4f318d7395b680beabec7a0f0e39b3':
Fix style resolution for styles with '.' [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 21:39:33 +0000 (21:39 +0000)]
am
c39916f7: am
37f54f4c: am
357ebfc5: Fix default level flags for bidi. [DO NOT MERGE]
* commit '
c39916f7dadb2f8be2e7523c5ceade9f04a94e1e':
Fix default level flags for bidi. [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 21:39:25 +0000 (21:39 +0000)]
am
5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev
* commit '
5efee91e12420e59214946c526f80961738a9c1d':
Fix style resolution for styles with '.' [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 21:38:39 +0000 (21:38 +0000)]
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]
Deepanshu Gupta [Fri, 18 Jul 2014 21:36:29 +0000 (21:36 +0000)]
am
918ca12f: am
10395cbb: Fix default level flags for bidi. [DO NOT MERGE]
* commit '
918ca12ffc09a96194112edf3540d94c32918a07':
Fix default level flags for bidi. [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 21:35:21 +0000 (21:35 +0000)]
am
37f54f4c: am
357ebfc5: Fix default level flags for bidi. [DO NOT MERGE]
* commit '
37f54f4c1e2d97b33bdd8abe5f196debecc5437d':
Fix default level flags for bidi. [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 21:31:33 +0000 (21:31 +0000)]
am
10395cbb: Fix default level flags for bidi. [DO NOT MERGE]
* commit '
10395cbb5cdec35a0ebee1d0b18b58c4803092a1':
Fix default level flags for bidi. [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 21:31:26 +0000 (21:31 +0000)]
am
357ebfc5: Fix default level flags for bidi. [DO NOT MERGE]
* commit '
357ebfc5e43ecb35da9207d78a9a8a6c117a1002':
Fix default level flags for bidi. [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 21:33:40 +0000 (21:33 +0000)]
Merge "Fix style resolution for styles with '.' [DO NOT MERGE]" into jb-mr2-dev