Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,823 Commits 3 Branches 0 Tags
543f0c9fa425106f0e4e2901cf5c654287b2bb34
Commit Graph

23823 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Murdoch
543f0c9fa4 Merge Webkit at r58956: Update DRT FileFilter. 
Change-Id: Id88446d6210da81f10d0ae26170addae6595f2a7
 2010-05-14 10:24:56 +01:00
Ben Murdoch
ccee910859 Merge Webkit at r58956: Plugin code has switched to C99 integer types. See http://trac.webkit.org/changeset/58590 
Change-Id: I82798d5af062219a73864c3c3b59a217e882e2a5
 2010-05-14 10:24:45 +01:00
Jeff Hamilton
e26867793b Remove the unused modification APIs from MockCursor. They shouldn't have been public in the first place. 
Change-Id: I2932e5287f838f72acdc4c0c1fd5601ffa8c3f84
 2010-05-13 23:44:10 -05:00
Jeff Hamilton
7cd51efcbd Remove the deprecated cursor methods. 
Change-Id: Ie3571fea9f36996c31c327240b11086f8cc487f0
 2010-05-13 23:44:09 -05:00
Dirk Dougherty
93f8547dcf am e0abb37a: am bfcbd9a9: am d48e0382: am fb473bb6: Merge "Doc change: adjustments for ndk feature description" into froyo 2010-05-13 21:37:49 -07:00
Dirk Dougherty
e0abb37a7b am bfcbd9a9: am d48e0382: am fb473bb6: Merge "Doc change: adjustments for ndk feature description" into froyo 2010-05-13 21:36:17 -07:00
Dirk Dougherty
bfcbd9a9e1 am d48e0382: am fb473bb6: Merge "Doc change: adjustments for ndk feature description" into froyo 
Merge commit 'd48e0382c3db1827ccb79fe912d271d426dd46ad' into kraken

* commit 'd48e0382c3db1827ccb79fe912d271d426dd46ad':
  Doc change: adjustments for ndk feature description
 2010-05-13 21:34:31 -07:00
Dirk Dougherty
d48e0382c3 am fb473bb6: Merge "Doc change: adjustments for ndk feature description" into froyo 
Merge commit 'fb473bb6118f6b82fdeda443b4fdc4ce31d3ed60' into froyo-plus-aosp

* commit 'fb473bb6118f6b82fdeda443b4fdc4ce31d3ed60':
  Doc change: adjustments for ndk feature description
 2010-05-13 21:32:21 -07:00
Dirk Dougherty
6500837c1c am 86c74a2f: am d91ac162: am d317edab: am a0711e7b: Doc change: Add compatibility article. 2010-05-13 21:31:54 -07:00
Dirk Dougherty
fb473bb611 Merge "Doc change: adjustments for ndk feature description" into froyo 2010-05-13 21:31:10 -07:00
Dirk Dougherty
86c74a2f9f am d91ac162: am d317edab: am a0711e7b: Doc change: Add compatibility article. 2010-05-13 21:30:19 -07:00
Dirk Dougherty
346930b74d Doc change: adjustments for ndk feature description 
Change-Id: I3eb35c3d5ad756b7fa71c256b531f262e7940d90
 2010-05-13 21:28:45 -07:00
Dirk Dougherty
d91ac162d1 am d317edab: am a0711e7b: Doc change: Add compatibility article. 
Merge commit 'd317edabe158312981eb73355f77c36566d89627' into kraken

* commit 'd317edabe158312981eb73355f77c36566d89627':
  Doc change: Add compatibility article.
 2010-05-13 21:28:34 -07:00
Dirk Dougherty
d317edabe1 am a0711e7b: Doc change: Add compatibility article. 
Merge commit 'a0711e7b3995f4ae3d8b116030c6b3ed13ad2f99' into froyo-plus-aosp

* commit 'a0711e7b3995f4ae3d8b116030c6b3ed13ad2f99':
  Doc change: Add compatibility article.
 2010-05-13 21:26:22 -07:00
Dirk Dougherty
a0711e7b39 Doc change: Add compatibility article. 
Change-Id: Ie6671813eb88bc8cb92575726f8fcf69eb558d08
 2010-05-13 21:22:44 -07:00
