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

92124 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
3f4d1bbddb am 52a37bf8: am 1d21aeca: am 148ce232: Merge "delete obsolete tips/references to cupcake" into jb-mr1.1-docs 
* commit '52a37bf8ab96c8ef897c4c35e33b4bbe6513de9f':
  delete obsolete tips/references to cupcake
 2013-05-08 13:01:51 -07:00
Scott Main
52a37bf8ab am 1d21aeca: am 148ce232: Merge "delete obsolete tips/references to cupcake" into jb-mr1.1-docs 
* commit '1d21aeca286cb3993ed758fd111a7d945687ed96':
  delete obsolete tips/references to cupcake
 2013-05-08 12:59:29 -07:00
Scott Main
1d21aeca28 am 148ce232: Merge "delete obsolete tips/references to cupcake" into jb-mr1.1-docs 
* commit '148ce2322c5ce119b2dc6881d60dc60f8c336bfa':
  delete obsolete tips/references to cupcake
 2013-05-08 12:56:53 -07:00
Scott Main
148ce2322c Merge "delete obsolete tips/references to cupcake" into jb-mr1.1-docs 2013-05-08 19:50:53 +00:00
Xavier Ducrohet
1181564fc4 am 42fb3abd: DO NOT MERGE. cherrypick from I3653f67ee321eac37cb8a6d228b1ef6d104ff0be 
* commit '42fb3abd4b7463626983c1a2768788c901f2e71a':
  DO NOT MERGE. cherrypick from I3653f67ee321eac37cb8a6d228b1ef6d104ff0be
 2013-05-07 16:03:31 -07:00
Xavier Ducrohet
42fb3abd4b DO NOT MERGE. cherrypick from I3653f67ee321eac37cb8a6d228b1ef6d104ff0be 
Add single crunch command to aapt. do not merge.

Previously the crunch command would work on a full res folder
and output a full res folder (with only the drawables). This
was only used in the SDK.

The incremental logic is moved to the SDK build system so we
change the crunch command (or rather add a new one) to only
crunch a single file.

(cherry picked from commit b1f6ad82dd8d1702617a757a88430604b3131fac)

Change-Id: Ifa0dceed93708658f950322f36c13b6ebe7ab0f3
 2013-05-07 15:37:46 -07:00
Scott Main
b80b4bfdae am 3c8ecd30: am b2606b3f: am c98612a9: some more search tags 
* commit '3c8ecd30b41511b84c13c341e2b471a81e19e875':
  some more search tags
 2013-05-07 10:19:04 -07:00
Scott Main
3c8ecd30b4 am b2606b3f: am c98612a9: some more search tags 
* commit 'b2606b3fe8906fb14db07b5dc099ff0b52db4c29':
  some more search tags
 2013-05-07 10:16:40 -07:00
Scott Main
b2606b3fe8 am c98612a9: some more search tags 
* commit 'c98612a9b2293f8ae29389dd484d7b384c7d37ad':
  some more search tags
 2013-05-07 10:15:11 -07:00
Scott Main
c98612a9b2 some more search tags 
Change-Id: Id48d3214619e5d860e39e8f1d9d814e17956feb1
 2013-05-07 10:13:07 -07:00
Dirk Dougherty
2e52e815b0 am 6b6fd9d1: am 36aa2759: am b582c678: Doc change: delete legacy intl dir and update toc\'s for devsite-compatible lang strings. 
* commit '6b6fd9d1f0c829b1bd23c776b98f564848731ea2':
  Doc change: delete legacy intl dir and update toc's for devsite-compatible lang strings.
 2013-05-06 18:44:53 -07:00
Dirk Dougherty
6b6fd9d1f0 am 36aa2759: am b582c678: Doc change: delete legacy intl dir and update toc\'s for devsite-compatible lang strings. 
* commit '36aa2759998cbfff7e5baff8b422cbeebd95d5db':
  Doc change: delete legacy intl dir and update toc's for devsite-compatible lang strings.
 2013-05-06 18:43:20 -07:00
Dirk Dougherty
36aa275999 am b582c678: Doc change: delete legacy intl dir and update toc\'s for devsite-compatible lang strings. 
* commit 'b582c678c88df2848023b7f27f4bc0ab2249e1e1':
  Doc change: delete legacy intl dir and update toc's for devsite-compatible lang strings.
 2013-05-06 18:41:31 -07:00
