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

22550 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaikumar Ganesh
1aea42aecc am ca4d4de8: Merge "Revert "Fix runtime reboot when connecting to a A2DP headset and"" into kraken 2010-05-04 15:55:02 -07:00
Jaikumar Ganesh
ca4d4de865 Merge "Revert "Fix runtime reboot when connecting to a A2DP headset and"" into kraken 2010-05-04 15:53:31 -07:00
Jaikumar Ganesh
9997f66f62 Revert "Fix runtime reboot when connecting to a A2DP headset and" 
This reverts commit 55b0110fc298c403887b1311d7eabfffa230495f.
 2010-05-04 15:52:42 -07:00
Adam Powell
b7e23dbef3 am 37f4f5b1: am d135f74b: am 151af19b: Fix bug 2651076 - Catch/log ActivityNotFoundException in MenuItemImpl.invoke() 2010-05-04 15:43:14 -07:00
Adam Powell
37f4f5b1ea am d135f74b: am 151af19b: Fix bug 2651076 - Catch/log ActivityNotFoundException in MenuItemImpl.invoke() 
Merge commit 'd135f74b972b88de2ae8b11b3ada886d29c1e25d' into kraken

* commit 'd135f74b972b88de2ae8b11b3ada886d29c1e25d':
  Fix bug 2651076 - Catch/log ActivityNotFoundException in MenuItemImpl.invoke()
 2010-05-04 15:41:41 -07:00
Adam Powell
d135f74b97 am 151af19b: Fix bug 2651076 - Catch/log ActivityNotFoundException in MenuItemImpl.invoke() 
Merge commit '151af19bf409a47424ddaa51e1ac4a0c532c4eb6' into froyo-plus-aosp

* commit '151af19bf409a47424ddaa51e1ac4a0c532c4eb6':
  Fix bug 2651076 - Catch/log ActivityNotFoundException in MenuItemImpl.invoke()
 2010-05-04 15:40:36 -07:00
Jaikumar Ganesh
fb50b1ce34 am 55b0110f: Fix runtime reboot when connecting to a A2DP headset and user toggles BT state. 2010-05-04 15:31:16 -07:00
Jaikumar Ganesh
55b0110fc2 Fix runtime reboot when connecting to a A2DP headset and 
user toggles BT state.

Bug:2607218

This happens when Bluetooth is turned off, and when the headset is
still trying to connect. We get the connection result of
attempt before Bluetooth was toggled. We need to ignore this result.

Change-Id: I023406ec6d59880754ca4f1de676d0dce71b13c6
 2010-05-04 15:28:27 -07:00
James Dong
b8a8f85027 am 8d30b2d2: Merge "Support AAC recording" into kraken 2010-05-04 14:52:57 -07:00
Andreas Huber
d818d52f1b am ce0bd717: am 8ea45aad: am e083d0a2: Merge "Support for Ogg Vorbis decoding in stagefright." into froyo 2010-05-04 14:52:47 -07:00
Scott Main
d582694cbf am ebad36db: am 5c16039a: am 01451756: Merge "docs: revise and add documentation for backup APIs" into froyo 2010-05-04 14:52:43 -07:00
Adam Powell
151af19bf4 Fix bug 2651076 - Catch/log ActivityNotFoundException in MenuItemImpl.invoke() 
Change-Id: I841a37349fbc6af33073aaecae903eb8999cc5bd
 2010-05-04 14:44:45 -07:00
James Dong
8d30b2d284 Merge "Support AAC recording" into kraken 2010-05-04 14:40:28 -07:00
Andreas Huber
ce0bd71735 am 8ea45aad: am e083d0a2: Merge "Support for Ogg Vorbis decoding in stagefright." into froyo 
Merge commit '8ea45aad100ee25067b2e83703454c71a968ba4f' into kraken

* commit '8ea45aad100ee25067b2e83703454c71a968ba4f':
  Support for Ogg Vorbis decoding in stagefright.
 2010-05-04 14:30:34 -07:00
Andreas Huber
8ea45aad10 am e083d0a2: Merge "Support for Ogg Vorbis decoding in stagefright." into froyo 
Merge commit 'e083d0a2f50906423ab548047d436c74648fc488' into froyo-plus-aosp

* commit 'e083d0a2f50906423ab548047d436c74648fc488':
  Support for Ogg Vorbis decoding in stagefright.
 2010-05-04 14:29:04 -07:00
Andreas Huber
e083d0a2f5 Merge "Support for Ogg Vorbis decoding in stagefright." into froyo 2010-05-04 14:27:26 -07:00
Scott Main
ebad36db56 am 5c16039a: am 01451756: Merge "docs: revise and add documentation for backup APIs" into froyo 
Merge commit '5c16039adfe3da2d9438b8814734f5c8d2570ad3' into kraken