Jason Sams
1be97a80fa Merge "Rename ProgramFragmentStore to ProgramStore." 2010-05-13 18:37:17 -07:00
Jason Sams
54db59c359 Rename ProgramFragmentStore to ProgramStore. 
Change-Id: Ia8ad9ac856944838ced38a2f1e8f07387050bdfd
 2010-05-13 18:35:01 -07:00
Andrew Sapperstein
8d9db8e4c7 Added getNumColumns function to GridView.java. 
Change-Id: I1cec19c77d0ee47278d93c6b0a112edae777e4e9
 2010-05-13 17:45:50 -07:00
James Dong
76922d2ff8 am 79dfb675: am ffd104a9: Merge "Remove dummy surface in CameraSource" into kraken 2010-05-13 16:43:17 -07:00
James Dong
79dfb67531 am ffd104a9: Merge "Remove dummy surface in CameraSource" into kraken 2010-05-13 16:41:50 -07:00
James Dong
ffd104a903 Merge "Remove dummy surface in CameraSource" into kraken 2010-05-13 16:40:19 -07:00
Suchi Amalapurapu
4952aef1c5 am 8e8bb02f: am 3f5ed04f: am b63ea5f7: am c928a11e: Merge "Fix 2672155 Check the code path when enabling disabling packages." into froyo 2010-05-13 16:09:30 -07:00
Suchi Amalapurapu
8e8bb02f3d am 3f5ed04f: am b63ea5f7: am c928a11e: Merge "Fix 2672155 Check the code path when enabling disabling packages." into froyo 2010-05-13 16:07:50 -07:00
Suchi Amalapurapu
3f5ed04f7f am b63ea5f7: am c928a11e: Merge "Fix 2672155 Check the code path when enabling disabling packages." into froyo 
Merge commit 'b63ea5f784b7862a7ab28e0134f6da47f6275810' into kraken

* commit 'b63ea5f784b7862a7ab28e0134f6da47f6275810':
  Fix 2672155
 2010-05-13 16:05:54 -07:00
Suchi Amalapurapu
b63ea5f784 am c928a11e: Merge "Fix 2672155 Check the code path when enabling disabling packages." into froyo 
Merge commit 'c928a11e34678296511d5ea34582292be7368618' into froyo-plus-aosp

* commit 'c928a11e34678296511d5ea34582292be7368618':
  Fix 2672155
 2010-05-13 16:04:24 -07:00
Suchi Amalapurapu
c928a11e34 Merge "Fix 2672155 Check the code path when enabling disabling packages." into froyo 2010-05-13 16:02:20 -07:00
Suchi Amalapurapu
1ace5bc070 Fix 2672155 
Check the code path when enabling disabling packages.

Add unit test

Change-Id: I0f0f482a3735234eab3f63ba1f6462574b70144e
 2010-05-13 15:48:39 -07:00
Nick Kralevich
f5523645a9 am c5fdcaa2: am cf67d18a: Merge "Get rid of warnings when compiled with -Wformat-security" into kraken 2010-05-13 15:39:02 -07:00
Nick Kralevich
c5fdcaa229 am cf67d18a: Merge "Get rid of warnings when compiled with -Wformat-security" into kraken 2010-05-13 15:37:16 -07:00
Nick Kralevich
cf67d18a1d Merge "Get rid of warnings when compiled with -Wformat-security" into kraken 2010-05-13 15:35:48 -07:00
Nick Kralevich
79290ae976 Get rid of warnings when compiled with -Wformat-security 
Change-Id: I5a7ad5be2aaf0fa0d164204d3c1bebf02ec55745
 2010-05-13 15:31:00 -07:00
The Android Open Source Project
a4bb641040 am 1331ded8: am e28776bb: am b1110149: merge from open-source master 2010-05-13 14:59:22 -07:00
The Android Open Source Project
1331ded8fe am e28776bb: am b1110149: merge from open-source master 2010-05-13 14:57:20 -07:00
The Android Open Source Project
e28776bbd7 am b1110149: merge from open-source master 
Merge commit 'b1110149cccc3b99e59ead34ca46e5ac026f6db9' into kraken

* commit 'b1110149cccc3b99e59ead34ca46e5ac026f6db9':
  Use integer for loop counter instead of float
  New test in FrameworkTest for the VelocityTracker class
  Preserve '+' in phone numbers imported from SIM.
 2010-05-13 14:56:02 -07:00
