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

5954 Commits

Author SHA1 Message Date
Nick Kralevich
21430bd763 fixup HTML 
Change-Id: I99c31aae8e6e4e674a7c762a942a9cc82cf6e821
 2013-11-22 10:22:45 -08:00
Nick Kralevich
84365cf51d Add samsung to security contacts. 
Change-Id: I7c4225083d4969109e37eac42f8d470daead3fb7
 2013-11-22 10:16:20 -08:00
Nick Kralevich
64dea2c380 Merge "Add OEM specific addresses" 2013-11-21 23:45:29 +00:00
Katie McCormick
9514bb7d17 am f49578ad: am de70d796: am 4181da02: Merge "Doc update: Minor additions to storage doc" into klp-docs 
* commit 'f49578adff1f79520ce9fafea98d4abe371b1ec0':
  Doc update: Minor additions to storage doc
 2013-11-21 11:39:50 -08:00
Katie McCormick
f49578adff am de70d796: am 4181da02: Merge "Doc update: Minor additions to storage doc" into klp-docs 
* commit 'de70d796a564ca3cc833def566f83880be5b573f':
  Doc update: Minor additions to storage doc
 2013-11-21 11:35:56 -08:00
Katie McCormick
4181da0296 Merge "Doc update: Minor additions to storage doc" into klp-docs 2013-11-21 19:26:36 +00:00
Katie McCormick
546f0af6be Doc update: Minor additions to storage doc 
Change-Id: I59aa961a94393221be3c5f847a9fc82aa43e3a6f
 2013-11-21 11:17:02 -08:00
Dirk Dougherty
a239df052f am 577a2531: am e8d820b5: am 58c168a1: Merge "Doc change: update download progress image." into klp-docs 
* commit '577a2531b5f0ad9641586d568406dc7407e17bc2':
  Doc change: update download progress image.
 2013-11-21 10:38:10 -08:00
Dirk Dougherty
577a2531b5 am e8d820b5: am 58c168a1: Merge "Doc change: update download progress image." into klp-docs 
* commit 'e8d820b5a35d42eb77222af0887d72ad23500740':
  Doc change: update download progress image.
 2013-11-21 10:33:37 -08:00
Dirk Dougherty
58c168a1b9 Merge "Doc change: update download progress image." into klp-docs 2013-11-21 18:26:06 +00:00
Dirk Dougherty
e5957c80d5 Doc change: update download progress image. 
Change-Id: Ib0a4a00cc69a5fa6c552f70aaf40a682e539c41e
 2013-11-21 09:49:40 -08:00
Scott Main
9ae52de494 am 67360115: am 9f229afd: am 93fd2d0e: add Google+ links to support page bug: 7143885 
* commit '67360115ecbbf0fce8ebfbe47c4f97c132272c38':
  add Google+ links to support page bug: 7143885
 2013-11-20 16:39:09 -08:00
Scott Main
67360115ec am 9f229afd: am 93fd2d0e: add Google+ links to support page bug: 7143885 
* commit '9f229afd2382b15347d1398a6b81c130e1e0021e':
  add Google+ links to support page bug: 7143885
 2013-11-20 16:36:12 -08:00
Scott Main
93fd2d0ea7 add Google+ links to support page 
bug: 7143885

Change-Id: I200d7b84694169e5adf2d13a0b6f2c56ab76a727
 2013-11-20 15:33:33 -08:00
Nick Kralevich
ac237236ca Add OEM specific addresses 
Add OEM specific security addresses to the Android Security FAQ.
It's a partial list for now, but we'll build this up over time.

Delete the security@android.com hyperlink. I think people are
accidentally clicking on the link, causing empty e-mails to
get sent to us.

Change-Id: If516a15169bd79f45d5aa3bef2b0bd2c6af8f0fa
 2013-11-20 13:13:50 -08:00
Scott Main
89be9b5265 am 214c2503: am 383ce297: am 3aec4328: add Analytics event tracking for Studio download 
* commit '214c250354166ee783aef2ed69aa678880995f46':
  add Analytics event tracking for Studio download
 2013-11-20 13:09:54 -08:00
Scott Main
214c250354 am 383ce297: am 3aec4328: add Analytics event tracking for Studio download 
* commit '383ce297d7086e8166aab9607b5101da73486ed1':
  add Analytics event tracking for Studio download
 2013-11-20 13:05:30 -08:00
Scott Main
3aec4328da add Analytics event tracking for Studio download 
Change-Id: I85c2db10d431f32316eabdae5d37e03afd7e83bf
 2013-11-20 12:51:28 -08:00