* commit '5c16039adfe3da2d9438b8814734f5c8d2570ad3':
  docs: revise and add documentation for backup APIs
 2010-05-04 14:22:47 -07:00
Scott Main
5c16039adf am 01451756: Merge "docs: revise and add documentation for backup APIs" into froyo 
Merge commit '014517569f6378e90cd3b0b5a3f86dfa9b8bf942' into froyo-plus-aosp

* commit '014517569f6378e90cd3b0b5a3f86dfa9b8bf942':
  docs: revise and add documentation for backup APIs
 2010-05-04 14:21:21 -07:00
Scott Main
014517569f Merge "docs: revise and add documentation for backup APIs" into froyo 2010-05-04 14:20:02 -07:00
Daniel Sandler
59bfdab355 am f24e66db: am 342a3800: am 70c6bb0d: Merge "Increase the row height of menus by 1dip." into froyo 2010-05-04 12:55:03 -07:00
Dan Morrill
69a0791779 am 6a22fb9b: am f7ebcfec: am e17b4e71: Merge "Adding the backward-compatible filtering heuristics for the new device features definitions added in FroYo." into froyo 2010-05-04 12:54:58 -07:00
Joe Onorato
6cb9d189a8 am 07779ac1: am 77da7312: am f140be6c: Call into app widget hosts when the provider is updated. 2010-05-04 12:54:54 -07:00
Daniel Sandler
f24e66dbb9 am 342a3800: am 70c6bb0d: Merge "Increase the row height of menus by 1dip." into froyo 
Merge commit '342a3800b9b31929b337d298a24184d820f27f26' into kraken

* commit '342a3800b9b31929b337d298a24184d820f27f26':
  Increase the row height of menus by 1dip.
 2010-05-04 12:45:53 -07:00
Dan Morrill
6a22fb9bef am f7ebcfec: am e17b4e71: Merge "Adding the backward-compatible filtering heuristics for the new device features definitions added in FroYo." into froyo 
Merge commit 'f7ebcfeccbd4433be5252857a854a6b565bf3fb9' into kraken

* commit 'f7ebcfeccbd4433be5252857a854a6b565bf3fb9':
  Adding the backward-compatible filtering heuristics for the new device
 2010-05-04 12:45:49 -07:00
Joe Onorato
07779ac16e am 77da7312: am f140be6c: Call into app widget hosts when the provider is updated. 
Merge commit '77da7312215c4a433e3f53c2fe306307fc3bad52' into kraken

* commit '77da7312215c4a433e3f53c2fe306307fc3bad52':
  Call into app widget hosts when the provider is updated.
 2010-05-04 12:45:44 -07:00
Daniel Sandler
342a3800b9 am 70c6bb0d: Merge "Increase the row height of menus by 1dip." into froyo 
Merge commit '70c6bb0d3e29368fd4598dd5e1b9b4176c3cd502' into froyo-plus-aosp

* commit '70c6bb0d3e29368fd4598dd5e1b9b4176c3cd502':
  Increase the row height of menus by 1dip.
 2010-05-04 12:42:48 -07:00
Daniel Sandler
70c6bb0d3e Merge "Increase the row height of menus by 1dip." into froyo 2010-05-04 12:40:54 -07:00
Dan Morrill
f7ebcfeccb am e17b4e71: Merge "Adding the backward-compatible filtering heuristics for the new device features definitions added in FroYo." into froyo 
Merge commit 'e17b4e711571198f79c0c2bad3656d58c63629e8' into froyo-plus-aosp

* commit 'e17b4e711571198f79c0c2bad3656d58c63629e8':
  Adding the backward-compatible filtering heuristics for the new device
 2010-05-04 12:38:03 -07:00
Joe Onorato
77da731221 am f140be6c: Call into app widget hosts when the provider is updated. 
Merge commit 'f140be6c3c21dd0f6d2214929e89d60de31d2c04' into froyo-plus-aosp

* commit 'f140be6c3c21dd0f6d2214929e89d60de31d2c04':
  Call into app widget hosts when the provider is updated.
 2010-05-04 12:37:59 -07:00
Dan Morrill
e17b4e7115 Merge "Adding the backward-compatible filtering heuristics for the new device features definitions added in FroYo." into froyo 2010-05-04 12:03:45 -07:00
Andreas Huber
eb5eef3819 Support for Ogg Vorbis decoding in stagefright. 
Set the magic property media.stagefright.enable-vorbis to true to use the new implementation instead of the standalon vorbis player for file-based playback. HTTP streaming of vorbis content will always go through stagefright.

Change-Id: Ie3843a99fadb22372f89540d0f8d65196e0c2af8
related-to-bug: 2654400
 2010-05-04 11:58:16 -07:00
Joe Onorato
f140be6c3c Call into app widget hosts when the provider is updated. 
Change-Id: If0a2459901e88cf04810b23178e4673d44fa69cc
 2010-05-04 11:49:12 -07:00
