Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
38,903 Commits 3 Branches 0 Tags
409a57504fe6bb915d85f1091267206f7e0dfdcd
Commit Graph

38903 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nipun Kwatra
453f2ef14a Merge "client_id->clientId, bugfix for signaling of read abort on stop." 2010-08-27 18:21:30 -07:00
Nipun Kwatra
ea434daf19 client_id->clientId, bugfix for signaling of read abort on stop. 
- changed client_id->clientId, mClient_id->mClientId
- there was a bug in the condition for calling
  signalReadComplete_lock() in stop. We should call it only when
  !mLastReadCompleted and also if the current client has not already
  completed its read (this second check was missing before).

Change-Id: I9a57cf6b5c6f3260883a6c74d0c7b22f675c422e
 2010-08-27 18:19:22 -07:00
Kenny Root
818c830c59 am 83285781: am 7046bd92: Merge "Allow native shared libraries in ASEC containers" into gingerbread 
Merge commit '8328578152fbfd23952a6cda4b2e60853d78eb74'

* commit '8328578152fbfd23952a6cda4b2e60853d78eb74':
  Allow native shared libraries in ASEC containers
 2010-08-27 18:11:06 -07:00
Brad Fitzpatrick
3d5c46ce0a am 63b5b870: am 15665bb6: Add current.xml API file missing from I8f2b6b79. 
Merge commit '63b5b8701092de71e48b36cce8eb36f51f9d4d5e'

* commit '63b5b8701092de71e48b36cce8eb36f51f9d4d5e':
  Add current.xml API file missing from I8f2b6b79.
 2010-08-27 18:10:58 -07:00
Dianne Hackborn
405951b59c am 8da20dd0: am 4f8c2f26: Fix docs build. 
Merge commit '8da20dd03797dcdc1f417fe9cebc21825551dd69'

* commit '8da20dd03797dcdc1f417fe9cebc21825551dd69':
  Fix docs build.
 2010-08-27 18:10:49 -07:00
Brad Fitzpatrick
59e6135480 am d71021cb: am 0c731f99: Merge "Send broadcast intent when configured location providers change." into gingerbread 
Merge commit 'd71021cb30bd20dabd6783f4235d5f245a7bd1a3'

* commit 'd71021cb30bd20dabd6783f4235d5f245a7bd1a3':
  Send broadcast intent when configured location providers change.
 2010-08-27 18:10:38 -07:00
Wu-cheng Li
769690e9ea am af610b2b: am 1620d118: Fix SDK build error. 
Merge commit 'af610b2b9fbf6a7e5e03d3d8bce2f4e082d21048'

* commit 'af610b2b9fbf6a7e5e03d3d8bce2f4e082d21048':
  Fix SDK build error.
 2010-08-27 18:10:17 -07:00
James Dong
206bf9df48 am a5fe77d0: am df8356ff: Merge "Workaround for a QCOM issue where the output buffer size advertised by the AVC encoder is occasionally too small." into gingerbread 
Merge commit 'a5fe77d004091bd9521d087c2572f587191afbfc'

* commit 'a5fe77d004091bd9521d087c2572f587191afbfc':
  Workaround for a QCOM issue where the output buffer size advertised by the AVC encoder
 2010-08-27 18:10:01 -07:00
Wu-cheng Li
7fe6d3f13a am 705c2e66: am d851e6fe: Merge "Unhide camera fps range API and deprecate old ones." into gingerbread 
Merge commit '705c2e66dcb358c865cf912a5496825088044b79'

* commit '705c2e66dcb358c865cf912a5496825088044b79':
  Unhide camera fps range API and deprecate old ones.
 2010-08-27 18:09:48 -07:00
Mathias Agopian
bf88d55b9f am e481f19c: am ff3dcf27: Merge "cleanup EGL a bit. remove unused extension." into gingerbread 
Merge commit 'e481f19cf0898ef23423ced82dfaade00faeca9a'

* commit 'e481f19cf0898ef23423ced82dfaade00faeca9a':
  cleanup EGL a bit. remove unused extension.
 2010-08-27 18:09:43 -07:00