Scott Main
f78e78f5b1 am 05194598: am 4dcf23b6: am 64fedb77: add new video button to some pages 
* commit '051945986f325a0dfce13a98ade7d1c60cc7d185':
  add new video button to some pages
 2013-11-20 12:46:06 -08:00
Scott Main
051945986f am 4dcf23b6: am 64fedb77: add new video button to some pages 
* commit '4dcf23b6f50aa5c43e6c7e86cb4b14caa669e954':
  add new video button to some pages
 2013-11-20 12:41:41 -08:00
Scott Main
64fedb7725 add new video button to some pages 
Change-Id: Ie1f1875d041ff662aee709cd5f7d3110e438d0d5
 2013-11-20 12:34:43 -08:00
Dirk Dougherty
7acec30ac7 am 3d763e25: am a9a39d6c: am acca12fa: Merge "Doc change: move localized files into an intl dir. Build output remains the same for online, offline, and ds docs." into klp-docs 
* commit '3d763e258b6643d29a495b5dfb1cb376e6b61f87':
  Doc change: move localized files into an intl dir. Build output remains the same for online, offline, and ds docs.
 2013-11-19 18:24:20 -08:00
Dirk Dougherty
3d763e258b am a9a39d6c: am acca12fa: Merge "Doc change: move localized files into an intl dir. Build output remains the same for online, offline, and ds docs." into klp-docs 
* commit 'a9a39d6ca25796ba0fcf16ead3a9928f36b6444d':
  Doc change: move localized files into an intl dir. Build output remains the same for online, offline, and ds docs.
 2013-11-19 18:20:40 -08:00
Dirk Dougherty
acca12faea Merge "Doc change: move localized files into an intl dir. Build output remains the same for online, offline, and ds docs." into klp-docs 2013-11-20 02:13:48 +00:00
Dirk Dougherty
5f0462a4f5 Doc change: move localized files into an intl dir. Build output remains the same for online, offline, and ds docs. 
Change-Id: Ia75712323563cf56f0224822cb7977f3421f8527
 2013-11-19 17:55:49 -08:00
Katie McCormick
7a7563c0bd am a99e486c: am 26574688: am 39711934: Merge "Doc update: redo of new API Console steps." into klp-docs 
* commit 'a99e486c3a45c2ba96bce7a994e3b91f17b5f75f':
  Doc update: redo of new API Console steps.
 2013-11-19 17:16:27 -08:00
Katie McCormick
a99e486c3a am 26574688: am 39711934: Merge "Doc update: redo of new API Console steps." into klp-docs 
* commit '26574688b627f5b5d722834d73cba5f37185770f':
  Doc update: redo of new API Console steps.
 2013-11-19 17:14:14 -08:00
Katie McCormick
3971193402 Merge "Doc update: redo of new API Console steps." into klp-docs 2013-11-20 01:07:56 +00:00
Katie McCormick
6b372626e9 Doc update: redo of new API Console steps. 
Fixes for:

b/11713745
b/11712882
b/10669388
b/10641901

Change-Id: I071eba31d51f0e29b9be4a7f7ede0f01c7a52838
 2013-11-19 16:17:17 -08:00
Joe Fernandez
79992ca077 am f52450b1: am dcf78a05: am de4a8d85: Merge "Systrace doc updates" into klp-docs 
* commit 'f52450b1f174eac239ffac67774960d547e295c8':
  Systrace doc updates
 2013-11-19 11:20:41 -08:00
Joe Fernandez
f52450b1f1 am dcf78a05: am de4a8d85: Merge "Systrace doc updates" into klp-docs 
* commit 'dcf78a0541665332792d3f645dda673a9add2c1e':
  Systrace doc updates
 2013-11-19 11:16:30 -08:00
Joe Fernandez
de4a8d851b Merge "Systrace doc updates" into klp-docs 2013-11-19 19:09:05 +00:00
Joe Fernandez
25ef208d7c Systrace doc updates 
Update to reflect new user interface and command line options
in Android 4.3+. Also add section on using application-level
tracing.

Fixes for bugs:
b/7306847
b/10113361
b/9425766
b/7306847
b/9262485

Change-Id: Ia1c2a54fa2edc12cd68da27055aebe7ec47df745
 2013-11-19 10:48:39 -08:00
Dirk Dougherty
c178141afa am 27927d5d: am 08ee31a2: am ce3f3a8d: Merge "Add link to HCE dev guide." into klp-docs 
* commit '27927d5d55eb4bd9087bdeba7df1e98f280177bd':
  Add link to HCE dev guide.
 2013-11-18 17:41:34 -08:00
