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

8653 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android (Google) Code Review
546f3cd579 Merge change 24448 into eclair 
* changes:
  Support for amr-wb tracks in MPEG4Extractor.
 2009-09-10 12:39:16 -04:00
Android (Google) Code Review
18ed7601d2 Merge change 24447 into eclair 
* changes:
  Added some more verbose output for AMR formats. Properly fill out the output format.
 2009-09-10 12:39:08 -04:00
Mike Lockwood
44dbf0294d am a62c071f: am 68f6f01c: Merge change 24527 into eclair 
Merge commit 'a62c071f610d1b0043cb8651a7c7a0d70ee7e463'

* commit 'a62c071f610d1b0043cb8651a7c7a0d70ee7e463':
  MountService: Use correct icon for SD card notifications.
 2009-09-10 09:31:01 -07:00
Mike Lockwood
a62c071f61 am 68f6f01c: Merge change 24527 into eclair 
Merge commit '68f6f01cf62e0c282b570adf492352a5d4418584' into eclair-plus-aosp

* commit '68f6f01cf62e0c282b570adf492352a5d4418584':
  MountService: Use correct icon for SD card notifications.
 2009-09-10 09:25:35 -07:00
Snigdha Sinha
ac024cc4dc am b870e14a: am 65736718: Merge change 24283 into eclair 
Merge commit 'b870e14ad6e584b7d605fcf1f55773ce92b3b646'

* commit 'b870e14ad6e584b7d605fcf1f55773ce92b3b646':
  CameraService change for OVERLAY_FORMAT_DEFAULT
 2009-09-10 09:24:26 -07:00
Eric Laurent
9657a06b93 am c6f6253a: am f63e3f3c: Merge change 24512 into eclair 
Merge commit 'c6f6253ad2095b7d23735ed484706630a080ea8f'

* commit 'c6f6253ad2095b7d23735ed484706630a080ea8f':
  Fix issue android.permission.cts.NoAudioPermissionTest:testRouting is failing.
 2009-09-10 09:24:05 -07:00
Daisuke Miyakawa
0dc868e07a am d43252a7: am df4edc80: Merge change 24499 into eclair 
Merge commit 'd43252a7b27a5a6966a51e8b35f5003f92c207fa'

* commit 'd43252a7b27a5a6966a51e8b35f5003f92c207fa':
  Modify android.syncml.pim so that no one is going to use.
 2009-09-10 09:24:00 -07:00
Hung-ying Tyan
64a3302bd6 am e39725c9: am 57fc4114: Merge change 24132 into eclair 
Merge commit 'e39725c9c07bd7cfa0302da1843a2d92ec124e26'

* commit 'e39725c9c07bd7cfa0302da1843a2d92ec124e26':
  Add two CertTool helper classes.
 2009-09-10 09:23:13 -07:00
Tammo Spalink
7fce418709 am 9183d361: am a8cdbc85: Merge change 24501 into eclair 
Merge commit '9183d361e0571b10e5ebbfac06eee5171f701da4'

* commit '9183d361e0571b10e5ebbfac06eee5171f701da4':
  Make Phone.updateServiceLocation acquire a one-shot wake lock.
 2009-09-10 09:22:54 -07:00
Jeff Sharkey
d475d6e011 am 2a6bd015: am 6ba23c59: Handle cases where TYPE can be undefined, such as EAS. 
Merge commit '2a6bd01548cb24f1d173d8b22efbafe8b097ecda'

* commit '2a6bd01548cb24f1d173d8b22efbafe8b097ecda':
  Handle cases where TYPE can be undefined, such as EAS.
 2009-09-10 09:22:45 -07:00
Android (Google) Code Review
68f6f01cf6 Merge change 24527 into eclair 
* changes:
  MountService: Use correct icon for SD card notifications.
 2009-09-10 12:20:49 -04:00
Snigdha Sinha
b870e14ad6 am 65736718: Merge change 24283 into eclair 
Merge commit '657367185652f9877eb232b84e16fbed0d759f87' into eclair-plus-aosp

