Commit Graph

25194 Commits

Author SHA1 Message Date
Mathias Agopian
d12a98e2b1 am 9abce39a: Merge "fix [2421247] implement eglGetProcAddress(), needed in the ndk" into gingerbread
Merge commit '9abce39a991a6bc1cfab4284b5448a4f676bb06f' into gingerbread-plus-aosp

* commit '9abce39a991a6bc1cfab4284b5448a4f676bb06f':
  fix [2421247] implement eglGetProcAddress(), needed in the ndk
2010-08-03 11:30:42 -07:00
Mathias Agopian
9abce39a99 Merge "fix [2421247] implement eglGetProcAddress(), needed in the ndk" into gingerbread 2010-08-03 11:29:15 -07:00
Konstantin Lopyrev
77c444dd2b am 6fcf3a51: Merge "Improving profiling of views." into gingerbread
Merge commit '6fcf3a518526d4f844830735ca1a2ae82a7500d8' into gingerbread-plus-aosp

* commit '6fcf3a518526d4f844830735ca1a2ae82a7500d8':
  Improving profiling of views.
2010-08-03 11:26:25 -07:00
Konstantin Lopyrev
b59b120929 am 321f7fad: Making sure that there is no notification when focus changes from something to nothing.
Merge commit '321f7fad5c4a6ef27e944dc72e2ddbfb61af81de' into gingerbread-plus-aosp

* commit '321f7fad5c4a6ef27e944dc72e2ddbfb61af81de':
  Making sure that there is no notification when focus changes from something to nothing.
2010-08-03 11:26:21 -07:00
Konstantin Lopyrev
6fcf3a5185 Merge "Improving profiling of views." into gingerbread 2010-08-03 11:24:23 -07:00
Konstantin Lopyrev
321f7fad5c Making sure that there is no notification when focus changes from something to nothing.
Change-Id: Ib8b3bdd7f5dd999c933a017fe1b34263afe38e4a
2010-08-03 11:21:55 -07:00
James Dong
246aad12cf am 3d84280c: Merge "File writer has a designated writer thread now" into gingerbread
Merge commit '3d84280ccc31d12765e2efe03e2dd3ade1acfc33' into gingerbread-plus-aosp

* commit '3d84280ccc31d12765e2efe03e2dd3ade1acfc33':
  File writer has a designated writer thread now
2010-08-03 10:37:32 -07:00
James Dong
3d84280ccc Merge "File writer has a designated writer thread now" into gingerbread 2010-08-03 10:35:55 -07:00
James Dong
9b84e8df41 am a788026f: Merge "Fixed a typo in a method name of MediaPlayerPerformance.java class" into gingerbread
Merge commit 'a788026fd35eee2190dc7635e1fdbc781f6ef668' into gingerbread-plus-aosp

* commit 'a788026fd35eee2190dc7635e1fdbc781f6ef668':
  Fixed a typo in a method name of MediaPlayerPerformance.java class
2010-08-03 10:10:31 -07:00
James Dong
a788026fd3 Merge "Fixed a typo in a method name of MediaPlayerPerformance.java class" into gingerbread 2010-08-03 09:59:11 -07:00
Konstantin Lopyrev
f8e1219cf8 Improving profiling of views.
Change-Id: I1abb8c21f1769ad55416f37e7bfa1458b80ace63
2010-08-02 19:08:56 -07:00
Mathias Agopian
3944eab21c fix [2421247] implement eglGetProcAddress(), needed in the ndk
Change-Id: I5027a27b43c0dd449a404024087853ca05bb8e4e
2010-08-02 18:23:36 -07:00
James Dong
51a260d8c6 am 23796e3b: Merge "Add lost frame handling in AudioSource" into gingerbread
Merge commit '23796e3b622c6be4feb15d4d57e58645acfa431b' into gingerbread-plus-aosp

