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

43798 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dheeraj Sharma
60a3ead52e am cd73d1ed: Merge "Fix for issue 3404671 Crash when exporting movie in JNI" into honeycomb 
* commit 'cd73d1ed6d1149a2ae642e87ffe8d89100fbafec':
  Fix for issue 3404671 Crash when exporting movie in JNI
 2011-01-30 18:14:40 -08:00
Dheeraj Sharma
cd73d1ed6d Merge "Fix for issue 3404671 Crash when exporting movie in JNI" into honeycomb 2011-01-30 18:12:25 -08:00
Dianne Hackborn
cc322207cc am 97510f6a: am 260c3c77: Fix issue #3381489: IllegalStateException: attempt to re-open... 
* commit '97510f6abda493119cbf7db84064291a7edacfc0':
  Fix issue #3381489: IllegalStateException: attempt to re-open...
 2011-01-30 18:08:12 -08:00
Dianne Hackborn
97510f6abd am 260c3c77: Fix issue #3381489: IllegalStateException: attempt to re-open... 
* commit '260c3c77d9b340164e055f87002c64d78da6e836':
  Fix issue #3381489: IllegalStateException: attempt to re-open...
 2011-01-30 18:05:08 -08:00
Joe Onorato
79728c3c41 am 0bab356f: am fba54f62: Merge "I declare settings panel icon VICTORY!" into honeycomb 
* commit '0bab356fd87a973933ad69a30a400571a8394f0b':
  I declare settings panel icon VICTORY!
 2011-01-30 18:01:47 -08:00
Dianne Hackborn
260c3c77d9 Fix issue #3381489: IllegalStateException: attempt to re-open... 
...an already-closed object: android.database.sqlite.SQLiteQuery

It turns out there is a state we are missing -- the loader is
still needed, but in the inactive list.  In this case the loader
needs to continue holding on to its current data, and not deliver
any new data (which would result in it releasing its old data).

This introduces the new state to Loader, and uses it in
AsyncTaskLoader so all subclasses of that should get the new
correct behavior.

A further improvement would be to unregister CursorLoader's
content listener when going in to this state, but that can
wait for later.

Change-Id: I6d30173b94f8e30b5be31d018accd328cc3388ec
 2011-01-30 17:58:49 -08:00
Joe Onorato
0bab356fd8 am fba54f62: Merge "I declare settings panel icon VICTORY!" into honeycomb 
* commit 'fba54f620ff155ede6de7d73f1b6a0003839b1c4':
  I declare settings panel icon VICTORY!
 2011-01-30 17:58:47 -08:00
Joe Onorato
fba54f620f Merge "I declare settings panel icon VICTORY!" into honeycomb 2011-01-30 17:56:25 -08:00
Joe Onorato
de7feddc87 I declare settings panel icon VICTORY! 
Bug: 3396115
Change-Id: I72c46361506ec48bf3ebc9b84dbc476c301ce20c
 2011-01-30 17:46:32 -08:00
John Reck
592f6f963a am a4b23164: am 13934c2d: Merge "Prevent SET_SCROLL_OFFSET spam from clogging tubes" into honeycomb 
* commit 'a4b23164167c571e6d22c3486105fdef17ff8e4a':
  Prevent SET_SCROLL_OFFSET spam from clogging tubes
 2011-01-30 17:30:17 -08:00
John Reck
a4b2316416 am 13934c2d: Merge "Prevent SET_SCROLL_OFFSET spam from clogging tubes" into honeycomb 
* commit '13934c2d71046cdd2e7ca33528b91cb83f82dc13':
  Prevent SET_SCROLL_OFFSET spam from clogging tubes
 2011-01-30 17:12:29 -08:00
John Reck
13934c2d71 Merge "Prevent SET_SCROLL_OFFSET spam from clogging tubes" into honeycomb 2011-01-30 16:55:23 -08:00
Dharmaray Kundargi
4787643ce9 am 0cc515b4: Merge branch \'honeycomb-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp 
* commit '0cc515b4adf060df0a9c1b07223389f9b73afb55':
 2011-01-30 16:37:44 -08:00
Dharmaray Kundargi
8e6c69b092 am 75aa290d: am ff843254: Merge "Merging the same files on top of tree." into honeycomb 
* commit '75aa290d5d23a9bb862e409f9b5de23a0ffda579':
  Merging the same files on top of tree.
 2011-01-30 16:37:41 -08:00
Jean-Baptiste Queru
64548084ea am ec2cd74e: am 1314bdb2: am e88fa50b: Merge from open-source gingerbread 
* commit 'ec2cd74ee3d43f6d1e6865bf8e576b4b42635a86':
  fix failing thread object run
 2011-01-30 16:35:27 -08:00