Dirk Dougherty
b582c678c8 Doc change: delete legacy intl dir and update toc's for devsite-compatible lang strings. 
Change-Id: Ie390d2bbd8abc0d063c1f313797e8c3d21d27490
 2013-05-06 18:38:24 -07:00
Scott Main
13ae720b46 am e7ae74f1: am 5bde4bc5: am 1cd65b30: delete a few unused/obsolete files and add redirects 
* commit 'e7ae74f1b890035ad1a8efdb9292f1dcd83aa3e2':
  delete a few unused/obsolete files and add redirects
 2013-05-06 17:20:59 -07:00
Scott Main
e7ae74f1b8 am 5bde4bc5: am 1cd65b30: delete a few unused/obsolete files and add redirects 
* commit '5bde4bc5c7ea442a5940658d17a03f1a5010450c':
  delete a few unused/obsolete files and add redirects
 2013-05-06 17:18:57 -07:00
Scott Main
5bde4bc5c7 am 1cd65b30: delete a few unused/obsolete files and add redirects 
* commit '1cd65b30904b07ae4226a6e438647ee3b63d7950':
  delete a few unused/obsolete files and add redirects
 2013-05-06 17:16:26 -07:00
Scott Main
1cd65b3090 delete a few unused/obsolete files and add redirects 
Change-Id: Icbcb0f042ac5f05d17d42be4c5c122316e93b866
 2013-05-06 16:51:39 -07:00
Scott Main
c89312091e delete obsolete tips/references to cupcake 
Change-Id: Ib1ddb19c42840aa830acd85a89e78c149e2f66e9
 2013-05-06 16:38:42 -07:00
Christopher Tate
04d6141033 am dfb33b86: am fcfc99c0: am f7918b4a: am d3a57029: am 1b0c9c95: am 81c1d8d3: Ensure install-during-restore is like install-then-restore 
* commit 'dfb33b860f0c936d8af6555835da0ef1aea6c870':
  Ensure install-during-restore is like install-then-restore
 2013-05-06 15:16:03 -07:00
Christopher Tate
dfb33b860f am fcfc99c0: am f7918b4a: am d3a57029: am 1b0c9c95: am 81c1d8d3: Ensure install-during-restore is like install-then-restore 
* commit 'fcfc99c064f0b91fa419784bd90bb9944b9ab9f4':
  Ensure install-during-restore is like install-then-restore
 2013-05-06 15:14:27 -07:00
Christopher Tate
fcfc99c064 am f7918b4a: am d3a57029: am 1b0c9c95: am 81c1d8d3: Ensure install-during-restore is like install-then-restore 
* commit 'f7918b4a1e06350ba4d69fe47327db830cd4e8ba':
  Ensure install-during-restore is like install-then-restore
 2013-05-06 15:12:07 -07:00
Christopher Tate
f7918b4a1e am d3a57029: am 1b0c9c95: am 81c1d8d3: Ensure install-during-restore is like install-then-restore 
* commit 'd3a57029e80073aa3c7dfe1dbc8945d32968f6ae':
  Ensure install-during-restore is like install-then-restore
 2013-05-06 15:00:53 -07:00
Christopher Tate
d3a57029e8 am 1b0c9c95: am 81c1d8d3: Ensure install-during-restore is like install-then-restore 
* commit '1b0c9c95dc72ebeb8af73bc3ff44c313ebd788f4':
  Ensure install-during-restore is like install-then-restore
 2013-05-06 14:59:40 -07:00
Christopher Tate
1b0c9c95dc am 81c1d8d3: Ensure install-during-restore is like install-then-restore 
* commit '81c1d8d3a5aef6a423f0bb02de1b362b2f2d12df':
  Ensure install-during-restore is like install-then-restore
 2013-05-06 14:53:10 -07:00
Christopher Tate
81c1d8d3a5 Ensure install-during-restore is like install-then-restore 
When we've installed an apk from the archive, recheck whether
to apply the system-uid policy restrictions around file system
restores.

Bug 8833099

(cherry picked from commit 2baf6dcfcf7fc1705db25e64dc0cb11fa3509d39)

Change-Id: I972fe1543f2234aa76baf562d6f806175ac0248e
 2013-05-06 14:43:05 -07:00
Dirk Dougherty
79ebe80a85 am e34ecc9a: am 3dbb173e: am c3a7ea42: Doc change: Update landing pages for Google Play Services. 
* commit 'e34ecc9a06f4a626cc78c648e621c4b7bb4a1242':
  Doc change: Update landing pages for Google Play Services.
 2013-05-04 10:32:46 -07:00