Daniel Sandler
5d0ef0d90a Increase the row height of menus by 1dip. 
This prevents CJK characters, which have extra-tall
ascenders, from being clipped by the drawable in
IconMenuItemView.

Bug: 2330380
Change-Id: I1256b85122e1634d5220c648111a5ffe43879f1f
 2010-05-04 14:33:28 -04:00
The Android Open Source Project
4929e5a58c am e4b9834f: am 6de3a6fd: merge from open-source master 2010-05-04 09:29:27 -07:00
The Android Open Source Project
e4b9834fea am 6de3a6fd: merge from open-source master 
Merge commit '6de3a6fdd303b15ad944570daf37faa798dc1989' into kraken

* commit '6de3a6fdd303b15ad944570daf37faa798dc1989':
  Fix typo of <p> end tag in appwidgets.xml
 2010-05-04 09:27:35 -07:00
The Android Open Source Project
6de3a6fdd3 merge from open-source master 
Change-Id: I5f552b45caae639170674213c23f154437b58afd
 2010-05-04 09:20:16 -07:00
Dan Morrill
89d97c1418 Adding the backward-compatible filtering heuristics for the new device 
features definitions added in FroYo.

Change-Id: I5024e45c62813fe2fd2ff4d222df816a86a94f86
 2010-05-04 08:39:03 -07:00
The Android Open Source Project
facad955a8 am dcb5f18f: am 007ad770: merge from open-source master 2010-05-03 16:26:53 -07:00
Romain Guy
5bc30057e0 Merge "Fix typo of <p> end tag in appwidgets.xml" 2010-05-03 16:25:34 -07:00
The Android Open Source Project
dcb5f18fd6 am 007ad770: merge from open-source master 
Merge commit '007ad7700a23ff7e618cfeee1eab97063c93b800' into kraken

* commit '007ad7700a23ff7e618cfeee1eab97063c93b800':
  Adapt to new location of libcore
  Parse custom text header and ignore it.
  Parse "multipart/vnd.wap.multipart.alternative" which is a part of multipart body (nested multipart).
  'uses-library' was not working for persistent applications.
  Fix an NPE in InputMethodService when mExtractAction is null.
 2010-05-03 16:25:15 -07:00
The Android Open Source Project
007ad7700a merge from open-source master 
Change-Id: If72ad6758c9e1bf77c38c4afec6b00ec9d5b89e4
 2010-05-03 16:19:31 -07:00
James Dong
abed93a51b Support AAC recording 
- Extend the audio recording to AAC format
- Add support for setting some recording parameters
- Add stss box to the meta data in the recorded file

Change-Id: I41167bfd9d70ef9cd33906f8437b39c232b6d3b7
 2010-05-03 15:47:41 -07:00
Jean-Baptiste Queru
0c388fd29c Adapt to new location of libcore 
Change-Id: Ie4fb163fb9f04a96f8412a996d43321accb28cc8
 2010-05-03 09:50:38 -07:00
Jean-Baptiste Queru
d84509d55c am 05bcf755: am 2529d4ea: Adapt to new location of libcore 2010-05-02 16:15:26 -07:00
Jean-Baptiste Queru
05bcf7553e am 2529d4ea: Adapt to new location of libcore 
Merge commit '2529d4eab80778aef9c7a9fe27712a41686d22c4' into kraken

* commit '2529d4eab80778aef9c7a9fe27712a41686d22c4':
  Adapt to new location of libcore
 2010-05-02 16:11:32 -07:00
Xia Wang
011056c2af am 7eb700e0: Merge "Fix test in PhoneNumberUtilsUnitTest.java, combine it with PhoneNumberUtilsTest.java Rename CallerInfoUnitTest.java to CallerInfoTest.java and move to the corresponding directory" into kraken 2010-04-30 15:50:25 -07:00
Xia Wang
7eb700e0df Merge "Fix test in PhoneNumberUtilsUnitTest.java, combine it with PhoneNumberUtilsTest.java Rename CallerInfoUnitTest.java to CallerInfoTest.java and move to the corresponding directory" into kraken 2010-04-30 15:49:23 -07:00
Jean-Baptiste Queru
2529d4eab8 Adapt to new location of libcore 
Change-Id: I495bf86a8195c85d16917c129dcbb0f4c5de68d2
 2010-04-30 13:23:32 -07:00
Jean-Baptiste Queru
69d5a7cec5 am 5b559e81: Adapt to new location of libcore 2010-04-30 13:20:48 -07:00
Jean-Baptiste Queru
5b559e8168 Adapt to new location of libcore 
Change-Id: Iecb39fdc6d9dc3ceb8a9bb4b3327e05caff0400e
 2010-04-30 13:11:05 -07:00