* commit '657367185652f9877eb232b84e16fbed0d759f87':
  CameraService change for OVERLAY_FORMAT_DEFAULT
 2009-09-10 08:35:00 -07:00
Android (Google) Code Review
6573671856 Merge change 24283 into eclair 
* changes:
  CameraService change for OVERLAY_FORMAT_DEFAULT
 2009-09-10 11:28:20 -04:00
Mike Lockwood
a7ef2698a6 MountService: Use correct icon for SD card notifications. 
Change-Id: Ia15847c48fce7957f1a376e173d39137b661d51c
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2009-09-10 11:19:57 -04:00
Eric Laurent
c6f6253ad2 am f63e3f3c: Merge change 24512 into eclair 
Merge commit 'f63e3f3cc8c61bc9eeda980f314795412eb03b79' into eclair-plus-aosp

* commit 'f63e3f3cc8c61bc9eeda980f314795412eb03b79':
  Fix issue android.permission.cts.NoAudioPermissionTest:testRouting is failing.
 2009-09-10 08:17:19 -07:00
Daisuke Miyakawa
d43252a7b2 am df4edc80: Merge change 24499 into eclair 
Merge commit 'df4edc807ca32419118a9b86a3d68b0fac02f5fa' into eclair-plus-aosp

* commit 'df4edc807ca32419118a9b86a3d68b0fac02f5fa':
  Modify android.syncml.pim so that no one is going to use.
 2009-09-10 08:17:15 -07:00
Android (Google) Code Review
f63e3f3cc8 Merge change 24512 into eclair 
* changes:
  Fix issue android.permission.cts.NoAudioPermissionTest:testRouting is failing.
 2009-09-10 11:12:03 -04:00
Bob Lee
eec2f41d60 Addressed reviewer comments. 2009-09-10 11:01:24 +02:00
Android (Google) Code Review
df4edc807c Merge change 24499 into eclair 
* changes:
  Modify android.syncml.pim so that no one is going to use.
 2009-09-10 04:22:09 -04:00
Hung-ying Tyan
e39725c9c0 am 57fc4114: Merge change 24132 into eclair 
Merge commit '57fc41143d9c855b9a04f4d5f0a21bb99298d67d' into eclair-plus-aosp

* commit '57fc41143d9c855b9a04f4d5f0a21bb99298d67d':
  Add two CertTool helper classes.
 2009-09-10 01:21:34 -07:00
Android (Google) Code Review
57fc41143d Merge change 24132 into eclair 
* changes:
  Add two CertTool helper classes.
 2009-09-10 04:16:56 -04:00
Eric Laurent
dc1d17a1db Fix issue android.permission.cts.NoAudioPermissionTest:testRouting is failing. 
Add audio permission checks in setSpeakerphoneOn() and setBluetoothScoOn() methods.
 2009-09-10 00:48:21 -07:00
Tammo Spalink
9183d361e0 am a8cdbc85: Merge change 24501 into eclair 
Merge commit 'a8cdbc85c003eae8c1b7178fcd70f8bc711aed96' into eclair-plus-aosp

* commit 'a8cdbc85c003eae8c1b7178fcd70f8bc711aed96':
  Make Phone.updateServiceLocation acquire a one-shot wake lock.
 2009-09-10 00:45:07 -07:00
Android (Google) Code Review
a8cdbc85c0 Merge change 24501 into eclair 
* changes:
  Make Phone.updateServiceLocation acquire a one-shot wake lock.
 2009-09-10 03:40:54 -04:00
Tammo Spalink
7a043b351b Make Phone.updateServiceLocation acquire a one-shot wake lock. 
Phone.updateServiceLocation() is the internal routine triggered by
external calls to CellLocation.requestLocationUpdate().

addresses bug http://b/issue?id=1724246

Change-Id: Id3d5cab1a77df12d3e94373a58ae94688a8630c6
 2009-09-10 15:38:01 +08:00