* commit '23796e3b622c6be4feb15d4d57e58645acfa431b':
  Add lost frame handling in AudioSource
2010-08-02 18:15:48 -07:00
James Dong
23796e3b62 Merge "Add lost frame handling in AudioSource" into gingerbread 2010-08-02 18:13:54 -07:00
James Dong
da8073c68e File writer has a designated writer thread now
+ This reduces the file I/O block time for audio/video track processing
- Since the file writer is buffering some output samples, the memory
  usage would go up, depending on how many output samples are buffered.

Change-Id: I780cc5b26f4b53a5efbd643fcf9505dfc19cd4cd
2010-08-02 18:08:02 -07:00
Scott Main
fa32a45af7 am f2d16bc5: am 5aa4680e: update device dashboard
Merge commit 'f2d16bc595fec67e1fe08c341abb9ec2e776aafb' into gingerbread-plus-aosp

* commit 'f2d16bc595fec67e1fe08c341abb9ec2e776aafb':
  update device dashboard
2010-08-02 17:45:05 -07:00
Scott Main
f2d16bc595 am 5aa4680e: update device dashboard
Merge commit '5aa4680eb07fd4ca9212ee29c4fc0659e00c958d' into gingerbread

* commit '5aa4680eb07fd4ca9212ee29c4fc0659e00c958d':
  update device dashboard
2010-08-02 17:42:11 -07:00
Scott Main
5aa4680eb0 update device dashboard
Change-Id: I79ebf6fa740e19f32d724e9b8a387f2a143fdf7a
2010-08-02 17:38:37 -07:00
Steve Howard
8078222070 am 14805b6c: Merge "New secure setting for mobile download size limit." into gingerbread
Merge commit '14805b6c1ff0fe5324d05ba1dd5053cdf61459b7' into gingerbread-plus-aosp

* commit '14805b6c1ff0fe5324d05ba1dd5053cdf61459b7':
  New secure setting for mobile download size limit.
2010-08-02 16:51:52 -07:00
Steve Howard
14805b6c1f Merge "New secure setting for mobile download size limit." into gingerbread 2010-08-02 16:49:22 -07:00
Steve Howard
9c4e33e04a New secure setting for mobile download size limit.
Change-Id: I0024d632721f59349e211c0b74dd7271423dacd5
2010-08-02 16:35:23 -07:00
John Wang
e0b35c6d44 am 8bffa72b: Merge changes Ic30e2801,I387bab4d into gingerbread
Merge commit '8bffa72b9c711fec231108977ad9f2ba72678a82' into gingerbread-plus-aosp

* commit '8bffa72b9c711fec231108977ad9f2ba72678a82':
  Handle call list in CallManager "do not merge".
  Create CallManager class "do not merge"
2010-08-02 15:33:47 -07:00
John Wang
8bffa72b9c Merge changes Ic30e2801,I387bab4d into gingerbread
* changes:
  Handle call list in CallManager "do not merge".
  Create CallManager class "do not merge"
2010-08-02 15:31:37 -07:00
Christopher Tate
79f2d00596 am a213ce02: Merge "Mute a common-case progress log about input injection" into gingerbread
Merge commit 'a213ce02ced6511edf02e29c45057f344bfe8636' into gingerbread-plus-aosp

* commit 'a213ce02ced6511edf02e29c45057f344bfe8636':
  Mute a common-case progress log about input injection
2010-08-02 15:19:19 -07:00
John Wang
4de9d20260 Handle call list in CallManager "do not merge".
Cherry-picked from master.
Update APIs to access foregroudCalls, backgroudCalls, and ringingCalls
     * 1. APIs to access list of calls
     * 2. APIs to check if any active call, which has connection other than
     * disconnected ones, pleaser refer to Call.isIdle()
     * 3. APIs to return first active call
     * 4. APIs to return the connections of first active call
     * 5. APIs to return other property of first active call

