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

62871 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathias Agopian
bb9ba8bae5 BitTube::read now handles EAGAIN 
Change-Id: Iacda2386342ba0727bbf278f6c597488d5467bb8
 2011-11-29 11:42:59 -08:00
Eric Fischer
fa56c714f2 Import revised translations. DO NOT MERGE 
Change-Id: Ia50fd44ea4492188f481e652caae940acaf961e2
 2011-11-29 11:42:53 -08:00
Mathias Agopian
1e773932a1 am db0bc7d4: am 3f2730c5: Merge "temporarily hardcode Nexus S refresh rate" into ics-mr1 
* commit 'db0bc7d46cacb6446deb7c59d39ce563846d7071':
  temporarily hardcode Nexus S refresh rate
 2011-11-29 11:39:49 -08:00
Mathias Agopian
db0bc7d46c am 3f2730c5: Merge "temporarily hardcode Nexus S refresh rate" into ics-mr1 
* commit '3f2730c5317700e3ae5412b5c825a747b591ebc2':
  temporarily hardcode Nexus S refresh rate
 2011-11-29 11:36:54 -08:00
Mathias Agopian
3f2730c531 Merge "temporarily hardcode Nexus S refresh rate" into ics-mr1 2011-11-29 11:35:07 -08:00
Eric Fischer
9b4268697f Merge "Import revised translations." 2011-11-29 11:09:51 -08:00
Eric Fischer
4a97ebfec5 Import revised translations. 
Change-Id: Ie43246df49b8f6ef3daef12e0d8fb5c2f573874e
 2011-11-29 10:29:25 -08:00
Dianne Hackborn
45c62be2bc am e2d76314: am 9b518d93: Merge "Fix issue #5642121: Proximity sensor didn\'t turn the screen on in call" into ics-mr1 
* commit 'e2d76314cdd64cc69c791af0ee2fd2bbcc0425ba':
  Fix issue #5642121: Proximity sensor didn't turn the screen on in call
 2011-11-29 10:20:03 -08:00
Dianne Hackborn
e2d76314cd am 9b518d93: Merge "Fix issue #5642121: Proximity sensor didn\'t turn the screen on in call" into ics-mr1 
* commit '9b518d9304eb4ad17591944926231b661a3dfce0':
  Fix issue #5642121: Proximity sensor didn't turn the screen on in call
 2011-11-29 10:17:42 -08:00
Dianne Hackborn
9b518d9304 Merge "Fix issue #5642121: Proximity sensor didn't turn the screen on in call" into ics-mr1 2011-11-29 10:16:11 -08:00
Jaikumar Ganesh
f96ccc175d am f4e41c35: am eb701df8: Merge "Cleanup references when turning BT off." into ics-mr1 
* commit 'f4e41c35387728720780935564a491cf9bf1357e':
  Cleanup references when turning BT off.
 2011-11-29 10:09:40 -08:00
Jaikumar Ganesh
9ab5ef2741 am 910ae39f: am ff33b94e: Merge "Cleanup static references when quitting." into ics-mr1 
* commit '910ae39f8a12bcb917b7eb1da3f701925da79509':
  Cleanup static references when quitting.
 2011-11-29 10:09:38 -08:00
Gilles Debunne
c273cd318d Merge "Restoring mLayout has private in TextView" 2011-11-29 10:09:25 -08:00
Jaikumar Ganesh
f4e41c3538 am eb701df8: Merge "Cleanup references when turning BT off." into ics-mr1 
* commit 'eb701df88cb3027d6323f9e2607cbe4d5ca93ac2':
  Cleanup references when turning BT off.
 2011-11-29 10:07:09 -08:00
Jaikumar Ganesh
910ae39f8a am ff33b94e: Merge "Cleanup static references when quitting." into ics-mr1 
* commit 'ff33b94e236fcde3833fba698d32d0e6b98fa303':
  Cleanup static references when quitting.
 2011-11-29 10:07:07 -08:00
Jaikumar Ganesh
eb701df88c Merge "Cleanup references when turning BT off." into ics-mr1 2011-11-29 10:05:27 -08:00
Jaikumar Ganesh
ff33b94e23 Merge "Cleanup static references when quitting." into ics-mr1 2011-11-29 10:05:13 -08:00
Gilles Debunne
e29e4d2ade am 9d8d5297: am 10232fe6: Merge "Extracted text problems" into ics-mr1 
* commit '9d8d529739b1b9790599364f57cffbe022d15ee2':
  Extracted text problems
 2011-11-29 10:04:01 -08:00
