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

89720 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
Dirk Dougherty
4a22f9a7bb am 2a31f996: am bdf19c62: am 29743661: Doc change: fix typo in tablet guidelines. 
* commit '2a31f99680ec8bbf9acde86da5e7a595a9e4c089':
  Doc change: fix typo in tablet guidelines.
 2013-04-24 19:44:20 -07:00
Dirk Dougherty
2a31f99680 am bdf19c62: am 29743661: Doc change: fix typo in tablet guidelines. 
* commit 'bdf19c62d841163f5c3434f3533e003f58816e0e':
  Doc change: fix typo in tablet guidelines.
 2013-04-24 19:42:49 -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
7b5d34f0a7 am 2a4ea0fc: am fd61958f: Doc Update: bug fix in SensorEvent ref 
* commit '2a4ea0fc0d93bb94b1ff7e731af519cc41ef77e8':
  Doc Update: bug fix in SensorEvent ref
 2013-04-24 15:59:05 -07:00
kmccormick
2a4ea0fc0d am fd61958f: Doc Update: bug fix in SensorEvent ref 
* commit 'fd61958f75212a70bffebd79ad0876b7ad785f55':
  Doc Update: bug fix in SensorEvent ref
 2013-04-24 15:57:25 -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
182c06fffe am 0a413d75: am c0edc45f: am dacaad4a: Merge "Doc change: Add tablet optimization tips info/link." into jb-mr1-dev 
* commit '0a413d7572c5d06331d901a66e1686bc7c99a4ac':
  Doc change: Add tablet optimization tips info/link.
 2013-04-24 12:14:36 -07:00
Dirk Dougherty
0a413d7572 am c0edc45f: am dacaad4a: Merge "Doc change: Add tablet optimization tips info/link." into jb-mr1-dev 
* commit 'c0edc45fd20832b52e8d0f91632f616da585b7dd':
  Doc change: Add tablet optimization tips info/link.
 2013-04-24 12:12:37 -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
51a452a93b am 4af72165: am 7653fbee: make Google IO image clickable 
* commit '4af72165092fb965ec9a97599f25538aa70242b1':
  make Google IO image clickable
 2013-04-23 12:36:26 -07:00
Scott Main
4af7216509 am 7653fbee: make Google IO image clickable 
* commit '7653fbee7e4eb5d25a5b561b8142bd1af8c2cd58':
  make Google IO image clickable
 2013-04-23 12:34:30 -07:00
Scott Main
7653fbee7e make Google IO image clickable 
Change-Id: I8638012fa6be1f104f20cf2f4dcea59787fdfd08
 2013-04-23 12:32:24 -07:00
Selim Gurun
dc9efbbb61 am a5f4e79f: am 22a946d3: am 006119bf: Merge commit \'8237dd82\' into manualmerge 
* commit 'a5f4e79fad39b4a0f91673c5813b1740e82144f4':
  DO NOT MERGE Fix issues during backport
 2013-04-23 12:21:49 -07:00
Selim Gurun
a5f4e79fad am 22a946d3: am 006119bf: Merge commit \'8237dd82\' into manualmerge 
* commit '22a946d36af4ea69956531c89f0d0852497c3892':
  DO NOT MERGE Fix issues during backport
 2013-04-23 12:20:53 -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
ecf551805e am 04f3b81a: am c7523804: am 00cfba95: Doc change: update support urls. 
* commit '04f3b81aad12d5d28db42db40545603c6b128c1f':
  Doc change: update support urls.
 2013-04-22 17:05:08 -07:00
Dirk Dougherty
04f3b81aad am c7523804: am 00cfba95: Doc change: update support urls. 
* commit 'c7523804c890cd7ed3b61f51b9f5d029320fd406':
  Doc change: update support urls.
 2013-04-22 17:01:21 -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
cdfeb09d65 am 10fc5e05: am cca23552: am 974af93d: Doc change: update payment detail for merch account. 
* commit '10fc5e0528a7cad3f2eab0694ed471d29184ec18':
  Doc change: update payment detail for merch account.
 2013-04-22 14:27:00 -07:00
Dirk Dougherty
10fc5e0528 am cca23552: am 974af93d: Doc change: update payment detail for merch account. 
* commit 'cca235525f14ba8845ef5385036e7913c23f7dd1':
  Doc change: update payment detail for merch account.
 2013-04-22 14:25:21 -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
2aca8dbeaf am b116885c: am ce534905: Merge "Doc update: Fix firewall text." into jb-mr1.1-docs 
* commit 'b116885c42be983732a495bb84938d290211014f':
  Doc update: Fix firewall text.
 2013-04-22 13:11:53 -07:00
kmccormick
b116885c42 am ce534905: Merge "Doc update: Fix firewall text." into jb-mr1.1-docs 
* commit 'ce534905a63f97766f487798fd61cb8414da04fe':
  Doc update: Fix firewall text.
 2013-04-22 13:10:04 -07:00
Scott Main
3da6ef399c am d07bdb6f: am 2779da87: fix backup registration url external bug: 54539 
* commit 'd07bdb6fd165b31aa9e047095e18be7e76e74502':
  fix backup registration url external bug: 54539
 2013-04-22 13:08:33 -07:00