James Dong
c6ff7a9189 am 7d3ff384: am b86365ad: Merge "Suppress the video recording start signal - bug 2950297" into gingerbread 
Merge commit '7d3ff3849c830f0136c692b6074f1ba5da288fe7'

* commit '7d3ff3849c830f0136c692b6074f1ba5da288fe7':
  Suppress the video recording start signal
 2010-08-27 18:09:37 -07:00
Andreas Huber
8abd4256f3 am 05c1cada: am 577615c9: Merge "Better support for rtsp (normal play-)time display. Better seek support, timeout if no packets arrive for too long." into gingerbread 
Merge commit '05c1cadaeaf272a70acc889bfccd607648058470'

* commit '05c1cadaeaf272a70acc889bfccd607648058470':
  Better support for rtsp (normal play-)time display. Better seek support, timeout if no packets arrive for too long.
 2010-08-27 18:09:31 -07:00
Andreas Huber
84ecebb922 am e25e0361: am e250c220: Merge "We accidentally always aborted after 10 secs, even if the connection was fine." into gingerbread 
Merge commit 'e25e03612e1a2988ed83f24d2658cf0898fd1944'

* commit 'e25e03612e1a2988ed83f24d2658cf0898fd1944':
  We accidentally always aborted after 10 secs, even if the connection was fine.
 2010-08-27 18:09:21 -07:00
Kenny Root
1c8082b205 resolved conflicts for merge of 053d5ce9 to master 
Change-Id: I910bb7795d987a2d11bc2e4e24f5992a269066cc
 2010-08-27 18:03:15 -07:00
Joe Malin
3e3fcf985f Testing Documentation in the Dev Guide tab 
Change-Id: I36cb020642a7f094d2070509abb280c7c88f607f
 2010-08-27 17:59:38 -07:00
Robert Greenwalt
fc40701c8b Merge "resolved conflicts for merge of 4ea54f44 to master" 2010-08-27 17:27:02 -07:00
Eric Laurent
b8453f4e0e Fix issue 2952766. 
The problem is that the audio policy manager does not handle the input devices
when forced use for telephony is changed.
The problem does not appear in a call over PSTN becasue only teh output devices drives the
routing of in call audio to/from the base band.

The fix consists in modifying AudioPolicyManagerBase::setForceUse() to check for active inputs
and update the input device if needed.

Change-Id: I0d36d1f5eef1cce527929180c29b025439902f10
 2010-08-27 17:10:36 -07:00
Eric Fischer
fd33de37f5 Import revised translations. DO NOT MERGE 
Change-Id: I0f69e84a77ae78da72946178e29ecea9dd3f7062
 2010-08-27 17:08:59 -07:00
Romain Guy
9841ae8245 Merge "Add test for gamma correction." 2010-08-27 16:56:24 -07:00
Romain Guy
4299c0f242 Add test for gamma correction. 
Change-Id: Id2a311bc116438d3627a943cb5fb1ba8dc121bb0
 2010-08-27 16:56:50 -07:00
Daniel Lehmann
fff98cd16b Merge "Perform a float division for screenTravelCount" 2010-08-27 16:45:49 -07:00
Kenny Root
8328578152 am 7046bd92: Merge "Allow native shared libraries in ASEC containers" into gingerbread 
Merge commit '7046bd924f77c54585b9e0e0c95e5edd2ceb55a3' into gingerbread-plus-aosp

* commit '7046bd924f77c54585b9e0e0c95e5edd2ceb55a3':
  Allow native shared libraries in ASEC containers
 2010-08-27 16:45:45 -07:00
Brad Fitzpatrick
63b5b87010 am 15665bb6: Add current.xml API file missing from I8f2b6b79. 
Merge commit '15665bb60eb2ca8d114724379c156ff7f2a6cc53' into gingerbread-plus-aosp

* commit '15665bb60eb2ca8d114724379c156ff7f2a6cc53':
  Add current.xml API file missing from I8f2b6b79.
 2010-08-27 16:43:28 -07:00