The Android Open Source Project
b1110149cc merge from open-source master 
Change-Id: I88a580162b34a80d1e3e7987b7a301c253afa0e8
 2010-05-13 14:50:16 -07:00
Mike Lockwood
468202dd71 am 702b8752: am 5a9cbb29: am a3d5549c: am 098e58da: Use SystemClock.elapsedRealtime in ShutdownThread timeout logic 2010-05-13 14:09:46 -07:00
Mike Lockwood
702b8752a5 am 5a9cbb29: am a3d5549c: am 098e58da: Use SystemClock.elapsedRealtime in ShutdownThread timeout logic 2010-05-13 14:08:05 -07:00
Romain Guy
743e25c914 Merge "Prevent possible leak in AbsListViews." 2010-05-13 14:06:59 -07:00
Mike Lockwood
5a9cbb291f am a3d5549c: am 098e58da: Use SystemClock.elapsedRealtime in ShutdownThread timeout logic 
Merge commit 'a3d5549c802bc4fbf1e1ca05bc3552db17212036' into kraken

* commit 'a3d5549c802bc4fbf1e1ca05bc3552db17212036':
  Use SystemClock.elapsedRealtime in ShutdownThread timeout logic
 2010-05-13 14:06:25 -07:00
Mike Lockwood
a3d5549c80 am 098e58da: Use SystemClock.elapsedRealtime in ShutdownThread timeout logic 
Merge commit '098e58da93f304d7d7791f193c6237870b94989d' into froyo-plus-aosp

* commit '098e58da93f304d7d7791f193c6237870b94989d':
  Use SystemClock.elapsedRealtime in ShutdownThread timeout logic
 2010-05-13 14:04:30 -07:00
Romain Guy
82afc7b32b Prevent possible leak in AbsListViews. 
This change unregisters a list's data observer from the adapter when the list
is detached from the window. The default data observer impl. is a non-static
inner class with a synthesized pointer to the list. Thus if an app keeps
the adapter around the list is also kept around. This can be a problem with
dialogs in particular.

Change-Id: Ia95a995d3f54b9caf1bbcd2c7239a0318511b08c
 2010-05-13 14:03:09 -07:00
Jaikumar Ganesh
61c98cd643 Merge "Remove duplicate definition of flag." 2010-05-13 13:54:03 -07:00
Dianne Hackborn
3d44416dc4 Merge "Further work on fragments:" 2010-05-13 13:46:30 -07:00
Jaikumar Ganesh
26888576f7 Remove duplicate definition of flag. 
Change-Id: I9bdcdf5f12677162f0b735a277fce8a75fa13d39
 2010-05-13 13:41:37 -07:00
Dianne Hackborn
b4bc78b16a Further work on fragments: 
- Implement all of the state saving and restoring machinery.  This
  caused some flux in the API.
- Add ability to have fragments that are retained across activity
  instances.
- Fix some bugs.

Change-Id: Ib6b5b0752d7f8d667cfdcd3e76d127cc9b6d901b
 2010-05-13 13:36:10 -07:00
Mike Lockwood
098e58da93 Use SystemClock.elapsedRealtime in ShutdownThread timeout logic 
This avoids problems if the time is reset while shutting down.

Change-Id: I54c7c787e55648ebf5a68e79056f92fbac0081ae
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-05-13 16:29:49 -04:00
Mike Lockwood
8d64c9bbce Merge "Exclude mtptest program from simulator builds." 2010-05-13 13:29:28 -07:00
Mike Lockwood
18ff7b4c37 Exclude mtptest program from simulator builds. 
Change-Id: Ia9751a06d7607363e8c16b71f6f3c524833395a0
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-05-13 16:28:00 -04:00
Jaikumar Ganesh
a5a51a76b2 Merge "resolved conflicts for merge of 0de3cc9b to master" 2010-05-13 12:43:50 -07:00
Jaikumar Ganesh
fce9609a18 resolved conflicts for merge of 0de3cc9b to master 
Change-Id: I9fcf892de6ebe90c6a4be19d02e3a009ddda89aa
 2010-05-13 12:42:59 -07:00