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

89324 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
148ce2322c Merge "delete obsolete tips/references to cupcake" into jb-mr1.1-docs 2013-05-08 19:50:53 +00:00
Scott Main
a196e34d0f update homepage with IO Live banner 
Change-Id: Ifd333287a04c426df4db2c00a1f19560c304b839
 2013-05-07 14:15:42 -07:00
Scott Main
c98612a9b2 some more search tags 
Change-Id: Id48d3214619e5d860e39e8f1d9d814e17956feb1
 2013-05-07 10:13:07 -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
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
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
c3a7ea424d Doc change: Update landing pages for Google Play Services. 
Change-Id: I7cfc64928e7a2b195ed52febc6f7b652d85e9c56
 2013-05-03 18:50:11 -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
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
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
Dirk Dougherty
bdf19c62d8 am 29743661: Doc change: fix typo in tablet guidelines. 
* commit '29743661734d8e2b7b3c33e635557c3f2ef9d8a0':
  Doc change: fix typo in tablet guidelines.
 2013-04-24 19:40:02 -07:00
Dirk Dougherty
2974366173 Doc change: fix typo in tablet guidelines. 
Change-Id: I8e947fd20783ed12d46807733c4a87ba61211e41
 2013-04-24 19:33:46 -07:00
kmccormick
fd61958f75 Doc Update: bug fix in SensorEvent ref 
"Bug: 6349093"

Change-Id: Ibd4911b6c3f17fd2cd18042665efa428231c61ab
 2013-04-24 15:52:44 -07:00
Dirk Dougherty
c0edc45fd2 am dacaad4a: Merge "Doc change: Add tablet optimization tips info/link." into jb-mr1-dev 
* commit 'dacaad4ab21bfe8d6de74d60d2ce881d2a276a9d':
  Doc change: Add tablet optimization tips info/link.
 2013-04-24 12:10:34 -07:00
Dirk Dougherty
dacaad4ab2 Merge "Doc change: Add tablet optimization tips info/link." into jb-mr1-dev 2013-04-24 19:08:42 +00:00
Dirk Dougherty
71f8127165 Doc change: Add tablet optimization tips info/link. 
Change-Id: Iee793b5fbb39e551c0df39ba4aeac40b55fb16d6
 2013-04-24 11:49:27 -07:00
Scott Main
7653fbee7e make Google IO image clickable 
Change-Id: I8638012fa6be1f104f20cf2f4dcea59787fdfd08
 2013-04-23 12:32:24 -07:00
Selim Gurun
22a946d36a am 006119bf: Merge commit \'8237dd82\' into manualmerge 
* commit '006119bf2cd0b7f0ea3d1b6b0bbbfd413262504a':
  DO NOT MERGE Fix issues during backport
 2013-04-23 12:18:47 -07:00
Selim Gurun
006119bf2c Merge commit '8237dd82' into manualmerge 
Bug: 6923539

Skipping the change. We already fixed this in master and jb-mr2-dev
in sha: 2905e18b03c6ce34739bed9c06b865b29087deea. A compatible change
was submitted to jb-dev (and so automerged to jb-mr1-dev). see sha
7918cf4e6b18ab1aa4dce1cb791bb88ec1f383d6. The conflict occurs while
merging 8237dd82bf151cb102a69243f91832be1c1294e4 which I thought was
DO NOT MERGE anyway.

Change-Id: If96e368d2e2cec98bc18069151a2ff861b53608f
 2013-04-23 11:19:12 -07:00
Dirk Dougherty
c7523804c8 am 00cfba95: Doc change: update support urls. 
* commit '00cfba95ce5ea3c081b9d7353998f80a7c6edbc9':
  Doc change: update support urls.
 2013-04-22 16:59:34 -07:00
Dirk Dougherty
00cfba95ce Doc change: update support urls. 
Change-Id: I79e93efb6adab6bc010379f66d0434afcb0fcf4f
 2013-04-22 16:37:01 -07:00
Dirk Dougherty
cca235525f am 974af93d: Doc change: update payment detail for merch account. 
* commit '974af93de950b68616aed44985720e2978db5393':
  Doc change: update payment detail for merch account.
 2013-04-22 14:22:47 -07:00
Dirk Dougherty
974af93de9 Doc change: update payment detail for merch account. 
Change-Id: I54298c010183a112776065ec894611d5de5f1cc1
 2013-04-22 14:17:36 -07:00
