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

29333 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Huber
3a2dc0d573 am b690e55d: Merge "DO NOT MERGE - Instead of asserting that ISurface successfully registered buffers, report an error and propagate it up to the java client." into gingerbread 
* commit 'b690e55d3f713d68c6ed9654a05a5370bda731d5':
  DO NOT MERGE - Instead of asserting that ISurface successfully registered buffers, report an error and propagate it up to the java client.
 2010-11-30 11:53:01 -08:00
Dirk Dougherty
fb9612ba98 am 04d2cc05: Merge "Do not merge: Doc change: API diff report for gingerbread." into gingerbread 
* commit '04d2cc05a2a59bf61bead85d58bc4c186392d91d':
  Do not merge: Doc change: API diff report for gingerbread.
 2010-11-30 11:48:51 -08:00
Dirk Dougherty
ba5d11bdba am 50f8445e: Do not merge: Doc change: highlights and SDK version notes for Android 2.3 platform. 
* commit '50f8445edd14a21ad86080ff7b204eefdc2c62d5':
  Do not merge: Doc change: highlights and SDK version notes for Android 2.3 platform.
 2010-11-30 11:48:46 -08:00
Eric Fischer
30a0e0db71 am 3e6fb5d6: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit '3e6fb5d66eed34c91b9b056ad2d4c317186476fd':
  Import revised translations.  DO NOT MERGE
 2010-11-30 11:48:00 -08:00
Wink Saville
2ebb3a2d9b am f3166799: Merge "Fix GSM permanent failure handling, DO NOT MERGE." into gingerbread 
* commit 'f316679971be356dbb01f991e95742bc5f2a8383':
  Fix GSM permanent failure handling, DO NOT MERGE.
 2010-11-30 11:46:34 -08:00
Ben Murdoch
d2607118ed am 27e728f2: Merge "Hide plugin views when we start playing HTML5 video" into gingerbread 
* commit '27e728f22d954caa7252be6c19a67a9277e1db3b':
  Hide plugin views when we start playing HTML5 video
 2010-11-30 11:46:24 -08:00
Hung-ying Tyan
c41b27e274 am 349f3509: Merge "Correct SipService.isOpened() implementation." into gingerbread 
* commit '349f3509f7335bbdef443a75afa36fb3c2d9552c':
  Correct SipService.isOpened() implementation.
 2010-11-30 11:46:15 -08:00
Hung-ying Tyan
5c85338dcf am d9e12303: Merge "Notify SipSessions before closing SIP stack." into gingerbread 
* commit 'd9e12303d279654afe16319f948f93490cd1b4d5':
  Notify SipSessions before closing SIP stack.
 2010-11-30 11:46:08 -08:00
Hung-ying Tyan
0e58a95298 am 0bba9535: Merge "Throw proper exceptions in SipManager" into gingerbread 
* commit '0bba9535413f9ceefe03f1cef9ddaddccd05cae5':
  Throw proper exceptions in SipManager
 2010-11-30 11:46:01 -08:00
Chia-chi Yeh
4f93f08d8c am 683a7ff9: Merge "Visualizer: Fix the conversion from 8-bit sample to 16-bit sample." into gingerbread 
* commit '683a7ff922409d2aa6c944bc4e08de32029e80e5':
  Visualizer: Fix the conversion from 8-bit sample to 16-bit sample.
 2010-11-30 11:45:54 -08:00
Irfan Sheriff
ea6bb1b4d7 am ee93169e: Merge "DO NOT MERGE fix runstate race condition" into gingerbread 
* commit 'ee93169ed1072d3be627601223dafbcc061e7568':
  DO NOT MERGE fix runstate race condition
 2010-11-30 11:45:45 -08:00
Chia-chi Yeh
e843dfa8dc am bd399b0b: Merge "RTP: Pause echo suppressor when far-end volume is low." into gingerbread 
* commit 'bd399b0bd205a1a3889bae1a619c6d4d4a0f4816':
  RTP: Pause echo suppressor when far-end volume is low.
 2010-11-30 11:45:31 -08:00