Gilles Debunne
6c9d4f3cd3 am 0dca407e: am 7be31bd9: Merge "IOOB in text selection." into ics-mr1 
* commit '0dca407eede3d85a0185718f4993c2b09d1cc658':
  IOOB in text selection.
 2011-11-29 10:01:43 -08:00
Gilles Debunne
9d8d529739 am 10232fe6: Merge "Extracted text problems" into ics-mr1 
* commit '10232fe63916d03d147d0a07f8bf4d70cb60941c':
  Extracted text problems
 2011-11-29 10:01:35 -08:00
Gilles Debunne
0dca407eed am 7be31bd9: Merge "IOOB in text selection." into ics-mr1 
* commit '7be31bd96a4cc71ebc2539573f062fa53cc7cb05':
  IOOB in text selection.
 2011-11-29 09:59:25 -08:00
Gilles Debunne
10232fe639 Merge "Extracted text problems" into ics-mr1 2011-11-29 09:59:00 -08:00
Gilles Debunne
7be31bd96a Merge "IOOB in text selection." into ics-mr1 2011-11-29 09:56:58 -08:00
Daniel Sandler
0e9c942e4a am 834c2870: am fed7a99a: Merge "Quick fix for bug 5646217 blocking automation tests" into ics-mr1 
* commit '834c2870fa422098b3728ae26099b3030994f86f':
  Quick fix for bug 5646217 blocking automation tests
 2011-11-29 05:54:09 -08:00
Daniel Sandler
834c2870fa am fed7a99a: Merge "Quick fix for bug 5646217 blocking automation tests" into ics-mr1 
* commit 'fed7a99a5294856d930e18225898828bd6755be1':
  Quick fix for bug 5646217 blocking automation tests
 2011-11-29 05:51:18 -08:00
Daniel Sandler
fed7a99a52 Merge "Quick fix for bug 5646217 blocking automation tests" into ics-mr1 2011-11-29 05:49:11 -08:00
Wu-cheng Li
9d062cfe94 Add camera focus move callback. 
bug:5534973
Change-Id: Iaadcb2738ad040f94849be30ee531326f6199431
 2011-11-29 14:28:05 +08:00
Yu Shan Emily Lau
9a8246c8d1 am 77d1ebbd: am 4e5d3f2c: Merge "Add the min fps option to set the min fps in the media recorder test. Add the procmem log to the media memory stress test." into ics-mr1 
* commit '77d1ebbd7bd42d849911e680a63eec02e8b444db':
  Add the min fps option to set the min fps in the media recorder test. Add the procmem log to the media memory stress test.
 2011-11-28 19:57:26 -08:00
Yu Shan Emily Lau
77d1ebbd7b am 4e5d3f2c: Merge "Add the min fps option to set the min fps in the media recorder test. Add the procmem log to the media memory stress test." into ics-mr1 
* commit '4e5d3f2ca05b513640d3163155756e01ae577d54':
  Add the min fps option to set the min fps in the media recorder test. Add the procmem log to the media memory stress test.
 2011-11-28 19:55:27 -08:00
Yu Shan Emily Lau
4e5d3f2ca0 Merge "Add the min fps option to set the min fps in the media recorder test. Add the procmem log to the media memory stress test." into ics-mr1 2011-11-28 19:53:58 -08:00
Gilles Debunne
cdfab19bf7 Restoring mLayout has private in TextView 
Change-Id: If8c4385ec0b64fb2055f4561aeeb1c145294d679
 2011-11-28 18:05:03 -08:00
Christopher Tate
2f9e260185 am 6d7bd049: am 05160615: Merge "Add iteration-limited mode to FrameworkPerf" into ics-mr1 
* commit '6d7bd049b02cd24429e540b764c44c8371b7d5eb':
  Add iteration-limited mode to FrameworkPerf
 2011-11-28 18:00:36 -08:00
Christopher Tate
6d7bd049b0 am 05160615: Merge "Add iteration-limited mode to FrameworkPerf" into ics-mr1 
* commit '051606150a80efa71b139e9d52fe6c8b2c02c884':
  Add iteration-limited mode to FrameworkPerf
 2011-11-28 17:58:25 -08:00
Christopher Tate
051606150a Merge "Add iteration-limited mode to FrameworkPerf" into ics-mr1 2011-11-28 17:56:18 -08:00
Yu Shan Emily Lau
99b4523b75 Add the min fps option to set 
the min fps in the media recorder test.
Add the procmem log to the media
memory stress test.

Change-Id: Icf82f12adeca7072a171991d1d6a994e4bb7764a
 2011-11-28 17:56:02 -08:00
Christopher Tate
80a682bc3d Add iteration-limited mode to FrameworkPerf 
You can run tests for exactly N iterations regardless of duration now,
in addition to the previous time-limited behavior.

