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

125170 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Ly
001e30729a am 23daa441: am 8e115e64: Merge "docs: Documenting fix for CVE-2014-0224 (SSL vulnerability)." into klp-modular-docs 
* commit '23daa44107c17d7e30c65389bb718a9add8e4c40':
  docs: Documenting fix for CVE-2014-0224 (SSL vulnerability).
 2014-08-07 15:59:36 +00:00
Robert Ly
23daa44107 am 8e115e64: Merge "docs: Documenting fix for CVE-2014-0224 (SSL vulnerability)." into klp-modular-docs 
* commit '8e115e6460f5bfe5e682dda6e816b9d8c84bc525':
  docs: Documenting fix for CVE-2014-0224 (SSL vulnerability).
 2014-08-07 15:55:10 +00:00
Robert Ly
8e115e6460 Merge "docs: Documenting fix for CVE-2014-0224 (SSL vulnerability)." into klp-modular-docs 2014-08-07 15:00:45 +00:00
Deepanshu Gupta
4e01c59e6c am 6ebeefa0: am 904d7711: am 7b561be3: am 09c3c2ed: 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 '6ebeefa04cb3c360d8028eb77e60bacf8a800cb1':
  Fix SystemProperties in LayoutLib.
 2014-08-06 22:59:08 +00:00
Deepanshu Gupta
6ebeefa04c am 904d7711: am 7b561be3: am 09c3c2ed: 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 '904d77118bab63139174470ef728ca9a53e75a15':
  Fix SystemProperties in LayoutLib.
 2014-08-06 22:51:47 +00:00
Deepanshu Gupta
904d77118b am 7b561be3: am 09c3c2ed: 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 '7b561be3a6fedebfce412cecd8c36d6686f6576c':
  Fix SystemProperties in LayoutLib.
 2014-08-06 22:45:23 +00:00
Deepanshu Gupta
7b561be3a6 am 09c3c2ed: 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 '09c3c2edb2391d3ffed9a07ec360b9f75b9f7637':
  Fix SystemProperties in LayoutLib.
 2014-08-06 22:37:10 +00:00
Deepanshu Gupta
09c3c2edb2 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.
 2014-08-06 22:30:06 +00:00
Deepanshu Gupta
ba31d62862 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.
 2014-08-06 22:25:50 +00:00
Deepanshu Gupta
db94ea9ed0 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.
 2014-08-06 22:21:54 +00:00
Deepanshu Gupta
f970d2c201 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.
 2014-08-06 22:18:04 +00:00
Deepanshu Gupta
79c3f678d2 am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs 
* commit '206c691bfdb3a6b78d35c7481365980dd387b8c9':
  Fix SystemProperties in LayoutLib.
 2014-08-06 22:13:18 +00:00
Deepanshu Gupta
206c691bfd am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs 
* commit '72cf03a27a73e91d4a3eabf74e0384b310f4a5b2':
  Fix SystemProperties in LayoutLib.
 2014-08-06 22:09:13 +00:00
Deepanshu Gupta
72cf03a27a am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs 
* commit '3a544a81b3d2d529b2995f4b5db2077760d440b5':
  Fix SystemProperties in LayoutLib.
 2014-08-06 22:05:38 +00:00
Deepanshu Gupta
3a544a81b3 resolved conflicts for merge of a232a68d to jb-mr1.1-docs 
Change-Id: I1ea220e3e0a81880db68abab87beab56dc4a336c
 2014-08-06 15:00:14 -07:00
Deepanshu Gupta
a232a68d4c resolved conflicts for merge of 5476cfee to jb-mr1-dev 
Change-Id: I5197271e6fdd36fed9ca9f9b7221d9a99141a4b4
 2014-08-06 14:41:02 -07:00
Deepanshu Gupta
5476cfee6b am 505c675c: Fix SystemProperties in LayoutLib. 
* commit '505c675c3a536ac7c6ad264eb62542537532119c':
  Fix SystemProperties in LayoutLib.
 2014-08-06 21:28:24 +00:00
Deepanshu Gupta
505c675c3a 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
 2014-08-05 17:47:30 -07:00
Andrew Flynn
c08203c22c am 4881578e: am ea12f0fd: Fix some sync adapter docs typos. 
* commit '4881578e6ccd8b51606750e3fd4e20b2204287c7':
  Fix some sync adapter docs typos.
 2014-08-01 18:33:48 +00:00
