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

64115 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Roman Nurik
cb284e9a1d am 1410f8a2: am 795c271f: am eb946fbd: Merge "docs: Minor link fix in Android U class" into ics-mr0 
* commit '1410f8a2a58beacc84f9e5444af6032f92ef6845':
  docs: Minor link fix in Android U class
 2011-12-16 11:27:02 -08:00
Roman Nurik
1410f8a2a5 am 795c271f: am eb946fbd: Merge "docs: Minor link fix in Android U class" into ics-mr0 
* commit '795c271f448704561cd1312dd51826dca82f392f':
  docs: Minor link fix in Android U class
 2011-12-16 11:25:02 -08:00
Roman Nurik
795c271f44 am eb946fbd: Merge "docs: Minor link fix in Android U class" into ics-mr0 
* commit 'eb946fbdc800d56e1cbac515a1c73de806e74711':
  docs: Minor link fix in Android U class
 2011-12-16 11:23:27 -08:00
Roman Nurik
eb946fbdc8 Merge "docs: Minor link fix in Android U class" into ics-mr0 2011-12-16 11:21:59 -08:00
Bill Gruber
4440fbf840 am 590ba7a4: am e2a95b59: am 97aafdf4: Merge "Dev guide for sensors" into ics-mr0 
* commit '590ba7a4f03717ebe3171499637e3964c5860c8a':
  Dev guide for sensors
 2011-12-16 11:17:49 -08:00
Bill Gruber
590ba7a4f0 am e2a95b59: am 97aafdf4: Merge "Dev guide for sensors" into ics-mr0 
* commit 'e2a95b59f554d1d60b7e6c27d870158ec7051e31':
  Dev guide for sensors
 2011-12-16 11:15:46 -08:00
Roman Nurik
6b21fa8b72 docs: Minor link fix in Android U class 
Change-Id: Ifab9c8088ba686a560647883cbacdd34c1c08c80
 2011-12-16 11:15:13 -08:00
Bill Gruber
e2a95b59f5 am 97aafdf4: Merge "Dev guide for sensors" into ics-mr0 
* commit '97aafdf46e5007fa7b3f6eae4e54d692877ad824':
  Dev guide for sensors
 2011-12-16 11:13:13 -08:00
Bill Gruber
97aafdf46e Merge "Dev guide for sensors" into ics-mr0 2011-12-16 11:11:46 -08:00
Alexander Lucas
9c093132da Fixed table labelling issues in 'Multiple Dimensions' multiple apk lesson 
Change-Id: I05c100d583340456eed8d15d555e1f02a38504a8
 2011-12-16 11:03:18 -08:00
Dirk Dougherty
ff13bf6b89 am 41a7998d: am 8c65ab81: Merge "Updated "Designing for Security" documentation" into ics-mr1 
* commit '41a7998df7350e27df6cfdb8683754c83552aab5':
  Updated "Designing for Security" documentation
 2011-12-16 11:00:49 -08:00
Dirk Dougherty
41a7998df7 am 8c65ab81: Merge "Updated "Designing for Security" documentation" into ics-mr1 
* commit '8c65ab81e84f36c311d2ae6831819a5caa404548':
  Updated "Designing for Security" documentation
 2011-12-16 10:58:42 -08:00
Dirk Dougherty
8c65ab81e8 Merge "Updated "Designing for Security" documentation" into ics-mr1 2011-12-16 10:56:29 -08:00
Adrian Ludwig
a15562f8fd Updated "Designing for Security" documentation 
Change-Id: I1fe5b353d750695f75370ef31ae1b39e50159164
Signed-off-by: Adrian Ludwig <aludwig@google.com>
 2011-12-16 10:53:53 -08:00
Scott Main
73f875380d am fa0f39c5: am 611d03e6: docs: typos 
* commit 'fa0f39c5454ae9efc00d20326568c0eecb5cc8b4':
  docs: typos
 2011-12-16 10:47:21 -08:00
Scott Main
fa0f39c545 am 611d03e6: docs: typos 
* commit '611d03e693aa8f7032e8a268bee1bfae9777e895':
  docs: typos
 2011-12-16 10:45:22 -08:00
Scott Main
611d03e693 docs: typos 
Change-Id: Iee489eb39029b5d550e37f49b1bd5d4cf30e445c
 2011-12-16 10:41:54 -08:00
