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

122731 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Fernandez
02480cbffa am 1b12b1dc: Merge "docs: remove bad link in the quick view box for TV Recommendations #2" into klp-modular-docs 
* commit '1b12b1dc6f0203913ceb0a88dcf5ef1639fe6515':
  docs: remove bad link in the quick view box for TV Recommendations #2
 2014-09-12 23:42:04 +00:00
Joe Fernandez
1b12b1dc6f Merge "docs: remove bad link in the quick view box for TV Recommendations #2" into klp-modular-docs 2014-09-12 23:28:54 +00:00
Joe Fernandez
b813f16c47 docs: remove bad link in the quick view box for TV Recommendations #2 
Change-Id: I649d8d735bda2b0c657217bc86c1a29a2d7eddc2
 2014-09-12 16:24:01 -07:00
kmccormick
f530df1c7e am 7392152b: Doc Update: update Cloud Platform link 
* commit '7392152ba21917aff15db89988e1317819b5dd72':
  Doc Update: update Cloud Platform link
 2014-09-12 18:49:18 +00:00
kmccormick
7392152ba2 Doc Update: update Cloud Platform link 
Fix for:

b/17411644

Change-Id: I3893ed25d7b058e2635a56113af74d20284688af
 2014-09-11 18:26:15 -07:00
Jon Larimer
d65ab58705 am e2b12b1f: am 61c6ff7b: Merge "Fix issue #16794553: Duplicate ArrayMap entries in Bundle..." into klp-dev 
* commit 'e2b12b1fbc2880bf895fa2a9adcf65de3162c28f':
  Fix issue #16794553: Duplicate ArrayMap entries in Bundle...
 2014-09-11 16:33:07 +00:00
Jon Larimer
e2b12b1fbc am 61c6ff7b: Merge "Fix issue #16794553: Duplicate ArrayMap entries in Bundle..." into klp-dev 
* commit '61c6ff7b70e2d42b44d5c5f9c3c8e3c67b584a76':
  Fix issue #16794553: Duplicate ArrayMap entries in Bundle...
 2014-09-11 16:23:39 +00:00
Jon Larimer
61c6ff7b70 Merge "Fix issue #16794553: Duplicate ArrayMap entries in Bundle..." into klp-dev 2014-09-11 16:15:25 +00:00
Jean-Michel Trivi
4fa904aba2 am 9513f81e: am 24499ba7: am e1f07060: (-s ours) am e825f0ee: am 60f22fbf: Do not restore the media button event receiver 
* commit '9513f81e33bc0da445735257c8de11a38f3775fa':
  Do not restore the media button event receiver
 2014-09-11 04:23:21 +00:00
Jean-Michel Trivi
9513f81e33 am 24499ba7: am e1f07060: (-s ours) am e825f0ee: am 60f22fbf: Do not restore the media button event receiver 
* commit '24499ba7ff79c8fa2ea9e02256366c43e78f66c0':
  Do not restore the media button event receiver
 2014-09-11 04:16:10 +00:00
Jean-Michel Trivi
24499ba7ff am e1f07060: (-s ours) am e825f0ee: am 60f22fbf: Do not restore the media button event receiver 
* commit 'e1f07060b8c94cc02309172fb9fb8cd4bd0e35f7':
  Do not restore the media button event receiver
 2014-09-11 00:51:32 +00:00
Ricardo Cervera
4232a59b08 am d086db30: Merge "cherrypick from klp-modular-dev docs: Added note on disabling debugging for WebView apps. Bug: 16232761 Change-Id: I6cdc2ef7da87e78ec42a456d232a8e46a26c7365" into klp-modular-docs 
* commit 'd086db30d0f097f34eae0a9a3d443e11cc230d62':
  cherrypick from klp-modular-dev docs: Added note on disabling debugging for WebView apps. Bug: 16232761 Change-Id: I6cdc2ef7da87e78ec42a456d232a8e46a26c7365
 2014-09-11 00:06:13 +00:00
Ricardo Cervera
02afa7348b am a6c12f01: Merge "docs: Fixed minor bug in downloads class. Bug: 16948533" into klp-modular-docs 
* commit 'a6c12f0189c92b556fd7c3af3d8466d9b6d828c9':
  docs: Fixed minor bug in downloads class. Bug: 16948533
 2014-09-11 00:06:10 +00:00