Dharmaray Kundargi
0cc515b4ad Merge branch 'honeycomb-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp 2011-01-30 16:35:08 -08:00
Dharmaray Kundargi
75aa290d5d am ff843254: Merge "Merging the same files on top of tree." into honeycomb 
* commit 'ff8432548eb96655190486ee0f0fa08de5451e66':
  Merging the same files on top of tree.
 2011-01-30 16:35:03 -08:00
Jean-Baptiste Queru
d1511205e8 am e97cc7d0: am 8a2f3ecc: am 25503f1c: Merge from gingerbread 
* commit 'e97cc7d0b266ac0cbb1be7cf41ff8bb61067025e':
 2011-01-30 16:34:56 -08:00
Jean-Baptiste Queru
ec2cd74ee3 am 1314bdb2: am e88fa50b: Merge from open-source gingerbread 
* commit '1314bdb2b22ae3613c3e08ae278dbc70f90b965c':
  fix failing thread object run
 2011-01-30 16:32:44 -08:00
Dharmaray Kundargi
ff8432548e Merge "Merging the same files on top of tree." into honeycomb 2011-01-30 16:32:07 -08:00
Jean-Baptiste Queru
e97cc7d0b2 am 8a2f3ecc: am 25503f1c: Merge from gingerbread 
* commit '8a2f3ecc030512b6813ee2bb8c56b77280cad7c5':
 2011-01-30 16:26:18 -08:00
John Reck
636ce004df Prevent SET_SCROLL_OFFSET spam from clogging tubes 
Bug: 3393571
 Limit the event queue to a single pending SET_SCROLL_OFFSET. The
 problem on slashdot.org was that the event thread was being flooded
 with SET_SCROLL_OFFSET messages faster than it could process them,
 causing the handler to get jammed up.

Change-Id: Ia4a90a030959d0b3769067791089cdb261ae403a
 2011-01-30 16:23:09 -08:00
Jean-Baptiste Queru
1314bdb2b2 am e88fa50b: Merge from open-source gingerbread 
* commit 'e88fa50be8d6709ef58b7aeb01c5efa059bcac2e':
  fix failing thread object run
 2011-01-30 16:19:59 -08:00
Adam Powell
c75676f8db am 853f284c: am c9cb3083: Merge "Fix bug 3405899 - android.view.WindowManager" into honeycomb 
* commit '853f284c0b80540cf447af0e6e704d7a05947efd':
  Fix bug 3405899 - android.view.WindowManager$BadTokenException
 2011-01-30 16:17:59 -08:00
Dharmaray Kundargi
4e70320521 Merging the same files on top of tree. 
Add support for .m4v Issue 3395600

Change-Id: Idca673859afb3398d4b91aba9c20c37396c4f757
 2011-01-30 16:17:53 -08:00
Wink Saville
ea9af9e97b Add debug for tracking bug 3404006. 
We need some additional debugging to help diagnose the cause
of this bug. There is no logic changes just additional debugging.

Change-Id: Ifc5d1c82904042fa87fd3b5b1066f58b62e7359c
 2011-01-30 16:16:20 -08:00
Dianne Hackborn
58468459dc am 9e3754ff: am 54ad3611: Merge "Fix issue #3404571: Commit final APIs" into honeycomb 
* commit '9e3754ff6dcc81c43708ce0e13c75de836173f64':
  Fix issue #3404571: Commit final APIs
 2011-01-30 16:15:13 -08:00
Adam Powell
853f284c0b am c9cb3083: Merge "Fix bug 3405899 - android.view.WindowManager" into honeycomb 
* commit 'c9cb30837116b138a91b251e5217a644231eebef':
  Fix bug 3405899 - android.view.WindowManager$BadTokenException
 2011-01-30 16:14:54 -08:00
Adam Powell
c9cb308371 Merge "Fix bug 3405899 - android.view.WindowManager$BadTokenException" into honeycomb 2011-01-30 16:12:56 -08:00
Dianne Hackborn
9e3754ff6d am 54ad3611: Merge "Fix issue #3404571: Commit final APIs" into honeycomb 
* commit '54ad36119460b850641556a12b845eadc9875cb4':
  Fix issue #3404571: Commit final APIs
 2011-01-30 16:11:36 -08:00
Joe Onorato
60d9d9cdba am 75057b15: am 4de68bae: Merge "Check for the STATUS_BAR permission for the system UI properties." into honeycomb 
* commit '75057b1507881625368f76b2f401097b606bd530':
  Check for the STATUS_BAR permission for the system UI properties.
 2011-01-30 16:09:29 -08:00
Jean-Baptiste Queru
8a2f3ecc03 am 25503f1c: Merge from gingerbread 
* commit '25503f1c9f0b5f718052b71dc5b21d1c8576d015':
  fix failing thread object run
 2011-01-30 16:07:25 -08:00