Change-Id: Ic30e28018d14e496e9427f96fec8a7c2ff7c1549
2010-08-02 15:18:17 -07:00
Christopher Tate
a213ce02ce Merge "Mute a common-case progress log about input injection" into gingerbread 2010-08-02 15:14:44 -07:00
John Wang
ccd88b6594 Create CallManager class "do not merge"
Cherry-pick from master.
Initial check-in to support multiple call channels.

Change-Id: I387bab4d69ee38d738c5e0e0a51f1ac6607b9759
2010-08-02 15:13:53 -07:00
Kenny Root
59d4a5369c am 739cdab7: Merge "Do not deference before null check" into gingerbread
Merge commit '739cdab7cb63d53440bb411fa2d558e2114b4c81' into gingerbread-plus-aosp

* commit '739cdab7cb63d53440bb411fa2d558e2114b4c81':
  Do not deference before null check
2010-08-02 13:29:01 -07:00
Kenny Root
739cdab7cb Merge "Do not deference before null check" into gingerbread 2010-08-02 12:33:40 -07:00
Wink Saville
7472c219a1 am 1540a7ea: am c69f5be0: Add PhoneSubInfo.getCompleteVoiceMailNumber.
Merge commit '1540a7ea1afcb772b5fcf90f635153f6489eb8ed' into gingerbread-plus-aosp

* commit '1540a7ea1afcb772b5fcf90f635153f6489eb8ed':
  Add PhoneSubInfo.getCompleteVoiceMailNumber.
2010-08-02 12:06:34 -07:00
Wink Saville
1540a7ea1a am c69f5be0: Add PhoneSubInfo.getCompleteVoiceMailNumber.
Merge commit 'c69f5be0ed3529564e5db6874de52775c2c99007' into gingerbread

* commit 'c69f5be0ed3529564e5db6874de52775c2c99007':
  Add PhoneSubInfo.getCompleteVoiceMailNumber.
2010-08-02 12:02:42 -07:00
Christopher Tate
09e85dc027 Mute a common-case progress log about input injection
Change-Id: I37c9f5cb239ab93fde3a42f71f2782d8734c53ce
2010-08-02 11:59:11 -07:00
Wink Saville
c69f5be0ed Add PhoneSubInfo.getCompleteVoiceMailNumber.
PhoneSubInfo.getVoiceMailNumber now returns only the network
portion of the voicemail number. Use the new method
PhoneSubInfo.getCompleteVoiceMailNumber to get the netowrk
portion and the post dial portion.

Bug: 2881483
Change-Id: I7637d4fa0ffa046b4eebc4d599719bb668c940b5
2010-08-02 11:07:51 -07:00
Scott Main
77a66069eb am d3579580: am 9cd79790: Merge "Doc change: Add nexus one to dev phones." into froyo
Merge commit 'd3579580df0cea7e37334d83ef7a9aa85ad70368' into gingerbread-plus-aosp

* commit 'd3579580df0cea7e37334d83ef7a9aa85ad70368':
  Doc change: Add nexus one to dev phones.
2010-08-02 09:29:49 -07:00
Scott Main
d3579580df am 9cd79790: Merge "Doc change: Add nexus one to dev phones." into froyo
Merge commit '9cd797902ec8404c5958214fc078d75e87248bf3' into gingerbread

* commit '9cd797902ec8404c5958214fc078d75e87248bf3':
  Doc change: Add nexus one to dev phones.
2010-08-02 09:23:50 -07:00
Scott Main
9cd797902e Merge "Doc change: Add nexus one to dev phones." into froyo 2010-08-02 09:16:30 -07:00
Brad Fitzpatrick
4edd80db95 am ee34a49f: Add missing word from docs.
Merge commit 'ee34a49ffc92590cb59f3e17a3df136b67701529' into gingerbread-plus-aosp

* commit 'ee34a49ffc92590cb59f3e17a3df136b67701529':
  Add missing word from docs.
