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

64811 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Sakhartchouk
11a2e341c5 Adding comments to RS headers. 
Change-Id: Ib345fe9f651dd3e74fb384799d381034391de8a2
 2011-12-16 14:15:21 -08:00
Elliott Hughes
0740aafcaa am cca5b116: Merge "Fix the JNI documentation for ICS." 
* commit 'cca5b116dbf05942fae0fa4fedd278c8b2e84c19':
  Fix the JNI documentation for ICS.
 2011-12-16 14:06:42 -08:00
Elliott Hughes
cca5b116db Merge "Fix the JNI documentation for ICS." 2011-12-16 14:04:51 -08:00
Chet Haase
25f370818d am 6a6da2c9: Merge "Make Property objects in View final" 
* commit '6a6da2c9719c6942246d50833e04ee48f9fb2b03':
  Make Property objects in View final
 2011-12-16 14:01:16 -08:00
Elliott Hughes
1890b87ef2 Fix the JNI documentation for ICS. 
The stuff about GetObjectRefType and weak global references was out of
date. Reported by a developer on the android-ndk@ list.

Change-Id: I1ad97564111446ca86843789bedfdb480246c200
 2011-12-16 13:59:54 -08:00
Chet Haase
6a6da2c971 Merge "Make Property objects in View final" 2011-12-16 13:59:49 -08:00
Chet Haase
d47f1531d0 Make Property objects in View final 
The various Properties added to View in 4.0 (ALPHA, TRANSLATION_X, etc.)
were not final, making it possible to assign on property to another.
Not something that someone would want to do, but we should try to prevent
that kind of mess. This API change makes those properties final.

Change-Id: I7d0c7f738eb2074d0781b1ba6a7c19339bac4477
 2011-12-16 13:44:01 -08:00
Glenn Kasten
78a04ed699 am 586995af: Merge "Use switch in AudioMixer::setParameter" 
* commit '586995afe6768a8acfb8db202f7b9c69d49b73c4':
  Use switch in AudioMixer::setParameter
 2011-12-16 13:33:40 -08:00
Glenn Kasten
586995afe6 Merge "Use switch in AudioMixer::setParameter" 2011-12-16 13:31:33 -08:00
Glenn Kasten
bde164abbc Use switch in AudioMixer::setParameter 
Replace series of if/then/elses by easier-to-read switch.  Also return
void instead of status_t, since callers weren't checking it. Assert on
bad input parameters.

Change-Id: Ie1f0a297977b28501d20e1af819afed9b4750616
 2011-12-16 13:28:33 -08:00
Glenn Kasten
38cc4908f7 am b3719251: deleteTrackName now asserts on bad input parameter 
* commit 'b371925125f20b3b861d251f323c2291287047a8':
  deleteTrackName now asserts on bad input parameter
 2011-12-16 13:27:31 -08:00
Glenn Kasten
b371925125 deleteTrackName now asserts on bad input parameter 
This is safe, as the input parameter is always track->name(),
which must be valid.

Change-Id: Iea8ea3a5706c27026335526ba8851030d00681f8
 2011-12-16 13:22:41 -08:00
Scott Main
eb355bd681 am aba0568d: am a2086cfc: am df440164: docs: add driver info for Hisense 
* commit 'aba0568dc47d8afafdb9148fd7e3b70dcfbec1f7':
  docs: add driver info for Hisense
 2011-12-16 13:01:44 -08:00
Scott Main
aba0568dc4 am a2086cfc: am df440164: docs: add driver info for Hisense 
* commit 'a2086cfc12b5da29190a17eb415fc881c6adb880':
  docs: add driver info for Hisense
 2011-12-16 12:59:03 -08:00
Scott Main
a2086cfc12 am df440164: docs: add driver info for Hisense 
* commit 'df440164ba09bcce8b409bb5a2d4a4ef8f704148':
  docs: add driver info for Hisense
 2011-12-16 12:56:33 -08:00
Scott Main
df440164ba docs: add driver info for Hisense 
Change-Id: I95c09e7aa905345113112329c98d5f00e145b2bb
 2011-12-16 12:52:58 -08:00