Andrew Flynn
4881578e6c am ea12f0fd: Fix some sync adapter docs typos. 
* commit 'ea12f0fd7ed236fa38f73cfff5be5fa36f016690':
  Fix some sync adapter docs typos.
 2014-08-01 18:29:27 +00:00
Andrew Flynn
ea12f0fd7e Fix some sync adapter docs typos. 
Change-Id: Icb108bcfd7835049ff7d50660d1f8084ebc3c8e9
 2014-08-01 18:25:04 +00:00
Joe Fernandez
441e7aa234 am eb4bc851: am 69ed58ac: Merge "docs: Adding TIF one-pager to TV docs in L-Preview" into klp-modular-docs 
* commit 'eb4bc851aade1090c0a4e1f1e6f7ecd136b4a47a':
  docs: Adding TIF one-pager to TV docs in L-Preview
 2014-07-31 18:40:05 +00:00
Joe Fernandez
eb4bc851aa am 69ed58ac: Merge "docs: Adding TIF one-pager to TV docs in L-Preview" into klp-modular-docs 
* commit '69ed58aced0e884d7758d84067134b04fbcee9c0':
  docs: Adding TIF one-pager to TV docs in L-Preview
 2014-07-31 18:35:02 +00:00
Andrew Solovay
897cf908c9 docs: Documenting fix for CVE-2014-0224 (SSL vulnerability). 
Wrote a training page on how to use Google Play services to update a
device's security provider, which (int. al.) installs a fix against
the recently-discovered SSL CCS injection vulnerability.

Doc is staged to:

http://asolovay.mtv:9338/training/articles/security-gms-provider.html

bug: 16296338

Change-Id: I5b0dd052113998d585a46262b216ef0c1b432362
 2014-07-30 16:15:04 -07:00
Joe Fernandez
a3e521540b am ecf76d1c: am b83127f0: Merge "docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ" into klp-modular-docs 
* commit 'ecf76d1cfd2846412270e6361ec8ba4cfccf8bec':
  docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ
 2014-07-30 18:14:04 +00:00
Joe Fernandez
ecf76d1cfd am b83127f0: Merge "docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ" into klp-modular-docs 
* commit 'b83127f0cf35a2d95684293818ca25171f6643e1':
  docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ
 2014-07-30 18:09:27 +00:00
Alan Lau
40274ada4a am b12318be: Merge "Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views""" into klp-modular-dev 
* commit 'b12318be13be00842d124e4391ce5eabce2d5104':
  Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views""
 2014-07-30 17:47:03 +00:00
Alan Lau
839ca0d5fa am 06a84554: Merge "Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying""" into klp-modular-dev 
* commit '06a8455421978d06597de2abfccabef928d06056':
  Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying""
 2014-07-30 17:44:20 +00:00
Andrew Solovay
60e7f54187 am d46bc784: am 81364215: Merge "docs: Revised page to include info about new Publisher API." into klp-modular-docs 
* commit 'd46bc7845c221b84f9b4e570b95f407c7fc6d0e7':
  docs: Revised page to include info about new Publisher API.
 2014-07-30 17:37:06 +00:00
Alan Lau
231a32a132 am c0062272: Merge "Revert "Revert "DO NOT MERGE Implement line breaking using ICU break iterator""" into klp-modular-dev 
* commit 'c006227265d7ac705ebeef2f7d87104fdb63f32a':
  Revert "Revert "DO NOT MERGE Implement line breaking using ICU break iterator""
 2014-07-30 17:37:02 +00:00
Andrew Solovay
d46bc7845c am 81364215: Merge "docs: Revised page to include info about new Publisher API." into klp-modular-docs 
* commit '813642158979aca52b9d3913e52dda877d74a992':
  docs: Revised page to include info about new Publisher API.
 2014-07-30 17:34:20 +00:00
Ricardo Cervera
9ae4c6f874 am b6bfa9e4: am a7898781: Merge "docs: Added system requirements for Studio. Bug: 16566355" into klp-modular-docs 
* commit 'b6bfa9e45a953b83289ee57da661746deae7a63f':
  docs: Added system requirements for Studio. Bug: 16566355
 2014-07-30 16:49:57 +00:00
Ricardo Cervera
b6bfa9e45a am a7898781: Merge "docs: Added system requirements for Studio. Bug: 16566355" into klp-modular-docs 
* commit 'a7898781d6182b5c73a0a3899b71162f92582f66':
  docs: Added system requirements for Studio. Bug: 16566355
 2014-07-30 16:46:07 +00:00