(Clean cherry-pick to break a dependency on a previous patch that
needs work before being committed.)

Change-Id: I2e6cf511bbe968a6f95391567658722e87dfa1fe
 2011-11-28 17:48:55 -08:00
Xia Wang
462a9da4c3 am 4f5434f3: am e5715521: am 2d9f4620: Fix build 
* commit '4f5434f3a3ce51d7d6caf463e5571bb686e2bdd1':
  Fix build
 2011-11-28 16:59:20 -08:00
Dianne Hackborn
81de8b99f5 Fix issue #5642121: Proximity sensor didn't turn the screen on in call 
Turning animations back on exposed this.  The problem is that when the
screen brightness changes, it initiates a brightness animation.  When
we force the screen to black as we wait for it to be ready to display,
it sees that an animation is running so stops it and thinks this means
it should now turn the display off.

To fix this, don't modify the screen brightness while we are waiting
to show the screen.  This is good anyway because the whole point is to
avoid showing the screen until ready, and modifying the brightness at
that point would turn it on prematurely.

Change-Id: I84b296f8ca5705c2d237ea7741cdeb95c5521df9
 2011-11-28 16:57:37 -08:00
Dianne Hackborn
c0b7f65ae0 am 496f6e2a: am b54980d1: Merge "Fix issue #5588689: Black camera preview after coming back from gmail" into ics-mr1 
* commit '496f6e2ad656c5bb8a277e191554d16abd290b58':
  Fix issue #5588689: Black camera preview after coming back from gmail
 2011-11-28 16:57:17 -08:00
Xia Wang
4f5434f3a3 am e5715521: am 2d9f4620: Fix build 
* commit 'e5715521232443f01f8c0c0633cac364c8136bde':
  Fix build
 2011-11-28 16:57:14 -08:00
Dianne Hackborn
496f6e2ad6 am b54980d1: Merge "Fix issue #5588689: Black camera preview after coming back from gmail" into ics-mr1 
* commit 'b54980d1d4d903f68cdfa952256afff01902cd94':
  Fix issue #5588689: Black camera preview after coming back from gmail
 2011-11-28 16:55:05 -08:00
Xia Wang
e571552123 am 2d9f4620: Fix build 
* commit '2d9f4620625405b916aa27177a6b5f82f8e5b15d':
  Fix build
 2011-11-28 16:53:50 -08:00
Dianne Hackborn
b54980d1d4 Merge "Fix issue #5588689: Black camera preview after coming back from gmail" into ics-mr1 2011-11-28 16:53:00 -08:00
Xia Wang
2d9f462062 Fix build 
Change-Id: I465d85e4783763f311ed6ec0a09c1edde9712405
 2011-11-28 16:49:06 -08:00
Andreas Huber
66a051af37 Finer granularity discontinuity support. 
No clients can signal a format change on either audio or video track (or both)
and a time discontinuity (timestamps changed) independantly.

Change-Id: I3e6cf4e7c260e85759879d61a9b517f68431c22f
related-to-bug: 5553055
 2011-11-28 16:45:13 -08:00
Andreas Huber
551aeac336 Make sure we can properly shutdown even if 
a) one of the two decoders has a pending discontinuity
b) the renderer holds on to all output buffers for that decoder
c) the renderer is paused

if all three conditions are met the decoder won't ask for more input data
and therefore never see the discontinuity.

To avoid this we briefly resume the renderer just before shutting down.

Change-Id: I9e08af2a1eb4298d1cd00497d6aa33f4ad184e9a
related-to-bug: 5655016
 2011-11-28 16:27:35 -08:00
Jaikumar Ganesh
9bb275197d Cleanup references when turning BT off. 
Bug: 5572649
Change-Id: I62f9e0620832b69995d5c6e1c24634c9a3895a4b
 2011-11-28 16:19:36 -08:00
Jaikumar Ganesh
6f9a61651e Cleanup static references when quitting. 
The State machine was leaking references when it was
getting created and destroyed.

Change-Id: I7904baf0482eef1617071d159d7b283566b4095c
 2011-11-28 16:19:30 -08:00
Romain Guy
cb52d67600 am 02e88f23: am 46685db9: Merge "Fix crash in existing applications Bug #5659476" into ics-mr1 
* commit '02e88f23a65c602e83d7a46c0925e653b948e418':
  Fix crash in existing applications Bug #5659476
 2011-11-28 16:11:27 -08:00
Romain Guy
02e88f23a6 am 46685db9: Merge "Fix crash in existing applications Bug #5659476" into ics-mr1 
* commit '46685db957cc01cef4ba198aafe44d99fe31f62c':
  Fix crash in existing applications Bug #5659476
 2011-11-28 16:08:52 -08:00