Daisuke Miyakawa
f5269c14f9 Modify android.syncml.pim so that no one is going to use. 
- Remove android.syncml.pim.vcalendar since no one is using it.
-- We have android.pim.ICalendar.java, so handling vCalendar (== ICalendar) is possble without android.syncml.pim
- Mark android.syncml.pim.vcard and related code as obsolete.
-- Refactored version is in android.pim.vcard, which supports new Contacts database schema.

Related issue: 2110530
 2009-09-10 15:17:24 +09:00
Jeff Sharkey
2a6bd01548 am 6ba23c59: Handle cases where TYPE can be undefined, such as EAS. 
Merge commit '6ba23c59f24b443cd21c6289fa0aac3df8f17017' into eclair-plus-aosp

* commit '6ba23c59f24b443cd21c6289fa0aac3df8f17017':
  Handle cases where TYPE can be undefined, such as EAS.
 2009-09-09 23:14:39 -07:00
Jeff Sharkey
6ba23c59f2 Handle cases where TYPE can be undefined, such as EAS. 
When TYPE not provided, assume a default value and check
that label isn't empty when CUSTOM is used.
 2009-09-09 23:05:34 -07:00
Hung-ying Tyan
9249cc69b8 Add two CertTool helper classes. 
Also add the unlock action string to Keystore.
 2009-09-10 12:51:07 +08:00
Mathias Agopian
1b03cb204e am 7ca8cacd: am 24d237db: add a debug property to disable h/w composition. debug.sf.hw, when set to 0 will disable h/w composition 
Merge commit '7ca8cacd8035989c4b0a71787f76ffac9dd9e9f1'

* commit '7ca8cacd8035989c4b0a71787f76ffac9dd9e9f1':
  add a debug property to disable h/w composition. debug.sf.hw, when set to 0 will disable h/w composition
 2009-09-09 19:34:18 -07:00
Mathias Agopian
92d8b80800 am a76a792f: am bbe14a17: Merge change 24473 into eclair 
Merge commit 'a76a792f52b8dd7f955bcf781a58c540a57de5d4'

* commit 'a76a792f52b8dd7f955bcf781a58c540a57de5d4':
  fix [2074427] SurfaceView doesn't disappear on GONE
 2009-09-09 19:34:13 -07:00
Mathias Agopian
7ca8cacd80 am 24d237db: add a debug property to disable h/w composition. debug.sf.hw, when set to 0 will disable h/w composition 
Merge commit '24d237db943051942b5966f5e788d67050ec0ba5' into eclair-plus-aosp

* commit '24d237db943051942b5966f5e788d67050ec0ba5':
  add a debug property to disable h/w composition. debug.sf.hw, when set to 0 will disable h/w composition
 2009-09-09 19:25:53 -07:00
Mathias Agopian
a76a792f52 am bbe14a17: Merge change 24473 into eclair 
Merge commit 'bbe14a1758a5b99689b7aa13a6d4f58e61705ebf' into eclair-plus-aosp

* commit 'bbe14a1758a5b99689b7aa13a6d4f58e61705ebf':
  fix [2074427] SurfaceView doesn't disappear on GONE
 2009-09-09 19:25:49 -07:00
Mathias Agopian
24d237db94 add a debug property to disable h/w composition. debug.sf.hw, when set to 0 will disable h/w composition 2009-09-09 19:20:10 -07:00
Android (Google) Code Review
bbe14a1758 Merge change 24473 into eclair 
* changes:
  fix [2074427] SurfaceView doesn't disappear on GONE
 2009-09-09 22:17:45 -04:00
Dmitri Plotnikov
ea7a1ad6ce am 081dc178: am 0d134509: Merge change 24468 into eclair 
Merge commit '081dc1785f19a66e18d2840130125182f2f93fb6'

* commit '081dc1785f19a66e18d2840130125182f2f93fb6':
  Increasing uninterrupted sleep quantum in SQLiteDatabase to increase transaction size.
 2009-09-09 19:16:45 -07:00
Tammo Spalink
458c053bf8 am 67b1ee25: am d0f02a4d: Merge change 24138 into eclair 
Merge commit '67b1ee2525c73efc27bab5a7bb419e875db1ca71'

