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

49588 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wink Saville
d4e264e2fa am 69e830dc: am 8daec83f: Merge "Delay data reconnection after disconnected." into honeycomb-LTE 
* commit '69e830dc31a4f6fc19d8392efede114afd20fe7b':
  Delay data reconnection after disconnected.
 2011-04-28 11:54:54 -07:00
Stephen Hines
009b5a70f8 Merge "Fix RS graphics samples/tests." 2011-04-28 11:54:29 -07:00
Wink Saville
7848b71b4f am 7353301f: Merge "GsmDCT: Reset DataConnection upon APN disable." into honeycomb-LTE 
* commit '7353301f73bfd0fd54ca515f3385946abe56d620':
  GsmDCT: Reset DataConnection upon APN disable.
 2011-04-28 11:53:08 -07:00
Wink Saville
e4c7f3ba0f am 1a517d0c: Merge "Remove subclass cast for calls to isDnsCheckDisabled." into honeycomb-LTE 
* commit '1a517d0c251d2ca577500ec6c0e434725c3ddd21':
  Remove subclass cast for calls to isDnsCheckDisabled.
 2011-04-28 11:53:05 -07:00
Wink Saville
69e830dc31 am 8daec83f: Merge "Delay data reconnection after disconnected." into honeycomb-LTE 
* commit '8daec83f9a3436819854827bcff480ce0a203ddb':
  Delay data reconnection after disconnected.
 2011-04-28 11:53:02 -07:00
Irfan Sheriff
2dbf683b61 am c1f39396: am 8f87f838: Merge "Define Protocol class for use with StateMachine" into honeycomb-LTE 
* commit 'c1f39396b94837f728c56b4c3e2f5c37e1d0eef7':
  Define Protocol class for use with StateMachine
 2011-04-28 11:52:56 -07:00
Wink Saville
7353301f73 Merge "GsmDCT: Reset DataConnection upon APN disable." into honeycomb-LTE 2011-04-28 11:50:24 -07:00
Wink Saville
1a517d0c25 Merge "Remove subclass cast for calls to isDnsCheckDisabled." into honeycomb-LTE 2011-04-28 11:50:15 -07:00
Wink Saville
8daec83f9a Merge "Delay data reconnection after disconnected." into honeycomb-LTE 2011-04-28 11:50:05 -07:00
Conley Owens
5a6a42817d am a60594cb: Fixed bad merge in ViewRoot.java. 
* commit 'a60594cb1c1399f557a82403f7fc7abb7af55250':
  Fixed bad merge in ViewRoot.java.
 2011-04-28 11:49:43 -07:00
Irfan Sheriff
c1f39396b9 am 8f87f838: Merge "Define Protocol class for use with StateMachine" into honeycomb-LTE 
* commit '8f87f8389866058a081e601fc0df45a3527a3150':
  Define Protocol class for use with StateMachine
 2011-04-28 11:48:47 -07:00
Eric Fischer
d17d7f5a4e am b2149f4a: (-s ours) am 1d104476: (-s ours) am a4e7353d: Import revised translations. DO NOT MERGE 
* commit 'b2149f4a11cddba303674298ef543e76ea11475e':
  Import revised translations.  DO NOT MERGE
 2011-04-28 11:48:43 -07:00
Conley Owens
d6eaf9d40c am 4854f70c: Ignore change since file no longer exists 
* commit '4854f70c0881ff44fabd8c261653bd90210bdc22':
  Auto hide virtual keyboard
 2011-04-28 11:48:25 -07:00
Stephen Hines
ac16881490 am 5ac02e73: (-s ours) am 697f8b33: am 00df8e23: Merge "Check setName() for null string + fix rsRand()." into honeycomb-mr1 
* commit '5ac02e73c313935b1af8a536e47f74b616986dfe':
  Check setName() for null string + fix rsRand().
 2011-04-28 11:48:18 -07:00