Ricardo Cervera
d086db30d0 Merge "cherrypick from klp-modular-dev docs: Added note on disabling debugging for WebView apps. Bug: 16232761 Change-Id: I6cdc2ef7da87e78ec42a456d232a8e46a26c7365" into klp-modular-docs 2014-09-10 23:57:47 +00:00
Ricardo Cervera
a6c12f0189 Merge "docs: Fixed minor bug in downloads class. Bug: 16948533" into klp-modular-docs 2014-09-10 23:57:16 +00:00
Dianne Hackborn
92a5b0d59f Fix issue #16794553: Duplicate ArrayMap entries in Bundle... 
...can lead to launching of un-exported activities

We now validate the array map after unparcelling to make sure there
are no duplicate keys.

And to make up for the performance overhead this introduces, I switched
the parcelling/unparcelling code to write keys as explicit string
objects rather than generic values.  There was no reason to use generic
values since the write method itself only accepts an array map with
String keys.

Change-Id: I57bda9eb79ceaaa9c1b94ad49d9e462b52102149
(cherry picked from commit cee4cdad307071a8ff9a3e2189bf9e6fcc417222)
 2014-09-10 21:55:27 +00:00
Jean-Michel Trivi
e1f07060b8 am e825f0ee: am 60f22fbf: Do not restore the media button event receiver 
* commit 'e825f0eec571831ceb60e65ec7e2a6b1ed7be5bd':
  Do not restore the media button event receiver
 2014-09-10 20:59:32 +00: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
Robert Ly
5debe44b88 am 0743bca5: docs: add 64k method limit note 
* commit '0743bca58961582078f4e8199fe9a6fa044036eb':
  docs: add 64k method limit note
 2014-09-10 18:04:16 +00:00
Robert Ly
0743bca589 docs: add 64k method limit note 
Change-Id: I6590fc996331c1f2024276d338c4035f2cb0f18d
 2014-09-10 10:50:46 -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
Robert Ly
9f60bc3f12 am 52a18161: docs: update api dashboard for september 
* commit '52a1816180c7a85b13c543a5cdb6a7506cb8f01d':
  docs: update api dashboard for september
 2014-09-09 23:40:51 +00:00
Robert Ly
52a1816180 docs: update api dashboard for september 
Change-Id: Icae4efd0729b61c0f6c1850da641bc065bc12122
 2014-09-09 16:28:08 -07:00
Dirk Dougherty
604ae4c79e am 552e5ce6: Merge "Doc change: Add note to use explicit intent when binding to billing service." into klp-modular-docs 
* commit '552e5ce6bb418b9a8b3b1ba9c102c562d0a4019e':
  Doc change: Add note to use explicit intent when binding to billing service.
 2014-09-08 23:53:32 +00:00
Dirk Dougherty
552e5ce6bb Merge "Doc change: Add note to use explicit intent when binding to billing service." into klp-modular-docs 2014-09-08 23:46:56 +00:00
Robert Ly
aa19f1fccb am b5a21ad3: Revert "Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html"" 
* commit 'b5a21ad3fba1d8d3b096a0d685d71c148fefa11b':
  Revert "Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html""
 2014-09-08 22:43:42 +00:00
Robert Ly
b5a21ad3fb Revert "Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html"" 
This reverts commit 4186379a2a37123d31ce5d1aff1facc8e7dfbfd3.

Change-Id: I34a7b8689362053c0ad8124eaa3f40a5c282bc80
 2014-09-08 22:30:09 +00:00
David Friedman
3207948444 am 4186379a: Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html" 
* commit '4186379a2a37123d31ce5d1aff1facc8e7dfbfd3':
  Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html"
 2014-09-08 22:13:09 +00:00
David Friedman
7e8786d975 am c6142d97: NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html 
* commit 'c6142d97d79bc6a5ce2bb77fce9ae5d988f49542':
  NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html
 2014-09-08 22:13:05 +00:00
David Friedman
4186379a2a Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html" 
This reverts commit c6142d97d79bc6a5ce2bb77fce9ae5d988f49542.