Dirk Dougherty
e34ecc9a06 am 3dbb173e: am c3a7ea42: Doc change: Update landing pages for Google Play Services. 
* commit '3dbb173e8d9ae7893a10a76b1b7fed66f1adb25b':
  Doc change: Update landing pages for Google Play Services.
 2013-05-04 10:30:55 -07:00
Dirk Dougherty
3dbb173e8d am c3a7ea42: Doc change: Update landing pages for Google Play Services. 
* commit 'c3a7ea424d96aac02762ab6819429e3fa52d9a25':
  Doc change: Update landing pages for Google Play Services.
 2013-05-04 10:29:01 -07:00
Dirk Dougherty
c3a7ea424d Doc change: Update landing pages for Google Play Services. 
Change-Id: I7cfc64928e7a2b195ed52febc6f7b652d85e9c56
 2013-05-03 18:50:11 -07:00
quddusc
564a533e8a am 66442b56: am 775deb88: am 9af97443: Merge "docs: Added landing page for Google Play Games Platform Services. cherrypick from jb-mr1-dev docs: Play Games changes Change-Id: I5117db8511907e05ddc84005bf6903251de46f71" into jb-mr1.1-docs 
* commit '66442b566f51edb41f8d18f702c219c4a4c8c3df':
  docs: Added landing page for Google Play Games Platform Services. cherrypick from jb-mr1-dev docs:  Play Games changes Change-Id: I5117db8511907e05ddc84005bf6903251de46f71
 2013-05-03 11:50:04 -07:00
quddusc
66442b566f am 775deb88: am 9af97443: Merge "docs: Added landing page for Google Play Games Platform Services. cherrypick from jb-mr1-dev docs: Play Games changes Change-Id: I5117db8511907e05ddc84005bf6903251de46f71" into jb-mr1.1-docs 
* commit '775deb88945e4acffba2d91a89931a426d9ca4bf':
  docs: Added landing page for Google Play Games Platform Services. cherrypick from jb-mr1-dev docs:  Play Games changes Change-Id: I5117db8511907e05ddc84005bf6903251de46f71
 2013-05-03 11:47:19 -07:00
quddusc
775deb8894 am 9af97443: Merge "docs: Added landing page for Google Play Games Platform Services. cherrypick from jb-mr1-dev docs: Play Games changes Change-Id: I5117db8511907e05ddc84005bf6903251de46f71" into jb-mr1.1-docs 
* commit '9af9744319f389b6583b8c39ea65bf90afc10fe5':
  docs: Added landing page for Google Play Games Platform Services. cherrypick from jb-mr1-dev docs:  Play Games changes Change-Id: I5117db8511907e05ddc84005bf6903251de46f71
 2013-05-03 11:45:08 -07:00
quddusc
9af9744319 Merge "docs: Added landing page for Google Play Games Platform Services. cherrypick from jb-mr1-dev docs: Play Games changes Change-Id: I5117db8511907e05ddc84005bf6903251de46f71" into jb-mr1.1-docs 2013-05-03 18:42:44 +00:00
quddusc
e4fde740c5 docs: Added landing page for Google Play Games Platform Services. 
cherrypick from jb-mr1-dev docs:  Play Games changes Change-Id: I5117db8511907e05ddc84005bf6903251de46f71

Change-Id: I0e5e2c69fc0d13b0637504e5fd3e76c1a91a0109
 2013-05-01 18:27:39 -07:00
Scott Main
95fa442817 am 1fbbf8ca: am 4bc82dea: am 47dcb666: dashboard update for 5/1 
* commit '1fbbf8caaf5bb3c796fa2acacedfb7a3be4d0c73':
  dashboard update for 5/1
 2013-05-01 14:28:40 -07:00
Scott Main
1fbbf8caaf am 4bc82dea: am 47dcb666: dashboard update for 5/1 
* commit '4bc82dea43c3e60ce6ad244fdd6b8e61396b1118':
  dashboard update for 5/1
 2013-05-01 14:27:12 -07:00
Scott Main
4bc82dea43 am 47dcb666: dashboard update for 5/1 
* commit '47dcb66610fbe9284f83f73a06a5c23515e17fbd':
  dashboard update for 5/1
 2013-05-01 14:26:05 -07:00
