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

29773 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Rowe
8e1bc8c508 am 6151a9ef: (-s ours) am f72b0e44: Merge "DO NOT MERGE Add A2DP and Headset connection stress tests." into gingerbread 
Merge commit '6151a9ef232b9d4d2b38761159f49181679a6a17'

* commit '6151a9ef232b9d4d2b38761159f49181679a6a17':
  DO NOT MERGE Add A2DP and Headset connection stress tests.
 2010-08-30 13:30:10 -07:00
Andreas Huber
3678668997 am 7ed9104c: am f6639c46: Finetune some rtsp timeout constants. 
Merge commit '7ed9104c3acb172a480ebd7fd456fe69efd1ec3d'

* commit '7ed9104c3acb172a480ebd7fd456fe69efd1ec3d':
  Finetune some rtsp timeout constants.
 2010-08-30 13:30:05 -07:00
Eric Fischer
5366f26cdb am a7dae24c: (-s ours) am 01ee34d7: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
Merge commit 'a7dae24ccde658d8da00e9b738ba334704dca1e8'

* commit 'a7dae24ccde658d8da00e9b738ba334704dca1e8':
  Import revised translations.  DO NOT MERGE
 2010-08-30 13:29:57 -07:00
Andreas Huber
631025eec0 am 6df6d606: am df992ac9: Merge "ALoopers can now be named (useful to distinguish threads)." into gingerbread 
Merge commit '6df6d60681be9d524ce7fc07f2511008de424d27'

* commit '6df6d60681be9d524ce7fc07f2511008de424d27':
  ALoopers can now be named (useful to distinguish threads).
 2010-08-30 13:29:51 -07:00
Imre Sunyi
ec959a7e38 am 1429f465: am fd04143a: Shutdown when capacity is 0% and no charging or when battery is dead 
Merge commit '1429f465f42bb9e3ef3ecfd1ee9af214901fc999'

* commit '1429f465f42bb9e3ef3ecfd1ee9af214901fc999':
  Shutdown when capacity is 0% and no charging or when battery is dead
 2010-08-30 13:28:16 -07:00
Romain Guy
7dff1a7214 Make profiling easier. 
Change-Id: I3d4a0a0ead72569a8950bc986dfe584b186e0d65
 2010-08-30 12:49:07 -07:00
Eric Rowe
6151a9ef23 am f72b0e44: Merge "DO NOT MERGE Add A2DP and Headset connection stress tests." into gingerbread 
Merge commit 'f72b0e447296bc07104af62c33c56bc15b7a6677' into gingerbread-plus-aosp

* commit 'f72b0e447296bc07104af62c33c56bc15b7a6677':
  DO NOT MERGE Add A2DP and Headset connection stress tests.
 2010-08-30 12:33:52 -07:00
Andreas Huber
7ed9104c3a am f6639c46: Finetune some rtsp timeout constants. 
Merge commit 'f6639c46e83a1ccab7b293192c208091d17c61be' into gingerbread-plus-aosp

* commit 'f6639c46e83a1ccab7b293192c208091d17c61be':
  Finetune some rtsp timeout constants.
 2010-08-30 12:33:25 -07:00
Eric Fischer
a7dae24ccd am 01ee34d7: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
Merge commit '01ee34d7078afcf4d938d4c3ea29a4b9fdcc02f8' into gingerbread-plus-aosp

* commit '01ee34d7078afcf4d938d4c3ea29a4b9fdcc02f8':
  Import revised translations.  DO NOT MERGE
 2010-08-30 12:33:19 -07:00
Andreas Huber
6df6d60681 am df992ac9: Merge "ALoopers can now be named (useful to distinguish threads)." into gingerbread 
Merge commit 'df992ac9cc54cedb3e384617ed683a2d1a24d38b' into gingerbread-plus-aosp

* commit 'df992ac9cc54cedb3e384617ed683a2d1a24d38b':
  ALoopers can now be named (useful to distinguish threads).
 2010-08-30 12:33:08 -07:00
Daisuke Miyakawa
da2ccb49b1 Merge "Fix NPE when Spinner is reused." 2010-08-30 12:22:47 -07:00
Daisuke Miyakawa
3f10b1c8f8 Fix NPE when Spinner is reused. 
Bug: 2958228
Change-Id: I2c5e322b92fd4896361d02a307d0ba0ef3d33029
 2010-08-30 11:52:35 -07:00
Eric Rowe
f72b0e4472 Merge "DO NOT MERGE Add A2DP and Headset connection stress tests." into gingerbread 2010-08-30 11:37:10 -07:00
Patrick Dubroy
6dabe240ed Add an Intent category for apps that provide an app market. 2010-08-30 11:29:10 -07:00
Alex Sakhartchouk
9846bc6a9b Merge "Fixing renderscript uniform binding bugs. Working on custom shaders." 2010-08-30 10:39:46 -07:00
Andreas Huber
f6639c46e8 Finetune some rtsp timeout constants. 
Change-Id: Ice731c5097c2a2dee8a7f0cd45b547cd34f532c6
 2010-08-30 10:35:56 -07:00
Mike Lockwood
5367ab6aab MTP: Move all MTP protocol constants for Java to a central location. 
Change-Id: I770d8727f84d25f0781fc23eedd9e9ac9ded1992
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-08-30 13:35:03 -04:00
Imre Sunyi
1429f465f4 am fd04143a: Shutdown when capacity is 0% and no charging or when battery is dead 
Merge commit 'fd04143a47770256dabcfa4d8447127b3ec8b2bf' into gingerbread-plus-aosp

* commit 'fd04143a47770256dabcfa4d8447127b3ec8b2bf':
  Shutdown when capacity is 0% and no charging or when battery is dead
 2010-08-30 10:33:35 -07:00