Jeff Brown
7e912be098 am 1fd4de0a: Merge "Add plumbing for dumping database info using dumpsys." 
* commit '1fd4de0adc9e93aa01dd8e1aef1a83b85b9a7579':
  Add plumbing for dumping database info using dumpsys.
 2011-12-16 12:35:58 -08:00
Jeff Brown
a8e816e74c am aaf30e37: Merge "Make SQLiteQuery and SQLiteProgram final." 
* commit 'aaf30e370f9a1aa645039138f54246ca4cd483fa':
  Make SQLiteQuery and SQLiteProgram final.
 2011-12-16 12:35:55 -08:00
Jeff Brown
3831e0c604 am 69b3d10d: Merge "Raise default connection pool size." 
* commit '69b3d10d6670d98442a6d06fa833399a3b9f1529':
  Raise default connection pool size.
 2011-12-16 12:35:53 -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
1a346453b8 am fe781c8c: Merge "Don\'t forget to close files." 
* commit 'fe781c8ccff69007ed856faf3dcf1ec04cc835f3':
  Don't forget to close files.
 2011-12-16 12:32:43 -08:00
Dianne Hackborn
fe781c8ccf Merge "Don't forget to close files." 2011-12-16 12:30:25 -08:00
Joe Onorato
20d44b2aeb am c6a7f358: Merge "Add a new ui mode for "appliance"" 
* commit 'c6a7f358e86e9debdc110236797fba911bd9474a':
  Add a new ui mode for "appliance"
 2011-12-16 12:28:49 -08:00
Joe Onorato
c6a7f358e8 Merge "Add a new ui mode for "appliance"" 2011-12-16 12:27:03 -08:00
Roman Nurik
d4fa479298 am d63707f7: am 8cffc318: am a8001e2a: am 00697a90: docs: Add missing intent flag to Android U nav class 
* commit 'd63707f754c0fae88fef8363b3b1d6677f8e0aaf':
  docs: Add missing intent flag to Android U nav class
 2011-12-16 12:11:30 -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
Justin Ho
008c2c214e am 3299ad52: am 9edb26ea: am 043c5f8f: Merge "Cherry-picking Id45abeba and Ia065dec6 for MR1" into ics-mr1 
* commit '3299ad5254523de91a2e7e79a3908cd65b249de6':
  Cherry-picking Id45abeba and Ia065dec6 for MR1
 2011-12-16 11:58:01 -08:00
Jeff Sharkey
f47e8608f4 am 931310f1: Merge "Include roaming in NetworkIdentity.hashCode()." 
* commit '931310f1d213dd29983d26e2fe9d7e5f73f21187':
  Include roaming in NetworkIdentity.hashCode().
 2011-12-16 11:57:58 -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
Alex Sakhartchouk
a50a97cf50 Merge "Refactor some common code and make detecting sdcard paths more robust." into graphics-dev 2011-12-16 11:50:21 -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
Alexander Lucas
9545295f59 am fb833fd4: am f5ed1d4c: am 6469ee80: Merge "Fixed table labelling issues in \'Multiple Dimensions\' multiple apk lesson" into ics-mr1 
* commit 'fb833fd458d8e6296ccef76c97a09613145300ab':
  Fixed table labelling issues in 'Multiple Dimensions' multiple apk lesson
 2011-12-16 11:44:26 -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
e485de1ade am 0705cefc: am 5e7bed0b: am 0f52d766: Merge "docs: fix whitespace in sidenav" into ics-mr1 
* commit '0705cefc707624cbdb6650a52389cc4fcd090ace':
  docs: fix whitespace in sidenav
 2011-12-16 11:36:11 -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
58988e56d1 am cb284e9a: am 1410f8a2: am 795c271f: am eb946fbd: Merge "docs: Minor link fix in Android U class" into ics-mr0 
* commit 'cb284e9a1d1f190d2abd86170378a8c14fa3b5c5':
  docs: Minor link fix in Android U class
 2011-12-16 11:28:55 -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