Andreas Huber
b690e55d3f Merge "DO NOT MERGE - Instead of asserting that ISurface successfully registered buffers, report an error and propagate it up to the java client." into gingerbread 2010-11-30 11:42:22 -08:00
Dirk Dougherty
04d2cc05a2 Merge "Do not merge: Doc change: API diff report for gingerbread." into gingerbread 2010-11-30 11:27:15 -08:00
Dirk Dougherty
077ceb34a5 Do not merge: Doc change: API diff report for gingerbread. 
Change-Id: I14e59a2281fac9a437ebf52df4c846e7a1e9cc4a
 2010-11-30 11:25:24 -08:00
Dirk Dougherty
50f8445edd Do not merge: Doc change: highlights and SDK version notes for Android 2.3 platform. 
Change-Id: I08a2f67d324484ed05b956c540facd69f9028563
 2010-11-30 10:54:06 -08:00
Andreas Huber
122a9ccbcd DO NOT MERGE - Instead of asserting that ISurface successfully registered buffers, report an error and propagate it up to the java client. 
Change-Id: Ibb14e5aff20920da4917d85de38ba3a8ee71d0bd
related-to-bug: 3188835
 2010-11-30 10:50:25 -08:00
Eric Fischer
3e6fb5d66e Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-11-30 10:12:46 -08:00
Wink Saville
f316679971 Merge "Fix GSM permanent failure handling, DO NOT MERGE." into gingerbread 2010-11-30 08:15:41 -08:00
Ben Murdoch
27e728f22d Merge "Hide plugin views when we start playing HTML5 video" into gingerbread 2010-11-30 02:43:29 -08:00
Hung-ying Tyan
349f3509f7 Merge "Correct SipService.isOpened() implementation." into gingerbread 2010-11-30 00:56:57 -08:00
Hung-ying Tyan
d9e12303d2 Merge "Notify SipSessions before closing SIP stack." into gingerbread 2010-11-30 00:54:51 -08:00
Hung-ying Tyan
0bba953541 Merge "Throw proper exceptions in SipManager" into gingerbread 2010-11-30 00:51:22 -08:00
Chia-chi Yeh
683a7ff922 Merge "Visualizer: Fix the conversion from 8-bit sample to 16-bit sample." into gingerbread 2010-11-29 22:56:56 -08:00
Irfan Sheriff
ee93169ed1 Merge "DO NOT MERGE fix runstate race condition" into gingerbread 2010-11-29 22:26:52 -08:00
Chia-chi Yeh
bd399b0bd2 Merge "RTP: Pause echo suppressor when far-end volume is low." into gingerbread 2010-11-29 22:19:57 -08:00
Dirk Dougherty
f4c2eaf262 am 47ccfcb0: Doc change: add AccelerometerPlay to the generated samples. 
* commit '47ccfcb015c06f12eb91ccbb1113c15a368960d8':
  Doc change: add AccelerometerPlay to the generated samples.
 2010-11-29 18:16:50 -08:00
Dirk Dougherty
47ccfcb015 Doc change: add AccelerometerPlay to the generated samples. 
Change-Id: I95764f216455bbceef7fa95a1a819b906e4e7e7c
 2010-11-29 18:12:36 -08:00
Dirk Dougherty
cb1af77f1f am b1150edc: Remove HeavyWeight sample from generated html samples. 
* commit 'b1150edc22d97b36c626a460717803f22b9fa5f2':
  Remove HeavyWeight sample from generated html samples.
 2010-11-29 17:12:40 -08:00
Dirk Dougherty
b1150edc22 Remove HeavyWeight sample from generated html samples. 
Change-Id: Idafb3d225d8e6a694faa2d8679c4dad6198df466
 2010-11-29 17:03:15 -08:00
Eric Fischer
9d9f83a787 Import revised translations. DO NOT MERGE 
Change-Id: I627dac0019241260b99a049091dca67dae996246
 2010-11-29 16:14:35 -08:00
Trevor Johns
d3f19b86b0 am 210e9c4a: Merge "Revert "Disabling AccessibilityService sample from build system."" into gingerbread 
* commit '210e9c4a8b1fdbe9c409f9ce426907587430858a':
  Revert "Disabling AccessibilityService sample from build system."
 2010-11-24 16:23:47 -08:00