Kenny Root
7046bd924f Merge "Allow native shared libraries in ASEC containers" into gingerbread 2010-08-27 16:42:28 -07:00
Daniel Lehmann
4ef1da3c04 Perform a float division for screenTravelCount 
Change-Id: Ie0f23344a26c7ecf1a641e60d649ad0fc54fecbf
 2010-08-27 16:40:59 -07:00
Brad Fitzpatrick
15665bb60e Add current.xml API file missing from I8f2b6b79. 
Fixes build.

Change-Id: I7d845fb45b5221425f41cf3069fea7f31ea6b225
 2010-08-27 16:40:22 -07:00
Kenny Root
85387d7ba3 Allow native shared libraries in ASEC containers 
This change moves the native library handling earlier in the package
installation process so that it may be inserted into ASEC containers
before they are finalized in the DefaultContainerService.

Note that native libraries on SD card requires that vold mount ASEC
containers without the "noexec" flag on the mount point.

Change-Id: Ib34b1886bf6f94b99bb7b3781db6e9b5a58807ba
 2010-08-27 16:40:06 -07:00
Jim Miller
9a96e96208 Merge "Fix 2797185: Show 3D Recents on xlarge device" 2010-08-27 16:38:11 -07:00
Kenny Root
7a97e5a21e am 8e724905: am ad6731b0: Merge "Add debugging to ZipFileRO" into gingerbread 
Merge commit '8e724905261bf4913bac75adc64fb08ed5ba8b7d'

* commit '8e724905261bf4913bac75adc64fb08ed5ba8b7d':
  Add debugging to ZipFileRO
 2010-08-27 16:18:44 -07:00
Gilles Debunne
71eaac0880 am 95464c9a: am 445ab76c: Merge "Broken build. Missing ;" into gingerbread 
Merge commit '95464c9aa063d2e36a0385a60edd6ee519ed2d85'

* commit '95464c9aa063d2e36a0385a60edd6ee519ed2d85':
  Broken build. Missing ;
 2010-08-27 16:18:37 -07:00
Gilles Debunne
2b9e4229a2 am aeaf2830: (-s ours) am e69b2860: Merge "DO NOT MERGE Removed "Stop selecting text" option." into gingerbread 
Merge commit 'aeaf2830f5ab81e6f95062514239081af65a914f'

* commit 'aeaf2830f5ab81e6f95062514239081af65a914f':
  DO NOT MERGE Removed "Stop selecting text" option.
 2010-08-27 16:18:31 -07:00
Brad Fitzpatrick
a222510af8 am 2479097e: am b94493fe: Merge "Document blocking behavior of ImageView setImageURI and setImageResource" into gingerbread 
Merge commit '2479097ecb899f1e193063e3ce126c721e13c455'

* commit '2479097ecb899f1e193063e3ce126c721e13c455':
  Document blocking behavior of ImageView setImageURI and setImageResource
 2010-08-27 16:18:24 -07:00
Mathias Agopian
54c4bf2743 am d322d163: am ae66946b: Merge "fix a race in SF buffer management" into gingerbread 
Merge commit 'd322d16323176ddd5fef3383798176f64d0078c8'

* commit 'd322d16323176ddd5fef3383798176f64d0078c8':
  fix a race in SF buffer management
 2010-08-27 16:18:12 -07:00
Dianne Hackborn
8da20dd037 am 4f8c2f26: Fix docs build. 
Merge commit '4f8c2f26bfd9de8c8a31369dbedd415c7d6d9699' into gingerbread-plus-aosp

* commit '4f8c2f26bfd9de8c8a31369dbedd415c7d6d9699':
  Fix docs build.
 2010-08-27 16:18:09 -07:00
Brad Fitzpatrick
4dcea37d48 am e339c096: am 9020595b: am f5287094: Fix closing tag in docs. 
Merge commit 'e339c0968e781f28e0c690afc746ea3d16aba146'

* commit 'e339c0968e781f28e0c690afc746ea3d16aba146':
  Fix closing tag in docs.
 2010-08-27 16:18:03 -07:00
Dianne Hackborn
4f8c2f26bf Fix docs build. 
Change-Id: I49591c46080361acf5b528116726c27b6ed9da9a
 2010-08-27 16:14:42 -07:00