Ben Murdoch
2c18ede18e Do not allow file:// access when it is disabled. 
If WebSettings is configured to disallow access to file://
URLs, then block them.

Bug: 5773763
Change-Id: If2793f31cb37e0d3af15cb18e818bfa4058167fd
 2011-12-16 18:15:23 +00:00
The Android Open Source Project
923635436b am 57ea96a4: Reconcile with ics-mr1-release 
* commit '57ea96a4b3273aa8592873355a2f79c74b1abec1':
  SurfaceMediaSource: use the HW_TEXTURE usage bit
  SurfaceMediaSource: use the HW_TEXTURE usage bit
 2011-12-16 08:09:57 -08:00
The Android Open Source Project
57ea96a4b3 Reconcile with ics-mr1-release 
Change-Id: Ib2cbd92ed2d3567e22921b66ca2202a968fdd0da
 2011-12-16 08:08:07 -08:00
Jesse Wilson
4868dfa33b Merge "Give a reflection example for installing the HTTP response cache." 2011-12-16 07:37:22 -08:00
Jesse Wilson
0f05f1ebef Merge "Track libcore tests moving from frameworks/base to libcore." 2011-12-16 07:36:32 -08:00
Glenn Kasten
f96272c3cd Merge "setActiveTrack and setBufferProvider can't fail" 2011-12-16 07:30:14 -08:00
Glenn Kasten
844756be54 Merge "Simplify enable/disable mixing" 2011-12-16 07:29:57 -08:00
Chet Haase
0904c203c4 Merge "Fix issues from recent glyph caching change" 2011-12-16 06:49:59 -08:00
Jeff Brown
6754ba24f1 Add plumbing for dumping database info using dumpsys. 
Change-Id: I51b0364c3d3d41aa38a759fbce48e625fff1b2dd
 2011-12-16 04:01:00 -08:00
Jeff Brown
d5064be3b5 Make SQLiteQuery and SQLiteProgram final. 
We can do this because the classes already cannot be subclassed
by applications due to the fact they only have package private
constructors.

One very nice consequence of this observation is that we can hide or
delete several @deprecated protected members which are effectively
inaccessible because applications cannot create subclasses!

Change-Id: I2d3a0d2ad72b9289ebcdf907e4e4e6caf27f9076
 2011-12-16 03:59:26 -08:00
Jeff Brown
99cfc22639 Raise default connection pool size. 
Bug: 5763266
Change-Id: I8460c942ef882ea747d2b5756c708fce2849de93
 2011-12-16 03:59:25 -08:00
Dirk Dougherty
77aba791ac am 4365a486: am 8b6ed2d1: Doc change: edits to ICS MR1 API Overview. 
* commit '4365a486126ecb20061f01d1e5c8e5f357045f18':
  Doc change: edits to ICS MR1 API Overview.
 2011-12-16 00:27:42 -08:00
Dirk Dougherty
4365a48612 am 8b6ed2d1: Doc change: edits to ICS MR1 API Overview. 
* commit '8b6ed2d17d5e7e47944026679c9cba66611ab27f':
  Doc change: edits to ICS MR1 API Overview.
 2011-12-16 00:25:06 -08:00
Dirk Dougherty
8b6ed2d17d Doc change: edits to ICS MR1 API Overview. 
Change-Id: Idb18e3085b3dd54c9a39e74c37428c3d5b28aa83
 2011-12-16 00:11:43 -08:00
Joe Fernandez
aa04058ce0 am 9b06f091: am 5b18c714: Merge "docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1 
* commit '9b06f091c4d74415b18eb32f84ae931624b93f18':
  docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6
 2011-12-15 23:15:32 -08:00
Joe Fernandez
9b06f091c4 am 5b18c714: Merge "docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1 
* commit '5b18c714bbff269d7db880b42de34fd1385da9f9':
  docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6
 2011-12-15 23:12:57 -08:00
Joe Fernandez
5b18c714bb Merge "docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1 2011-12-15 23:11:26 -08:00
Joe Fernandez
71d5c1db17 docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6 
Change-Id: I628cd076cd37f6252837de276c4b7a9040c37bc1
 2011-12-15 23:09:43 -08:00