Joe Onorato
75057b1507 am 4de68bae: Merge "Check for the STATUS_BAR permission for the system UI properties." into honeycomb 
* commit '4de68baed4bf18b33dc38f89f25410d3d5edfecf':
  Check for the STATUS_BAR permission for the system UI properties.
 2011-01-30 16:03:59 -08:00
Dianne Hackborn
54ad361194 Merge "Fix issue #3404571: Commit final APIs" into honeycomb 2011-01-30 16:01:36 -08:00
Joe Onorato
4de68baed4 Merge "Check for the STATUS_BAR permission for the system UI properties." into honeycomb 2011-01-30 16:00:52 -08:00
Gilles Debunne
b51ef3c5a1 am 80a3083f: am 236b9872: Merge "Auto-clearing setError popup" into honeycomb 
* commit '80a3083fdd106b2f839d50e1c861347faa969781':
  Auto-clearing setError popup
 2011-01-30 15:56:41 -08:00
Gilles Debunne
80a3083fdd am 236b9872: Merge "Auto-clearing setError popup" into honeycomb 
* commit '236b9872140599d1856d48e53b8e109e506fd88f':
  Auto-clearing setError popup
 2011-01-30 15:53:03 -08:00
Gilles Debunne
236b987214 Merge "Auto-clearing setError popup" into honeycomb 2011-01-30 15:49:38 -08:00
Adam Powell
65a1de963a Fix bug 3405899 - android.view.WindowManager$BadTokenException 
Clear any pending runnables involved with TextViews when cursor
controllers are released

Change-Id: I96898fcc237f20d0b0f2351181244cb171fa2083
 2011-01-30 15:47:29 -08:00
Joe Onorato
ac0ee89bd9 Check for the STATUS_BAR permission for the system UI properties. 
If the app doesn't have that permission, just mask out the bits.
Also makes the systemUiVisibility field visible in hierarchyviewer.

Change-Id: Ic3d3a3aed96b5c6448832755b4b2e6175117e5be
 2011-01-30 15:38:30 -08:00
Jean-Baptiste Queru
25503f1c9f Merge from gingerbread 
Change-Id: I017330e0232b317b8bb54e19ab05874b18c83246
 2011-01-30 15:35:17 -08:00
Jean-Baptiste Queru
e88fa50be8 Merge from open-source gingerbread 
Change-Id: I56f2ed37187796807fbf0de15274a85164f9432c
 2011-01-30 15:30:03 -08:00
Dheeraj Sharma
407a558af5 am 471ebbca: am 45911e19: Merge "Fix for issue 3400229 Pan and Zoom effect is not accurate in JAVA and JNI" into honeycomb 
* commit '471ebbca5f404062bed232aa27da9c1f1ebf0a1d':
  Fix for issue 3400229 Pan and Zoom effect is not accurate in JAVA and JNI
 2011-01-30 15:25:07 -08:00
Dheeraj Sharma
471ebbca5f am 45911e19: Merge "Fix for issue 3400229 Pan and Zoom effect is not accurate in JAVA and JNI" into honeycomb 
* commit '45911e1969fd1843bac5806e06f351123b67f596':
  Fix for issue 3400229 Pan and Zoom effect is not accurate in JAVA and JNI
 2011-01-30 15:22:39 -08:00
Dheeraj Sharma
45911e1969 Merge "Fix for issue 3400229 Pan and Zoom effect is not accurate in JAVA and JNI" into honeycomb 2011-01-30 15:20:49 -08:00
Jean-Baptiste Queru
65aef1517b Merge "fix failing thread object run" into gingerbread 2011-01-30 15:17:33 -08:00
Dheeraj Sharma
085787a402 am bd633b72: am 167e7488: Merge "3404665 Preview window is blank after returning from playing exported movie" into honeycomb 
* commit 'bd633b7297c60771223f0e8799c418cdbce3017c':
  3404665 Preview window is blank after returning from playing exported movie
 2011-01-30 15:13:31 -08:00
Dheeraj Sharma
bd633b7297 am 167e7488: Merge "3404665 Preview window is blank after returning from playing exported movie" into honeycomb 
* commit '167e7488af4d53673ff2fcc0723ae2a1584f5194':
  3404665 Preview window is blank after returning from playing exported movie
 2011-01-30 15:10:25 -08:00
Dheeraj Sharma
167e7488af Merge "3404665 Preview window is blank after returning from playing exported movie" into honeycomb 2011-01-30 15:08:12 -08:00
Jamie Gennis
4453b1a5b6 am 09443aeb: am 62884505: Merge "Reset ANativeWindow crop on buffer geometry changes." into honeycomb 
* commit '09443aeb6470d66f5bc1938b70d74b3e2f9bbbb9':
  Reset ANativeWindow crop on buffer geometry changes.
 2011-01-30 15:05:42 -08:00