Brad Fitzpatrick
505735b1cc Merge "resolved conflicts for merge of 28130bae to master" 2010-08-27 16:12:57 -07:00
Mathias Agopian
1ec505668b Merge "Add KHR_gl_texture_2D_image extension string." 2010-08-27 16:11:27 -07:00
Brad Fitzpatrick
7f7ce40f90 resolved conflicts for merge of 28130bae to master 
Change-Id: I13df8dc12092c3d2536e12216df9130d5914380a
 2010-08-27 16:11:27 -07:00
Alex Sakhartchouk
a41174ecb0 Fixing renderscript uniform binding bugs. 
Working on custom shaders.

Change-Id: I0d51e879e1c2b46ef5ab696b35162898f4196fc8
 2010-08-27 16:10:55 -07:00
Brad Fitzpatrick
d71021cb30 am 0c731f99: Merge "Send broadcast intent when configured location providers change." into gingerbread 
Merge commit '0c731f99b05630e16dce572ac206ab75c90891cd' into gingerbread-plus-aosp

* commit '0c731f99b05630e16dce572ac206ab75c90891cd':
  Send broadcast intent when configured location providers change.
 2010-08-27 16:10:06 -07:00
Mathias Agopian
b20a4b960e Add KHR_gl_texture_2D_image extension string. 2010-08-27 16:08:03 -07:00
Gilles Debunne
6ff0dc0ad9 am dfad4276: (-s ours) am 225ad9cb: Merge "DO NOT MERGE Text selection: tapping on selection opens context menu" into gingerbread 
Merge commit 'dfad42760f3c9c3b8439ff4b365256474471abe4'

* commit 'dfad42760f3c9c3b8439ff4b365256474471abe4':
  DO NOT MERGE Text selection: tapping on selection opens context menu
 2010-08-27 16:06:22 -07:00
Gilles Debunne
a16fb779d5 am 084dd872: am b8fd0473: Merge "Fix for 512 limit in assetManager.list" into gingerbread 
Merge commit '084dd872b1bf9f7de87554d40d89df1f30b11c45'

* commit '084dd872b1bf9f7de87554d40d89df1f30b11c45':
  Fix for 512 limit in assetManager.list
 2010-08-27 16:06:13 -07:00
Cary Clark
2af36856e1 am 04108437: (-s ours) am c28bf25b: Merge "DO NOT MERGE copy selected text on tap" into gingerbread 
Merge commit '04108437eda79fc2bad1eb2adf5247c9f4dbc480'

* commit '04108437eda79fc2bad1eb2adf5247c9f4dbc480':
  DO NOT MERGE copy selected text on tap
 2010-08-27 16:05:23 -07:00
Brad Fitzpatrick
0c731f99b0 Merge "Send broadcast intent when configured location providers change." into gingerbread 2010-08-27 16:02:21 -07:00
Brad Fitzpatrick
c026d5cf2f am 603a1f59: am cc033bd3: Merge "Fix some bugs in SettingsProvider that I introduced the other day." into gingerbread 
Merge commit '603a1f59703109c89ec0fdeceb0f8d28c7cede22'

* commit '603a1f59703109c89ec0fdeceb0f8d28c7cede22':
  Fix some bugs in SettingsProvider that I introduced the other day.
 2010-08-27 15:52:56 -07:00
Eric Rowe
bfa6d1dbe4 am aed5d62a: am 8f5007ba: am 163fba0a: Merge "Improve logging and flexibility of BT stress tests." into froyo 
Merge commit 'aed5d62ac1278c032528921798529dbd824a1865'

* commit 'aed5d62ac1278c032528921798529dbd824a1865':
  Improve logging and flexibility of BT stress tests.
 2010-08-27 15:52:33 -07:00
Dianne Hackborn
8e3d2382db Merge "Fix some SDK build breakage. Not all." 2010-08-27 15:42:19 -07:00
Dianne Hackborn
f6d952bbc8 Fix some SDK build breakage. Not all. 
Change-Id: I2791b0a7c48d03cb6e5ca93771efb56c0a0c1956
 2010-08-27 15:41:13 -07:00