Scott Main
df440164ba
docs: add driver info for Hisense
...
Change-Id: I95c09e7aa905345113112329c98d5f00e145b2bb
2011-12-16 12:52:58 -08:00
Jeff Brown
1fd4de0adc
Merge "Add plumbing for dumping database info using dumpsys."
2011-12-16 12:33:54 -08:00
Jeff Brown
aaf30e370f
Merge "Make SQLiteQuery and SQLiteProgram final."
2011-12-16 12:33:46 -08:00
Jeff Brown
69b3d10d66
Merge "Raise default connection pool size."
2011-12-16 12:33:42 -08:00
Dianne Hackborn
fe781c8ccf
Merge "Don't forget to close files."
2011-12-16 12:30:25 -08:00
Joe Onorato
c6a7f358e8
Merge "Add a new ui mode for "appliance""
2011-12-16 12:27:03 -08:00
Roman Nurik
d63707f754
am 8cffc318: am a8001e2a: am 00697a90: docs: Add missing intent flag to Android U nav class
...
* commit '8cffc31810a7645c70183cfb0b43c8b78a299918':
docs: Add missing intent flag to Android U nav class
2011-12-16 12:09:51 -08:00
Roman Nurik
8cffc31810
am a8001e2a: am 00697a90: docs: Add missing intent flag to Android U nav class
...
* commit 'a8001e2ae908c413b626a82f5ab925f18559509c':
docs: Add missing intent flag to Android U nav class
2011-12-16 12:07:27 -08:00
Roman Nurik
a8001e2ae9
am 00697a90: docs: Add missing intent flag to Android U nav class
...
* commit '00697a90bec4e0536cfa0873602b64bb6785022e':
docs: Add missing intent flag to Android U nav class
2011-12-16 12:05:32 -08:00
The Android Automerger
bf35112b28
merge in ics-mr1-release history after reset to ics-mr1
2011-12-16 12:01:35 -08:00
Justin Ho
3299ad5254
am 9edb26ea: am 043c5f8f: Merge "Cherry-picking Id45abeba and Ia065dec6 for MR1" into ics-mr1
...
* commit '9edb26ea551bec24fa417a854ecec3801f15dc1d':
Cherry-picking Id45abeba and Ia065dec6 for MR1
2011-12-16 11:56:19 -08:00
Jeff Sharkey
931310f1d2
Merge "Include roaming in NetworkIdentity.hashCode()."
2011-12-16 11:56:06 -08:00
Justin Ho
9edb26ea55
am 043c5f8f: Merge "Cherry-picking Id45abeba and Ia065dec6 for MR1" into ics-mr1
...
* commit '043c5f8f1d9a8e9077e1c16af28509b30f00324d':
Cherry-picking Id45abeba and Ia065dec6 for MR1
2011-12-16 11:54:01 -08:00
Jeff Sharkey
f9a3a8d42b
Include roaming in NetworkIdentity.hashCode().
...
Change-Id: I148d95c8d08e3916a90fa78f7efee327d4b7de2a
2011-12-16 11:52:35 -08:00
Justin Ho
043c5f8f1d
Merge "Cherry-picking Id45abeba and Ia065dec6 for MR1" into ics-mr1
2011-12-16 11:52:08 -08:00
Roman Nurik
00697a90be
docs: Add missing intent flag to Android U nav class
...
Change-Id: I18eb286a8d8b2c70f7d894d1244d2568ce6ce6c0
2011-12-16 11:48:24 -08:00
Glenn Kasten
490909d2c0
Extract out audio DSP code to utility library
...
Change-Id: Ib8ce72028a7ea30e82baa518e381370e820ebbd0
2011-12-16 11:42:03 -08:00
Alexander Lucas
fb833fd458
am f5ed1d4c: am 6469ee80: Merge "Fixed table labelling issues in \'Multiple Dimensions\' multiple apk lesson" into ics-mr1
...
* commit 'f5ed1d4c553de5d5e1fa1f8df52e6a2bba3ceb2e':
Fixed table labelling issues in 'Multiple Dimensions' multiple apk lesson
2011-12-16 11:41:45 -08:00
Alexander Lucas
f5ed1d4c55
am 6469ee80: Merge "Fixed table labelling issues in \'Multiple Dimensions\' multiple apk lesson" into ics-mr1
...
* commit '6469ee8016d1e02673e05356b2590d3175dcd062':
Fixed table labelling issues in 'Multiple Dimensions' multiple apk lesson
2011-12-16 11:39:40 -08:00
Alexander Lucas
6469ee8016
Merge "Fixed table labelling issues in 'Multiple Dimensions' multiple apk lesson" into ics-mr1
2011-12-16 11:38:05 -08:00
Scott Main
0705cefc70
am 5e7bed0b: am 0f52d766: Merge "docs: fix whitespace in sidenav" into ics-mr1
...
* commit '5e7bed0b2a16c91d90bd274b4fdfe7c6718f11c2':
docs: fix whitespace in sidenav
2011-12-16 11:34:19 -08:00
Scott Main
5e7bed0b2a
am 0f52d766: Merge "docs: fix whitespace in sidenav" into ics-mr1
...
* commit '0f52d7666e83a7aa1979d65820ece865c7e1fd08':
docs: fix whitespace in sidenav
2011-12-16 11:32:24 -08:00
Scott Main
0f52d7666e
Merge "docs: fix whitespace in sidenav" into ics-mr1
2011-12-16 11:30:00 -08:00
Scott Main
edceed2359
docs: fix whitespace in sidenav
...
Change-Id: I7d8decaf122de1f632fdbd3ca5a1a34b3d1d91dd
2011-12-16 11:29:12 -08:00
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
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