kmccormick
ce534905a6 Merge "Doc update: Fix firewall text." into jb-mr1.1-docs 2013-04-22 20:08:11 +00:00
Scott Main
2779da87e2 fix backup registration url 
external bug: 54539

Change-Id: I3d4e957d8b26c7462c7228a4e4755aee88d6895c
 2013-04-22 13:03:00 -07:00
kmccormick
91290d59d5 Doc update: Fix firewall text. 
Change-Id: I06c1c86f591dc82f7004b6317062580269230cda
 2013-04-22 12:28:25 -07:00
Scott Main
c3ae5cd685 Merge "delete unused download page and add a couple search tags" into jb-mr1.1-docs 2013-04-22 19:12:10 +00:00
Scott Main
e0c4bb4c22 delete unused download page and add a couple search tags 
Change-Id: I8aad4703d575e2c336129e92a2b9ef448d21a4f9
 2013-04-22 12:11:18 -07:00
Dirk Dougherty
3fd1a8926e am 94ca86e8: Merge "Doc change: updates for tablet checklist." into jb-mr1-dev 
* commit '94ca86e8a019225ff376e5683e87ee3a29713f05':
  Doc change: updates for tablet checklist.
 2013-04-20 12:01:29 -07:00
Dirk Dougherty
94ca86e8a0 Merge "Doc change: updates for tablet checklist." into jb-mr1-dev 2013-04-20 18:59:02 +00:00
Dirk Dougherty
7006b7fbc6 Doc change: updates for tablet checklist. 
Change-Id: I0339c0d3853467da435654940d0c55a31139b736
 2013-04-20 11:34:51 -07:00
Selim Gurun
a6ca0a6b26 am 758dfa0c: am 9d47e7b6: am 7918cf4e: DO NOT MERGE Add a delimiter between scheme and host 
* commit '758dfa0c33c022ab3cdeb854ab507ad218d7fa3d':
  DO NOT MERGE Add a delimiter between scheme and host
 2013-04-20 00:22:04 -07:00
Selim Gurun
5fba3404d3 am 3c4fa654: am 679c8f68: am 38915fd4: Revert "Add a delimiter between scheme and host" 
* commit '3c4fa654801fcf51a92cefd62e28a020d39e08d0':
  Revert "Add a delimiter between scheme and host"
 2013-04-20 00:22:01 -07:00
Selim Gurun
758dfa0c33 am 9d47e7b6: am 7918cf4e: DO NOT MERGE Add a delimiter between scheme and host 
* commit '9d47e7b6d40cc38fb1c638c991312a4217bfa333':
  DO NOT MERGE Add a delimiter between scheme and host
 2013-04-20 00:19:45 -07:00
Selim Gurun
3c4fa65480 am 679c8f68: am 38915fd4: Revert "Add a delimiter between scheme and host" 
* commit '679c8f689f6799d143719bb8eb839e2640bf9d07':
  Revert "Add a delimiter between scheme and host"
 2013-04-20 00:19:41 -07:00
Geremy Condra
ed1e5a8702 am b7787a31: DO NOT MERGE Merge commit \'8225df00\' into bp 
* commit 'b7787a317fc8bb163de04641a1423cd08324d4b8':
  Add a delimiter between scheme and host
 2013-04-19 21:38:06 -07:00
Scott Main
9ffe5dff76 add email links for android branding 
bug:8666523

Change-Id: Iee2fe78d7b9ab46723cc3407b9a8eede822b359c
 2013-04-19 11:52:35 -07:00
Geremy Condra
b7787a317f DO NOT MERGE Merge commit '8225df00' into bp 
Add a delimiter between scheme and host

Bug: 6923539
Change-Id: Ic5e19f96c64367c9dc0e3168850309cdd5047e47
 2013-04-18 11:40:09 -07:00
Scott Main
6afeb0e5e7 search suggest tags for google service docs 
and exclude a whole bunch from suggestions

Change-Id: Id79653216fdcdd18e50d2463b0d27c1584848213
 2013-04-16 21:15:36 -07:00
Dirk Dougherty
d1dc8c7078 am c6af49ef: Doc change: Add tablet basic checks. 
* commit 'c6af49efc467e379e7ac56246e9c7f0e6ebddc00':
  Doc change: Add tablet basic checks.
 2013-04-15 21:43:56 -07:00
Dirk Dougherty
c6af49efc4 Doc change: Add tablet basic checks. 
Change-Id: I9fab8f29515e086feffd45bcbcf9e7d6602a734d
 2013-04-15 20:55:25 -07:00