Change-Id: Idc6fde822bf42300897d96fc934a94e6b9418d76
 2014-09-08 21:58:22 +00:00
David Friedman
c6142d97d7 NDKr10b changes to be published to DAC NDK page. 
Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html

Change-Id: I559068eb1567bc03f69cadade5073f419635ad69
 2014-09-08 11:45:27 -07:00
Wei Liu
636f3eac6d Add clear_top flag to settings action intent. 
Bug: 17200185

Change-Id: I156a8726055452b56d8ccd52010cdea8baaa79c3
 2014-09-04 21:33:20 +00:00
Deepanshu Gupta
9bfa073662 am 7119fbb6: am 4df075bc: am 057eb404: (-s ours) 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 '7119fbb63a32f4f51bf07293c0a7f5a3a32abba0':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 18:10:53 +00:00
Deepanshu Gupta
8929642ca7 am 0ff5117f: am 7055778e: am a9f56d5a: (-s ours) 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 '0ff5117fb3aebfd64ffe26ff68308632c7ceeb3d':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 18:10:50 +00:00
Deepanshu Gupta
889ec19249 am a7ce1107: am 19fa86cf: am 5384d40e: (-s ours) 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 'a7ce11070a74f7a0447f0d40d51cb0d3f95999fd':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 18:10:39 +00:00
Deepanshu Gupta
9f7c594a05 am ae6f2595: am 409e42a1: am e19464aa: (-s ours) 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 'ae6f2595206d33f04c951c2f3dfff5ede100c942':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 18:10:35 +00:00
Jean-Michel Trivi
525e552eef am 800f3ca4: am 14c8acef: am 5fb35780: 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 '800f3ca4ddf52fe46d039505266c84b0ad0234b1':
  Do not restore the media button event receiver
 2014-09-04 18:10:31 +00:00
Deepanshu Gupta
7119fbb63a am 4df075bc: am 057eb404: (-s ours) 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 '4df075bcb5770ba411b6a32c9daeac24da0597e2':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 17:59:47 +00:00
Deepanshu Gupta
0ff5117fb3 am 7055778e: am a9f56d5a: (-s ours) 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 '7055778ef5e97f6f83181a44c9b3804632f6f64e':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 17:59:44 +00:00
Deepanshu Gupta
a7ce11070a am 19fa86cf: am 5384d40e: (-s ours) 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 '19fa86cfd6fddb63715b50a4e0bc881d2ea34133':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 17:59:41 +00:00
Deepanshu Gupta
ae6f259520 am 409e42a1: am e19464aa: (-s ours) 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 '409e42a17eeedf125d012ebc3f1d91fcf5812573':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 17:59:38 +00:00
Jean-Michel Trivi
800f3ca4dd am 14c8acef: am 5fb35780: 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 '14c8acef21136a07e5e750b245874d779f410b53':
  Do not restore the media button event receiver
 2014-09-04 17:59:35 +00:00
Deepanshu Gupta
4df075bcb5 am 057eb404: (-s ours) 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 '057eb404363184b75ab0e5d3768a22126703f750':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 17:46:19 +00:00
Deepanshu Gupta
7055778ef5 am a9f56d5a: (-s ours) 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 'a9f56d5a050845703bdcfff734d9d189bec2ddec':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 17:46:15 +00:00
Deepanshu Gupta
19fa86cfd6 am 5384d40e: (-s ours) 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 '5384d40ed4ec8f3546be94e6cae7c0011ef235a5':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 17:46:11 +00:00
Deepanshu Gupta
409e42a17e am e19464aa: (-s ours) 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 'e19464aae4ba251c758f3b27601ef3470e0a8c2d':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 17:46:08 +00:00
Jean-Michel Trivi
14c8acef21 am 5fb35780: 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 '5fb35780a53c239e34aec8beccd328cad9145e3d':
  Do not restore the media button event receiver
 2014-09-04 17:46:04 +00:00
Deepanshu Gupta
057eb40436 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]
 2014-09-04 17:33:28 +00:00
Deepanshu Gupta
a9f56d5a05 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]
 2014-09-04 17:33:25 +00:00
Deepanshu Gupta
5384d40ed4 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]
 2014-09-04 17:33:21 +00:00