Joe Fernandez
b83127f0cf Merge "docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ" into klp-modular-docs 2014-07-30 16:17:51 +00:00
Joe Fernandez
0d568c98c1 docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ 
Change-Id: Ifa8831e1594470ecf65761efea472de79aaf5ece
 2014-07-30 10:10:19 -07:00
Alan Lau
06a8455421 Merge "Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying""" into klp-modular-dev 2014-07-30 16:17:51 +00:00
Alan Lau
7ab1900a5a Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying"" 
This reverts commit af60e56b39582ea90ccd7601cd06350a50bf6500.

Change-Id: I1aa698608773b9e540457831e11218f371c71268
 2014-07-30 17:35:29 +00:00
Alan Lau
c006227265 Merge "Revert "Revert "DO NOT MERGE Implement line breaking using ICU break iterator""" into klp-modular-dev 2014-07-30 16:17:51 +00:00
Alan Lau
273906bb6a Revert "Revert "DO NOT MERGE Implement line breaking using ICU break iterator"" 
This reverts commit 77d6f36bbc76dbed51bea17d1ffcd3c1d6ffd30f.

Change-Id: I10b6d9e3d82b0f2b6dc154465a4b2f1db8eed058
 2014-07-30 17:30:15 +00:00
Ricardo Cervera
a7898781d6 Merge "docs: Added system requirements for Studio. Bug: 16566355" into klp-modular-docs 2014-07-29 22:44:51 +00:00
Alan Lau
b12318be13 Merge "Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views""" into klp-modular-dev 2014-07-29 21:36:00 +00:00
Alan Lau
1fa3c9bef2 Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views"" 
This reverts commit cbeef01cce314e3a3977b042d8ec0744816c0df4.

Change-Id: I170ccb2264941e8a8b090b3bb553970414f0c4eb
 2014-07-30 17:35:20 +00:00
Andrew Solovay
8136421589 Merge "docs: Revised page to include info about new Publisher API." into klp-modular-docs 2014-07-29 21:36:00 +00:00
Dirk Dougherty
78ad92b48f am 4ff57a9a: am fa3d1b2a: Doc change: add notice for admob sdk upgrade. 
* commit '4ff57a9aee76bdfe6808ac9c64f2e90bc14a25ae':
  Doc change: add notice for admob sdk upgrade.
 2014-07-29 21:07:53 +00:00
Dirk Dougherty
4ff57a9aee am fa3d1b2a: Doc change: add notice for admob sdk upgrade. 
* commit 'fa3d1b2a27448b82ec1aa6f75c95ed17c4f46748':
  Doc change: add notice for admob sdk upgrade.
 2014-07-29 21:03:25 +00:00
Andrew Solovay
d28470e87a docs: Revised page to include info about new Publisher API. 
Also moved the blurb to the "Google Play Distribution" cover page, and
adjusted the TOC accordingly. Per DDoughterty@ 's request, moved the
"Purchase Verification Strategies" section to billing_subscriptions.jd

Page is staged to:

http://asolovay.mtv:9543/google/play/billing/gp-purchase-status-api.html
http://asolovay.mtv:9543/google/play/billing/billing_subscriptions.html#strategies

Change-Id: I884e2f3f25c76fcb055e663058d1a4f4642fb558
 2014-07-29 14:00:03 -07:00
Dirk Dougherty
fa3d1b2a27 Doc change: add notice for admob sdk upgrade. 
Change-Id: I9281b17e4ff277ef99ae57ce0360e05f4231e7ff
 2014-07-29 20:32:17 +00:00
Ricardo Cervera
932ced3a30 docs: Added system requirements for Studio. Bug: 16566355 
Change-Id: I1d3d80ce718d64e01fd939aa177c950d56065555
 2014-07-29 13:24:34 -07:00
Robert Ly
9c53194a6f am 58967bfb: am 1c977b37: Merge "docs: fix typo bug 16623189" into klp-modular-docs 
* commit '58967bfbe824f020194872a6d0a5204b54e6043a':
  docs: fix typo bug 16623189
 2014-07-29 16:34:01 +00:00
Robert Ly
58967bfbe8 am 1c977b37: Merge "docs: fix typo bug 16623189" into klp-modular-docs 
* commit '1c977b3744dbe916edde2e256a39c30e5888ef4f':
  docs: fix typo bug 16623189
 2014-07-29 16:30:07 +00:00