Conley Owens
8fff7805ab Merge "Remove duplicate '=' in exception message" 2011-04-28 11:46:39 -07:00
Irfan Sheriff
8f87f83898 Merge "Define Protocol class for use with StateMachine" into honeycomb-LTE 2011-04-28 11:38:54 -07:00
Irfan Sheriff
3fc75e9267 Define Protocol class for use with StateMachine 
Adds a common namespace for communication across
different state machines

Change-Id: I0a9ae872112567afd35a1dc95ac9283170f3f459
 2011-04-28 11:10:03 -07:00
Bernhard Reutner-Fischer
c1a9b03a35 Remove duplicate '=' in exception message 
Remove duplicate '=' in IllegalArgumentException of MyAdapter::getItem()

Change-Id: I151a1432a9f54c8d42bae295f3967b0be2223026
 2011-04-28 20:06:44 +02:00
Conley Owens
a60594cb1c Fixed bad merge in ViewRoot.java. 
Change-Id: If76a320da3ecf0d0e9f366eb7157b195274a9e5f
 2011-04-28 11:06:34 -07:00
John Reck
e0d5ad6a0e Merge "Use previous version if version is a codename" 2011-04-28 10:38:50 -07:00
John Reck
f557740789 Use previous version if version is a codename 
When the version is reported as a codename, use the previous version
 in the user agent string.
 Bug: 4347787

Change-Id: Ie42a2fc2f21975b59ccac5547d813d3e777da468
 2011-04-28 10:27:40 -07:00
Eric Fischer
b2149f4a11 am 1d104476: (-s ours) am a4e7353d: Import revised translations. DO NOT MERGE 
* commit '1d10447631c9478fbf9574c3fde1997cc77ee6e4':
  Import revised translations.  DO NOT MERGE
 2011-04-28 10:25:52 -07:00
Daniel Sandler
fbc07f5a88 Merge "Make InputWindow.h's window types align with WindowManager.java's." 2011-04-28 10:22:49 -07:00
Conley Owens
4854f70c08 Ignore change since file no longer exists 2011-04-28 10:10:52 -07:00
Per Andersson
4ae02b37bb Added null check on return value for getKeyDispatcherState() 
The result from getKeyDispatcherState() was used without
checking if it returned null, which resulted in a NullPointerException.

Change-Id: I4b55ad44d5c08b7f729dbbdbcaed0e978a430258
 2011-04-28 12:04:48 +02:00
Jason Sams
75e7b005b8 Merge "Add dalvik code for forEach." 2011-04-27 23:00:40 -07:00
Jason Sams
332d66d6c5 Merge "Start implementing control side forEach." 2011-04-27 23:00:25 -07:00
Wu-cheng Li
61773dbda3 Merge "Unhide camera focus area and metering area API." 2011-04-27 21:17:52 -07:00
Dima Zavin
4135f45c87 view: fix a bad merge 
Change-Id: Ia309b6aca3d303d5ebc6f3def55b2d807ec8ec4b
Signed-off-by: Dima Zavin <dima@android.com>
 2011-04-27 19:07:14 -07:00
Mathias Agopian
431d5cf7d0 Merge "Fix uninitialized variable in SurfaceTexture" 2011-04-27 19:01:01 -07:00
Mathias Agopian
926340cf56 Fix uninitialized variable in SurfaceTexture 
Change-Id: Ie77cdad481fc0522ff5ea3b7e14ce94e07150793
 2011-04-27 18:58:46 -07:00
Stephen Hines
b994ed33c5 Fix RS graphics samples/tests. 
Change-Id: Id5b586a9d9bead426eb46d79a93941893f0d4925
 2011-04-27 18:25:49 -07:00
Stephen Hines
5ac02e73c3 am 697f8b33: am 00df8e23: Merge "Check setName() for null string + fix rsRand()." into honeycomb-mr1 
* commit '697f8b331bb339e4db716efbb96e2182aac40255':
  Check setName() for null string + fix rsRand().
 2011-04-27 17:38:53 -07:00
Stephen Hines
697f8b331b am 00df8e23: Merge "Check setName() for null string + fix rsRand()." into honeycomb-mr1 
* commit '00df8e230ef797729a3618d1d0c19cda3950c922':
  Check setName() for null string + fix rsRand().
 2011-04-27 17:36:38 -07:00