Fred Chung
26c4a3e979 am d30167f0: am 14633f1b: am 48e0617b: Fixed Android U Enterprise lesson pre-requisites and a minor typo. 
* commit 'd30167f0cda249c9a0d1d118d837d58f3c2b2c89':
  Fixed Android U Enterprise lesson pre-requisites and a minor typo.
 2011-12-15 22:37:40 -08:00
Fred Chung
d30167f0cd am 14633f1b: am 48e0617b: Fixed Android U Enterprise lesson pre-requisites and a minor typo. 
* commit '14633f1b1eea585cdc094ebae75708db2293fe56':
  Fixed Android U Enterprise lesson pre-requisites and a minor typo.
 2011-12-15 22:35:10 -08:00
Fred Chung
14633f1b1e am 48e0617b: Fixed Android U Enterprise lesson pre-requisites and a minor typo. 
* commit '48e0617b9e7d06da803c572d6584d68898733d37':
  Fixed Android U Enterprise lesson pre-requisites and a minor typo.
 2011-12-15 22:33:31 -08:00
Fred Chung
48e0617b9e Fixed Android U Enterprise lesson pre-requisites and a minor typo. 
Change-Id: Ide393a0957f3e797f14d7c349c35337849b15f02
 2011-12-15 22:25:19 -08:00
Scott Main
734a9954ec am ed8851a6: am 8e980c1e: Merge "docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1 
* commit 'ed8851a6f2e4d9477aaa20c333d7220901d8faeb':
  docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6
 2011-12-15 22:17:15 -08:00
Scott Main
ed8851a6f2 am 8e980c1e: Merge "docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1 
* commit '8e980c1e4e86cb4c7ea679eba3cc01d64e323b26':
  docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6
 2011-12-15 22:14:48 -08:00
Scott Main
8e980c1e4e Merge "docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1 2011-12-15 22:12:53 -08:00
Scott Main
6475bd2112 am 4faca92f: am 36c67785: docs: update homepage for 4.0.3 announcment 
* commit '4faca92faa13bcf5d6c2e76b226466066e5562a2':
  docs: update homepage for 4.0.3 announcment
 2011-12-15 22:12:08 -08:00
Scott Main
4faca92faa am 36c67785: docs: update homepage for 4.0.3 announcment 
* commit '36c677855c0a54ede9e92aa856cb2250960e922e':
  docs: update homepage for 4.0.3 announcment
 2011-12-15 22:09:46 -08:00
Scott Main
36c677855c docs: update homepage for 4.0.3 announcment 
Change-Id: I54d1d447ac224982f4483afede2087ce18937ed0
 2011-12-15 22:04:46 -08:00
Jamie Gennis
94180377e7 SurfaceMediaSource: use the HW_TEXTURE usage bit 
This change makes SurfaceMediaSource request Gralloc buffers with the
HW_TEXTURE usage bit rather than the VIDEO_ENCODER bit.  It is a
temporary workaround for what is likely a Gralloc bug.

Bug: 5771063
Change-Id: I9cce615e80fc14a1644fae27ba06970c262dd179
 2011-12-15 20:52:26 -08:00
The Android Automerger
ce2ac73d1d merge in ics-mr1-release history after reset to ics-mr1 2011-12-15 20:50:02 -08:00
Scott Main
b2f1cda755 am b193d241: am 4cb7d095: am 98af5edc: docs: fix encoding issue or whatever with docs (not showing titles) 
* commit 'b193d24145d84a1748cfdcffae56ebfe549ef940':
  docs: fix encoding issue or whatever with docs (not showing titles)
 2011-12-15 20:24:47 -08:00
Scott Main
b193d24145 am 4cb7d095: am 98af5edc: docs: fix encoding issue or whatever with docs (not showing titles) 
* commit '4cb7d0953534587ba2051c6536fdde4b2c9539d5':
  docs: fix encoding issue or whatever with docs (not showing titles)
 2011-12-15 20:22:39 -08:00
Scott Main
4cb7d09535 am 98af5edc: docs: fix encoding issue or whatever with docs (not showing titles) 
* commit '98af5edc70b0b418366f5197b9aeef30f135d40e':
  docs: fix encoding issue or whatever with docs (not showing titles)
 2011-12-15 20:19:55 -08:00