Dirk Dougherty
27927d5d55 am 08ee31a2: am ce3f3a8d: Merge "Add link to HCE dev guide." into klp-docs 
* commit '08ee31a22421ed9dc144d89edc695322044d699c':
  Add link to HCE dev guide.
 2013-11-18 17:38:00 -08:00
Dirk Dougherty
ce3f3a8d35 Merge "Add link to HCE dev guide." into klp-docs 2013-11-19 01:30:53 +00:00
Dirk Dougherty
856f474132 am 49b1dc33: am 63bb9185: am abb4d2da: Doc change: edit line length above button. 
* commit '49b1dc335dee85eb72892f722164feaabe910bd0':
  Doc change: edit line length above button.
 2013-11-18 15:57:59 -08:00
Dirk Dougherty
49b1dc335d am 63bb9185: am abb4d2da: Doc change: edit line length above button. 
* commit '63bb9185d4bd4bce3361135e4fcfdba5a6157340':
  Doc change: edit line length above button.
 2013-11-18 15:54:01 -08:00
Dirk Dougherty
abb4d2da43 Doc change: edit line length above button. 
Change-Id: I7fd5c192b93846e91e0069c287776996c3f01ab8
 2013-11-18 15:45:30 -08:00
Dirk Dougherty
241a327afe Add link to HCE dev guide. 
Change-Id: I452a59ff81d0e0e34cb6802acfc539fa1219bd68
 2013-11-15 21:32:50 -08:00
Katie McCormick
ac21fd91fb am 1e5af1bc: am 0037930b: am 63cd3802: Doc update: update old console references. 
* commit '1e5af1bcfa3d6d3047a1b60b7abfeab6f3e9d81a':
  Doc update: update old console references.
 2013-11-15 14:50:30 -08:00
Katie McCormick
1e5af1bcfa am 0037930b: am 63cd3802: Doc update: update old console references. 
* commit '0037930bbea46ee9a818ff8e66bf7f334e467420':
  Doc update: update old console references.
 2013-11-15 14:45:07 -08:00
Katie McCormick
63cd380200 Doc update: update old console references. 
Change-Id: I54d50876022b308a4688293853b3e9227cb5e87c
 2013-11-15 22:33:13 +00:00
Joe Fernandez
9c5e8258e7 am 21be7734: am 33164786: am 5b93d259: Merge "docs: code fixes for OpenGL ES training" into klp-docs 
* commit '21be773432a008ee48d5c08b22a9d236772e3b53':
  docs: code fixes for OpenGL ES training
 2013-11-15 13:32:16 -08:00
Joe Fernandez
21be773432 am 33164786: am 5b93d259: Merge "docs: code fixes for OpenGL ES training" into klp-docs 
* commit '331647865554b5fe49d936452fed4dc1d86d7313':
  docs: code fixes for OpenGL ES training
 2013-11-15 13:26:22 -08:00
Joe Fernandez
5b93d259b8 Merge "docs: code fixes for OpenGL ES training" into klp-docs 2013-11-15 21:19:51 +00:00
Joe Fernandez
feaaea5b41 docs: code fixes for OpenGL ES training 
code sample fixes reviewed separately,
see Change-Id: I1d760b75d1f2bfe1ec90c71471867577bd146241

fixing bugs:
b/10798358
b/10796990
b/10603728
b/7962328

Change-Id: I1e0f6668ec8d2b103b88c385f1f067d30ecc7178
 2013-11-15 11:55:33 -08:00
Katie McCormick
2c74c5f182 am 0dcddb44: am 9db6e7c6: am fb828c8c: Merge "Doc Update: add immersive mode to sysui class." into klp-docs 
* commit '0dcddb447c97d5220d21315de428079dada9bdcb':
  Doc Update: add immersive mode to sysui class.
 2013-11-14 15:49:07 -08:00
Scott Main
8ef91cdcbe am 587693f3: am 92caa0c7: am c5cdd541: remove device list for nexus devices, clarify its needed for adb 
* commit '587693f31e64dd4cbf9fd77fa44374cd22b1ff3e':
  remove device list for nexus devices, clarify its needed for adb
 2013-11-14 15:48:59 -08:00
Katie McCormick
0dcddb447c am 9db6e7c6: am fb828c8c: Merge "Doc Update: add immersive mode to sysui class." into klp-docs 
* commit '9db6e7c6d0e451ec1799d9ed81f911c5f77977e2':
  Doc Update: add immersive mode to sysui class.
 2013-11-14 15:44:32 -08:00