Stephen Hines
00df8e230e Merge "Check setName() for null string + fix rsRand()." into honeycomb-mr1 2011-04-27 17:32:40 -07:00
Dima Zavin
058520e9ee Merge changes I22d9e018,Ib0701fcc,Ibc637918,I9eb7e002,I4adcec73 
* changes:
  audioflinger: don't do work in constructor, instead do it in onFirstRef
  audioflinger: enumerate all the possible audio interfaces
  audio/media: convert to using the audio HAL and new audio defs
  libmedia: move AudioParameter out of AudioSystem
  audioflinger: move legacy audio hw/policy out to libhardware_legacy
 2011-04-27 17:13:46 -07:00
Conley Owens
d21e7b5d54 am c4791bd6: Merge commit \'5e3562a5\' into m 
* commit 'c4791bd65cdf2e487c87da0d863140337e5141cb':
  onDetachedFromWindow is called before onAttachedToWindow
 2011-04-27 17:01:49 -07:00
Conley Owens
c4791bd65c Merge commit '5e3562a5' into m 
Conflicts:
	core/java/android/view/ViewRoot.java

Change-Id: Idd1eb8309e169eae2de3838f7969606df8097b87
 2011-04-27 16:58:24 -07:00
Conley Owens
ca96ed1d0e am eedf20c2: Ignore xml change since file no longer exists 
* commit 'eedf20c2eafde695a5ae50570a21d5449d6903ea':
  Remove errant tag terminator
  Normalize output of XMLtree content
 2011-04-27 16:54:40 -07:00
Conley Owens
eedf20c2ea Ignore xml change since file no longer exists 2011-04-27 16:49:07 -07:00
Jason Sams
6e494d3ab6 Add dalvik code for forEach. 
Change-Id: I26533fc553315b99b8f177ab62d9735a177b26b0
 2011-04-27 16:33:11 -07:00
Dima Zavin
2986f5bed3 audioflinger: don't do work in constructor, instead do it in onFirstRef 
Change-Id: I22d9e01821816c3beb52b014330386c7fd2f0411
Signed-off-by: Dima Zavin <dima@android.com>
 2011-04-27 16:20:22 -07:00
Dima Zavin
31f18889a2 audioflinger: enumerate all the possible audio interfaces 
Keep track of the primary interface that handles the master volume,
etc.

Change-Id: Ib0701fccff8d8783a99035a241ab7c8ec75c00ac
Signed-off-by: Dima Zavin <dima@android.com>
 2011-04-27 16:20:22 -07:00
Gilles Debunne
0d846898ba Merge "Support for overlapping spans in TextView's suggestions." 2011-04-27 16:01:30 -07:00
Gilles Debunne
abe4b55f28 Merge "Typo in TextAppearanceSpan documentation" 2011-04-27 16:00:57 -07:00
Eric Fischer
1d10447631 am a4e7353d: Import revised translations. DO NOT MERGE 
* commit 'a4e7353d33a0736361c866db76008a66ad8fbf8a':
  Import revised translations.  DO NOT MERGE
 2011-04-27 15:30:36 -07:00
Andreas Huber
f4188fa83a Merge "Fix omx_tests to no longer refer to test files that are no longer available." 2011-04-27 15:13:42 -07:00
Jason Sams
a08526ac42 Start implementing control side forEach. 
Change-Id: I2d77d908cbb64b26071d9d5a3421f0b195342d2c
 2011-04-27 15:12:49 -07:00
Andreas Huber
e23a392f70 Fix omx_tests to no longer refer to test files that are no longer available. 
Also make sure that a seek beyond EOF does not just seek the final syncframe.

Change-Id: I0a58490ef719ce095a94f1d6909c60eb20074a0b
 2011-04-27 15:01:50 -07:00
Conley Owens
264254b273 am a6590e7f: am 13b21e60: Merge "Auto hide virtual keyboard" 
* commit 'a6590e7fee1ef4286f0896358593fdb9aab24f6c':
  Auto hide virtual keyboard
 2011-04-27 14:53:26 -07:00