* commit '67b1ee2525c73efc27bab5a7bb419e875db1ca71':
  Do not die when printing empty prefs.
 2009-09-09 19:16:40 -07:00
Amith Yamasani
529bda79cc am b02c4c41: am 67af9f5b: Merge change 24471 into eclair 
Merge commit 'b02c4c41f575c23ee5158931de8278fc1f0e0c75'

* commit 'b02c4c41f575c23ee5158931de8278fc1f0e0c75':
  Fixed the fastscroll thumb asset in hdpi.
 2009-09-09 19:16:35 -07:00
Dmitri Plotnikov
081dc1785f am 0d134509: Merge change 24468 into eclair 
Merge commit '0d134509f4f7b05776542996f54c4d306e66dbec' into eclair-plus-aosp

* commit '0d134509f4f7b05776542996f54c4d306e66dbec':
  Increasing uninterrupted sleep quantum in SQLiteDatabase to increase transaction size.
 2009-09-09 19:11:50 -07:00
Tammo Spalink
67b1ee2525 am d0f02a4d: Merge change 24138 into eclair 
Merge commit 'd0f02a4da1413743c90a51426bc3221bfa6ff342' into eclair-plus-aosp

* commit 'd0f02a4da1413743c90a51426bc3221bfa6ff342':
  Do not die when printing empty prefs.
 2009-09-09 19:11:45 -07:00
Amith Yamasani
b02c4c41f5 am 67af9f5b: Merge change 24471 into eclair 
Merge commit '67af9f5bf1abdaeedbdf21c1de9502d33de8f16f' into eclair-plus-aosp

* commit '67af9f5bf1abdaeedbdf21c1de9502d33de8f16f':
  Fixed the fastscroll thumb asset in hdpi.
 2009-09-09 19:11:40 -07:00
Jim Miller
f186055a53 Fix for bug # 2023074: settings db updater broken at version 34. 2009-09-09 19:10:57 -07:00
Android (Google) Code Review
0d134509f4 Merge change 24468 into eclair 
* changes:
  Increasing uninterrupted sleep quantum in SQLiteDatabase to increase transaction size.
 2009-09-09 22:06:48 -04:00
Android (Google) Code Review
d0f02a4da1 Merge change 24138 into eclair 
* changes:
  Do not die when printing empty prefs.
 2009-09-09 21:36:48 -04:00
Grace Kloba
6e08757d65 am 416bfd60: am 9ca7d0c2: Merge change 24460 into eclair 
Merge commit '416bfd60ee45716eda1e24b0c95fe7b162accb2e'

* commit '416bfd60ee45716eda1e24b0c95fe7b162accb2e':
  The empty path and no path mean default path. So "a=d" should replace "a=c".
 2009-09-09 18:35:09 -07:00
Mathias Agopian
6b7f1a62b5 fix [2074427] SurfaceView doesn't disappear on GONE 2009-09-09 18:32:34 -07:00
Android (Google) Code Review
67af9f5bf1 Merge change 24471 into eclair 
* changes:
  Fixed the fastscroll thumb asset in hdpi.
 2009-09-09 21:31:07 -04:00
Grace Kloba
416bfd60ee am 9ca7d0c2: Merge change 24460 into eclair 
Merge commit '9ca7d0c2efe76798e0963fd0b27a7224e9819171' into eclair-plus-aosp

* commit '9ca7d0c2efe76798e0963fd0b27a7224e9819171':
  The empty path and no path mean default path. So "a=d" should replace "a=c".
 2009-09-09 18:30:15 -07:00
Amith Yamasani
da256fabed Fixed the fastscroll thumb asset in hdpi. 
Asset was 1 pixel taller than necessary and was causing scaling artifacts.
 2009-09-09 18:28:44 -07:00
Android (Google) Code Review
9ca7d0c2ef Merge change 24460 into eclair 
* changes:
  The empty path and no path mean default path. So "a=d" should replace "a=c".
 2009-09-09 21:23:46 -04:00