2010-08-02 08:02:05 -07:00
Brad Fitzpatrick
ee34a49ffc Add missing word from docs.
My mistaker from an earlier commit.

Change-Id: Ic04b3c411da32f7dca03d23d39182915e3567172
2010-08-02 07:54:18 -07:00
Kenny Root
930d3af75f Do not deference before null check
The return of parsePackageLite wasn't checked until after it was
deferenced. Move the deference below the null check and remove redundant
set.

Bug: 2852726
Change-Id: I3eaaea5050948145eed44b64507dc846993d98eb
2010-08-02 07:52:56 -07:00
Dianne Hackborn
f4e145fd12 am 543f250d: Merge "Make the systemui process persistent." into gingerbread
Merge commit '543f250d9cb05ebca4fb4dacce37545c0bb9a8ca' into gingerbread-plus-aosp

* commit '543f250d9cb05ebca4fb4dacce37545c0bb9a8ca':
  Make the systemui process persistent.
2010-07-30 19:12:50 -07:00
Dianne Hackborn
543f250d9c Merge "Make the systemui process persistent." into gingerbread 2010-07-30 19:10:01 -07:00
Mathias Agopian
67e4ff768d am 4d7fc365: Merge "remove copybit hack from software opengl (libagl)" into gingerbread
Merge commit '4d7fc3651bd93d588d2b8580010414b59bc67729' into gingerbread-plus-aosp

* commit '4d7fc3651bd93d588d2b8580010414b59bc67729':
  remove copybit hack from software opengl (libagl)
2010-07-30 18:03:17 -07:00
Mathias Agopian
4d7fc3651b Merge "remove copybit hack from software opengl (libagl)" into gingerbread 2010-07-30 18:01:25 -07:00
Dirk Dougherty
bd5029403e am 483b20e5: am 2ff1ba01: Doc change: Cleanup for licensing doc.
Merge commit '483b20e5ae65495d841de1844d97d79fbc0c1866' into gingerbread-plus-aosp

* commit '483b20e5ae65495d841de1844d97d79fbc0c1866':
  Doc change: Cleanup for licensing doc.
2010-07-30 17:40:28 -07:00
Dirk Dougherty
483b20e5ae am 2ff1ba01: Doc change: Cleanup for licensing doc.
Merge commit '2ff1ba012c59169c9719cfab4516b9149414380b' into gingerbread

* commit '2ff1ba012c59169c9719cfab4516b9149414380b':
  Doc change: Cleanup for licensing doc.
2010-07-30 17:37:39 -07:00
Dianne Hackborn
26755a347c Make the systemui process persistent.
This ensures that the system won't kill it for memory,
the user can't stop services inside of it, etc.

Change-Id: I923c376afa1133bccc000253f5bba851f9119a52
2010-07-30 17:24:38 -07:00
James Dong
a9015bb24f Fixed a typo in a method name of MediaPlayerPerformance.java class
Change-Id: Ice9f931312b738fc62205988891f35907e8733d9
2010-07-30 17:16:19 -07:00
Kenny Root
9117669c7d am 8b61b68b: Merge "Only install after MCS success" into gingerbread
Merge commit '8b61b68b648985df37197de204398f608c4ad8b1' into gingerbread-plus-aosp

* commit '8b61b68b648985df37197de204398f608c4ad8b1':
  Only install after MCS success
2010-07-30 17:00:01 -07:00
Kenny Root
8b61b68b64 Merge "Only install after MCS success" into gingerbread 2010-07-30 16:55:37 -07:00
Kenny Root
6f89fa07b4 Only install after MCS success
If MCS dies in the middle of a call during install, only proceed if the
call was successful. Otherwise wait for the max retries to be reached
and run the failure handling code there.

Change-Id: I00a27ea91046ea6521a3cff5e5ffe2c71b2b5bb4
2010-07-30 16:35:04 -07:00