Adam Koch
58a6e5c0d1 am 4f221669: am 1d71751f: am bbed0513: Contacts Provider Training - fix minor code snippet typos. 
* commit '4f2216691a3df241977f39102b7eafc68556f477':
  Contacts Provider Training - fix minor code snippet typos.
 2013-05-01 13:14:49 -07:00
Adam Koch
4f2216691a am 1d71751f: am bbed0513: Contacts Provider Training - fix minor code snippet typos. 
* commit '1d71751fc20a2c52e04656af409fa97a6f7c15c5':
  Contacts Provider Training - fix minor code snippet typos.
 2013-05-01 13:13:02 -07:00
Adam Koch
1d71751fc2 am bbed0513: Contacts Provider Training - fix minor code snippet typos. 
* commit 'bbed0513abb1d98733f0eed5399f4cb195fda55f':
  Contacts Provider Training - fix minor code snippet typos.
 2013-05-01 11:52:26 -07:00
Scott Main
47dcb66610 dashboard update for 5/1 
Change-Id: I9cdcf2934a5332fee50067e0b6f8f3f159373892
 2013-05-01 10:32:47 -07:00
Adam Koch
bbed0513ab Contacts Provider Training - fix minor code snippet typos. 
Change-Id: I3edf86d276d877914a3d97e596e1bb35d1b1ce1f
 2013-05-01 12:21:20 -04:00
Nick Kralevich
0412d9c7c7 am 4d17834a: am b83e8b69: am 292c979a: am d440ca76: am f3a5323c: am 6d8f5b75: libdrm: fix bad strncpy / snprintf calls 
* commit '4d17834ab3d4850352f3d33742945dad61722cd5':
  libdrm: fix bad strncpy / snprintf calls
 2013-04-29 15:48:05 -07:00
Nick Kralevich
4d17834ab3 am b83e8b69: am 292c979a: am d440ca76: am f3a5323c: am 6d8f5b75: libdrm: fix bad strncpy / snprintf calls 
* commit 'b83e8b693b6738ba8e778d556ccdba629d372b52':
  libdrm: fix bad strncpy / snprintf calls
 2013-04-29 15:46:21 -07:00
Nick Kralevich
b83e8b693b am 292c979a: am d440ca76: am f3a5323c: am 6d8f5b75: libdrm: fix bad strncpy / snprintf calls 
* commit '292c979a0f1e503422924421557b146cd28fc0d2':
  libdrm: fix bad strncpy / snprintf calls
 2013-04-29 15:44:43 -07:00
Nick Kralevich
292c979a0f am d440ca76: am f3a5323c: am 6d8f5b75: libdrm: fix bad strncpy / snprintf calls 
* commit 'd440ca76029ab6f0909fdd9495941e04b90e5da7':
  libdrm: fix bad strncpy / snprintf calls
 2013-04-29 15:42:54 -07:00
Nick Kralevich
d440ca7602 am f3a5323c: am 6d8f5b75: libdrm: fix bad strncpy / snprintf calls 
* commit 'f3a5323cc685fd78e7c4a7d7474b79cd34a4cf52':
  libdrm: fix bad strncpy / snprintf calls
 2013-04-29 15:41:36 -07:00
Nick Kralevich
f3a5323cc6 am 6d8f5b75: libdrm: fix bad strncpy / snprintf calls 
* commit '6d8f5b755b133b308204b84145d773d401cdcd52':
  libdrm: fix bad strncpy / snprintf calls
 2013-04-29 15:38:40 -07:00
Nick Kralevich
6d8f5b755b libdrm: fix bad strncpy / snprintf calls 
Fix the following bugs reported by IOActive:
* GOOGLE-AN01 - Android libdrm drm_parseDM.c Boundary-CRLF Buffer Overflow
* GOOGLE-AN02 - Android libdrm 'drm_parseDM.c' contentType-CRLF Buffer Overflow
* GOOGLE-AN03 - Android libdrm drm_parseDM.c contentID-CRLF Buffer Overflow
* GOOGLE-AN04 - Android libdrm 'parser_dcf.c' Multiple Headers Buffer Overflow
* GOOGLE-AN05 - Android libdrm 'parser_dcf.c' ContentType Buffer Overflow

Bug: 8727221

(cherry picked from commit 25619b2c6b3fd584affe20f34bfbf164a5ddbe7d)

Change-Id: I9a99c9b8a63c8b9efb3b2b650c735467b77120f2
 2013-04-29 15:31:03 -07:00