Trevor Johns
210e9c4a8b Merge "Revert "Disabling AccessibilityService sample from build system."" into gingerbread 2010-11-24 16:21:16 -08:00
Trevor Johns
e66593b47c Revert "Disabling AccessibilityService sample from build system." 
This re-enables the AccessibilityService sample.

This reverts commit ca9d51b15074163521b140dce431cc3a10cb56fe.
 2010-11-24 16:03:21 -08:00
Xia Wang
a23fff3351 am c1c04ad0: Merge "Add Wi-Fi tests for static IP. DO NOT MERGE" into gingerbread 
* commit 'c1c04ad047d7ca2f13aa5c9883da7219df5bee57':
  Add Wi-Fi tests for static IP. DO NOT MERGE
 2010-11-24 13:29:56 -08:00
Xia Wang
c1c04ad047 Merge "Add Wi-Fi tests for static IP. DO NOT MERGE" into gingerbread 2010-11-24 13:27:53 -08:00
Scott Main
9e3d14c4aa am 93116f8f: am 3577f51d: docs: clarify <include> layout properties bug: 3227820 
* commit '93116f8fb171a3cf0e9b68b70e2b275a8b6a32f7':
  docs: clarify <include> layout properties bug: 3227820
 2010-11-24 12:43:08 -08:00
Scott Main
93116f8fb1 am 3577f51d: docs: clarify <include> layout properties bug: 3227820 
* commit '3577f51d4bc236a11e283855337752a7b6897f8b':
  docs: clarify <include> layout properties bug: 3227820
 2010-11-24 12:39:42 -08:00
Scott Main
3577f51d4b docs: clarify <include> layout properties 
bug: 3227820

Change-Id: Id5130cd805ee2ea545a795019fb375ffd841727f
 2010-11-24 11:24:33 -08:00
Jean-Baptiste Queru
9df7f31359 am f0f6c54b: Merge "frameworks/base: Destroy the overlay even if there is an error" 
* commit 'f0f6c54b13831b11bd7a3bd7a01dc49b7505e56e':
  frameworks/base: Destroy the overlay even if there is an error
 2010-11-23 11:14:57 -08:00
Jean-Baptiste Queru
f0f6c54b13 Merge "frameworks/base: Destroy the overlay even if there is an error" 2010-11-23 11:02:09 -08:00
Gloria Wang
3e18dfab34 am 4da48ec8: Merge "Notify the playback status to DRM agents before the playback starts" 
* commit '4da48ec88338af2df6f9abba850fb4c65918bb82':
  Notify the playback status to DRM agents before the playback starts
 2010-11-22 21:26:13 -08:00
Gloria Wang
24a90c2674 am d9334934: Merge "Update of DRM Framework." 
* commit 'd93349342a89a25c7a884e8543c6adc048c5f86d':
  Update of DRM Framework.
 2010-11-22 21:25:56 -08:00
Gloria Wang
4da48ec883 Merge "Notify the playback status to DRM agents before the playback starts" 2010-11-22 21:15:07 -08:00
Gloria Wang
d93349342a Merge "Update of DRM Framework." 2010-11-22 21:14:09 -08:00
Xia Wang
739d0aed02 Add Wi-Fi tests for static IP. DO NOT MERGE 
- Add support in parser to parse static IP settings
- Add test for static IP configuration

Change-Id: I37e11ceb0f34c87113d8281b4de09893506c29e7
 2010-11-22 19:10:01 -08:00
Jean-Baptiste Queru
8484e57f30 resolved conflicts for merge of e4ae7fc3 to gingerbread-plus-aosp 
Change-Id: I2e0a0ed622bc4c32d79936b30ebbf9068b3bdee8
 2010-11-22 16:32:34 -08:00
Jean-Baptiste Queru
e4ae7fc3eb Merge "Enabling cell broadcast (SMS-CB) support in the platform." 2010-11-22 15:59:04 -08:00
Xia Wang
6bdd69370f am 5df8c155: Merge "Add Wifi Tethering stress test" into gingerbread 
* commit '5df8c155872833647ac56951ab90bd26a9af9480':
  Add Wifi Tethering stress test
 2010-11-22 14:46:33 -08:00
Xia Wang
5df8c15587 Merge "Add Wifi Tethering stress test" into gingerbread 2010-11-22 14:44:49 -08:00