Eric Fischer
01ee34d707 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-08-30 10:28:58 -07:00
Andreas Huber
df992ac9cc Merge "ALoopers can now be named (useful to distinguish threads)." into gingerbread 2010-08-30 10:28:24 -07:00
Mike Lockwood
daeeddc5ed MTP: Fix build break due to misuse of "git add -i" command 
Change-Id: I85528a43a56942dde921603a353383e2c8f8d93d
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-08-30 12:26:08 -04:00
Mike Lockwood
af2ba835f5 Merge "MTP: Add try/finally handling to finalize overrides" 2010-08-30 08:59:21 -07:00
Derek Sollenberger
3a23a3f367 am a3faa923: am 6726d6bb: Merge "Support pre-loading browser plugins on the system image." into gingerbread 
Merge commit 'a3faa923a0ac8d0d58409fcf7c99e8ff7b261ef4'

* commit 'a3faa923a0ac8d0d58409fcf7c99e8ff7b261ef4':
  Support pre-loading browser plugins on the system image.
 2010-08-30 08:34:23 -07:00
Derek Sollenberger
a3faa923a0 am 6726d6bb: Merge "Support pre-loading browser plugins on the system image." into gingerbread 
Merge commit '6726d6bb1a30167786864c445cbe0370ee0dd58c' into gingerbread-plus-aosp

* commit '6726d6bb1a30167786864c445cbe0370ee0dd58c':
  Support pre-loading browser plugins on the system image.
 2010-08-30 08:06:36 -07:00
Derek Sollenberger
6726d6bb1a Merge "Support pre-loading browser plugins on the system image." into gingerbread 2010-08-30 07:31:46 -07:00
Mike Lockwood
dbead321da MTP: Add try/finally handling to finalize overrides 
Change-Id: I23c481d6214ed5f045f903845632c07c11bb42a3
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-08-30 09:27:55 -04:00
Joe Malin
1604ae6456 Merge "Testing Documentation in the Dev Guide tab" 2010-08-28 10:04:20 -07:00
Omari Stephens
c5d8f66140 Revert "Fix build." 
This reverts commit 27cf4ad88ff8ba2b64d806b0ebb0181b1f42c888.

Ironically, this change (to fix the build in gingerbread) ended up
breaking the (previously-green) build in master.  It probably should
have been marked to not merge.  Either way, this fixes the master
build
 2010-08-27 23:43:08 -07:00
Daniel Sandler
9cf455f40f am 02b19843: am 27cf4ad8: Fix build. 
Merge commit '02b19843d4fb28103cc4b21aa2017eeca795d87d'

* commit '02b19843d4fb28103cc4b21aa2017eeca795d87d':
  Fix build.
 2010-08-27 20:42:11 -07:00
Daniel Sandler
02b19843d4 am 27cf4ad8: Fix build. 
Merge commit '27cf4ad88ff8ba2b64d806b0ebb0181b1f42c888' into gingerbread-plus-aosp

* commit '27cf4ad88ff8ba2b64d806b0ebb0181b1f42c888':
  Fix build.
 2010-08-27 20:39:39 -07:00
Daniel Sandler
27cf4ad88f Fix build. 
Change-Id: I848bf50dc7c928e53a3637c4cec51ebcaef4f47f
 2010-08-27 23:36:20 -04:00
Daniel Sandler
1bc2c58d69 am 554d8726: (-s ours) am 0776deff: More obsolete status bar bits. DO NOT MERGE 
Merge commit '554d8726f8df053c07e0c68e43f060019c11264e'

* commit '554d8726f8df053c07e0c68e43f060019c11264e':
  More obsolete status bar bits. DO NOT MERGE
 2010-08-27 20:03:18 -07:00
Daniel Sandler
6e25ccaf6e am 44af754c: (-s ours) am d02bdaab: Remove experimental immersive mode support. DO NOT MERGE 
Merge commit '44af754cf0c9ad9a8162e1bd2af60737e81a8beb'

* commit '44af754cf0c9ad9a8162e1bd2af60737e81a8beb':
  Remove experimental immersive mode support. DO NOT MERGE
 2010-08-27 20:03:14 -07:00
Daniel Sandler
554d8726f8 am 0776deff: More obsolete status bar bits. DO NOT MERGE 
Merge commit '0776deff39b7fe8435f2cbf6aa84bf202bac70f5' into gingerbread-plus-aosp

* commit '0776deff39b7fe8435f2cbf6aa84bf202bac70f5':
  More obsolete status bar bits. DO NOT MERGE
 2010-08-27 20:00:40 -07:00
Daniel Sandler
44af754cf0 am d02bdaab: Remove experimental immersive mode support. DO NOT MERGE 
Merge commit 'd02bdaab495641ab50e2123fdfd99a819cc40540' into gingerbread-plus-aosp

* commit 'd02bdaab495641ab50e2123fdfd99a819cc40540':
  Remove experimental immersive mode support. DO NOT MERGE
 2010-08-27 20:00:29 -07:00
Daniel Sandler
0776deff39 More obsolete status bar bits. DO NOT MERGE 
Bug: 2949215
Change-Id: Ibf39d37df63ce4bbd0e0da5325495feec9d69a67
 2010-08-27 22:57:39 -04:00
Daniel Sandler
d02bdaab49 Remove experimental immersive mode support. DO NOT MERGE 
Bug: 2949215

Change-Id: I7d998ef571ef7e149bb96261430e92150b80b77d
 2010-08-27 22:57:39 -04:00
Omari Stephens
68e8816f6d Fix float precision thingie in current.xml 
Change-Id: I54e0290118eb34b098ef43ff1351194c2d8051dc
 2010-08-27 19:20:12 -07:00
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