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

64373 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Reck
0a3fcc3eed Fix Apache stack 
Change-Id: Iec7d0d8bdaaa5594fa7412db79943ab0ccdf594c
 2012-01-11 13:35:29 -08:00
Glenn Kasten
80f3fc2cb6 libmedia new can't fail on Android 
Change-Id: Ie79dd5abb8078b35474bf0f1b3a6ff994a3a3360
 2012-01-11 12:27:41 -08:00
Glenn Kasten
a89226c786 Merge "Fix race in AudioSystem::getInputBufferSize" 2012-01-11 11:40:27 -08:00
Glenn Kasten
c57b063192 Merge "Fix bug in JetPlayer::loadFromFile" 2012-01-11 11:39:06 -08:00
Glenn Kasten
1eac460122 Merge "Simplify range check for audio_mode_t" 2012-01-11 11:38:21 -08:00
Glenn Kasten
d742fa3f60 Merge "Fix build warnings" 2012-01-11 11:37:53 -08:00
Eric Laurent
cc598b2b8b am 05985a2e: am c15cf3d2: Merge "stagefright: limit audio gap for looped playback" into ics-mr1 
* commit '05985a2e2ae5c21fbf69d2884c59ea475fce7f6d':
  stagefright: limit audio gap for looped playback
 2012-01-11 11:14:30 -08:00
Eric Laurent
05985a2e2a am c15cf3d2: Merge "stagefright: limit audio gap for looped playback" into ics-mr1 
* commit 'c15cf3d286f3d63d141b73f639a5a61ddb028029':
  stagefright: limit audio gap for looped playback
 2012-01-11 11:12:45 -08:00
Eric Laurent
c15cf3d286 Merge "stagefright: limit audio gap for looped playback" into ics-mr1 2012-01-11 11:10:38 -08:00
Teng-Hui Zhu
f8f4b69a28 Merge "Query the native side to decide to play when going into full screen mode" 2012-01-11 10:31:24 -08:00
Glenn Kasten
88ef0a73fc Merge "Use correct type for hardware call state" 2012-01-11 10:25:23 -08:00
Glenn Kasten
f733831fc7 Merge "Declare IAudioTrack methods in binder opcode order" 2012-01-11 10:23:34 -08:00
Glenn Kasten
ca61ea8499 Merge "Use consistent style of & reference for AutoMutex" 2012-01-11 10:23:04 -08:00
Glenn Kasten
1ea8a35197 Merge "Fix missing tag in mediaserver ServiceManager: log" 2012-01-11 10:22:45 -08:00
Glenn Kasten
482b9c2d34 Merge "AudioFlinger new can't fail" 2012-01-11 10:22:19 -08:00
Selim Gurun
972b1a505c Do Not Merge. Move ssl callbacks to webcore thread. 
Bug: 4586251

Cherry picking from master for ics-mr1.

Current ssl cert logic makes callbacks to webkit from the
UI thread. This is not right. Move the callbacks to proper thread.

Change-Id: I59affba47eca01b74e2bc33d88ef83a5850d6ce9
 2012-01-11 10:18:54 -08:00
Glenn Kasten
bb8d6fb4fc Merge "Fix build warning" 2012-01-11 10:01:34 -08:00
Glenn Kasten
ed70933d45 Fix build warnings 
Change-Id: Ic82cc86ac4b63b30ab66e1b8c7fd0e998fea590e
 2012-01-11 07:27:41 -08:00
Narayan Kamath
81754949e0 Merge "Write unit tests for android.speech.tts." 2012-01-11 03:39:57 -08:00
Steve Block
49a13f0052 Merge "Remove some stale TODOs from the Java Bridge tests" 2012-01-11 03:14:29 -08:00
Steve Block
c93643be42 Remove some stale TODOs from the Java Bridge tests 
These TODOs were related to testing behavior with JavaScript and Java arrays.
This is now tested thoroughly in JavaBridgeArrayTest.java and
JavaBridgeArrayCoercionTest.java.

No functional change.

Change-Id: I5972b929c3e2743c06aff626c983b4b749ea452f
 2012-01-11 11:04:12 +00:00
satok
0b3caa49cf Merge "Enable subtypes when the implicitly enabled subtype is not ascii capable keyboard Bug: 5806103" 2012-01-11 01:52:50 -08:00
Roman Nurik
95c22e6e75 am 4ada9c6f: am c894fb7e: Prevent Android Design sidenav links from opening a new window 
* commit '4ada9c6f3e8911d837820c483b588b430b06e6d3':
  Prevent Android Design sidenav links from opening a new window
 2012-01-11 00:24:36 -08:00
Roman Nurik
4ada9c6f3e am c894fb7e: Prevent Android Design sidenav links from opening a new window 
* commit 'c894fb7e15f46381fc783da1236b8bbb4a0e33d6':
  Prevent Android Design sidenav links from opening a new window
 2012-01-11 00:21:41 -08:00
satok
c36905673a Enable subtypes when the implicitly enabled subtype is not ascii capable keyboard 
Bug: 5806103

Change-Id: I1a83b227498073c47567f73566043c273809adc9
 2012-01-11 17:03:03 +09:00
Roman Nurik
c894fb7e15 Prevent Android Design sidenav links from opening a new window 
Change-Id: I0ec74fb7ae9e348717d0d96603cd03c58c03459d
 2012-01-10 23:59:20 -08:00
Scott Main
837bc7f936 am 25b772f3: am acd152f0: docs: editorial fix to homepage 
* commit '25b772f357d79ddf39c69541839465a9fd2cbf39':
  docs: editorial fix to homepage
 2012-01-10 21:16:08 -08:00
Scott Main
25b772f357 am acd152f0: docs: editorial fix to homepage 
* commit 'acd152f0b7f53c7f09986205b60feb3b6597f700':
  docs: editorial fix to homepage
 2012-01-10 21:13:38 -08:00
Scott Main
acd152f0b7 docs: editorial fix to homepage 
Change-Id: Iaebcacb6be770435091de181e8ee3f9c81d58139
 2012-01-10 21:10:08 -08:00
Jim Miller
28a0767751 Fix 5620754: don't show pattern screen after SIM PUK unlock 
This fixes a bug introduced in testing 34a62348. The code now
properly invokes the callbacks before returning.

Change-Id: I637a8a792838379f0c8b42ef634da82787fcd961
 2012-01-10 18:35:21 -08:00
Sungsoo Lim
6c4c155696 MediaScanner: Disable bulk insert for settings 
Since the settings (notifications, ringtones, and alarms) request
rowId after inserting into DB, do not use bulk insert for them.
(Bulk insert does not return the rowId)

Change-Id: I8faf993f8ac2da96672594a1c92ddc917f964d6f
 2012-01-11 11:34:20 +09:00
Jeff Sharkey
2cc28deb9e Merge "Move non-monotonic reporting to interface." 2012-01-10 17:41:01 -08:00
Jeff Sharkey
5a7bcf31a4 Move non-monotonic reporting to interface. 
Report non-monotonic NetworkStats through an observer interface
instead of throwing, since those events are still recoverable.

Change-Id: Ic0749f4634b0ac05dbe90e95ca490957ec8b2f23
 2012-01-10 17:24:44 -08:00
Teng-Hui Zhu
e4c89e321c Query the native side to decide to play when going into full screen mode 
Previously we save the state in Java side, but it is better to check with
native side since the exact state is already there.
This will help to get the updated state from javascript too.

bug:5765848

Webkit side change:
https://android-git.corp.google.com/g/#/c/157866/

Change-Id: Id0316b694c1597b50a1c3b123b31efc6b0fac706
 2012-01-10 17:17:02 -08:00
Scott Main
c347a9a61e am 7cffe2c6: am 05fc9f65: Merge "docs: add links to Android Design from dev docs" into ics-mr1 
* commit '7cffe2c66815fcd2c5dc4579ed964901bc17b431':
  docs: add links to Android Design from dev docs
 2012-01-10 17:12:25 -08:00
Scott Main
7cffe2c668 am 05fc9f65: Merge "docs: add links to Android Design from dev docs" into ics-mr1 
* commit '05fc9f655aaa01cdb38229d1dc6155a341fa316b':
  docs: add links to Android Design from dev docs
 2012-01-10 17:10:28 -08:00
Scott Main
05fc9f655a Merge "docs: add links to Android Design from dev docs" into ics-mr1 2012-01-10 17:08:19 -08:00
Roman Nurik
1fd8f382f5 am 3d0891d1: am 548972d7: Merge "Android Design" into ics-mr1 
* commit '3d0891d18782451e2b1461b0bd13ff6f28736d69':
  Android Design
 2012-01-10 17:06:59 -08:00
Roman Nurik
3d0891d187 am 548972d7: Merge "Android Design" into ics-mr1 
* commit '548972d798f06c91cb8cba6716952322da97ac21':
  Android Design
 2012-01-10 17:04:05 -08:00
Roman Nurik
548972d798 Merge "Android Design" into ics-mr1 2012-01-10 17:01:45 -08:00
Roman Nurik
7379046690 Android Design 
Change-Id: I2692ca03fc4c0d088aec0588a36739203f4cf2d2
 2012-01-10 16:42:13 -08:00
Ying Wang
044a0b8ae5 Merge "Build all test apks as raw resource in FrameworksCoreTests." 2012-01-10 16:37:43 -08:00
Glenn Kasten
81801adc14 Fix race in AudioSystem::getInputBufferSize 
It was caching the recording parameters without a mutex.

Change-Id: Ic4b9f621cbc080d224c2233cf3ca3454fc0f19bd
 2012-01-10 15:43:48 -08:00
Glenn Kasten
77b6aaf62d Fix bug in JetPlayer::loadFromFile 
A long pathname would corrupt the heap due to incorrect use of strncpy.

Also was using hard-coded constant 256 instead of PATH_MAX.

Change-Id: Iba382bbb38624fbc41fec91449f9814f77d4ac0d
 2012-01-10 15:43:24 -08:00
Glenn Kasten
01aaf2c401 Simplify range check for audio_mode_t 
AudioSystem::setMode previously allowed negative modes, but these were
then rejected by AudioFlinger.

Now negative modes (including AUDIO_MODE_INVALID and AUDIO_MODE_CURRENT)
are explicitly disallowed.

Change-Id: I0bac8fea737c8eb1f5b6afbb893e48739f88d745
 2012-01-10 15:42:32 -08:00
Ying Wang
24162fc52c Build all test apks as raw resource in FrameworksCoreTests. 
Bug: 5848975
Change-Id: I395013ded1c29e0914f72e03d0abd60bb4a7973a
 2012-01-10 15:12:10 -08:00
Scott Main
eb5dacddc4 docs: add links to Android Design from dev docs 
Change-Id: Ib2334be0a05d33008d2e4850547ff1c3b7b16764
 2012-01-10 14:19:19 -08:00
Steve Block
38e90751a2 Merge "Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGE" 2012-01-10 14:08:32 -08:00
Scott Main
f6f793c4ac am 5a3e67c7: am d1186cd5: Merge "docs: fix broken links in .jd docs" into ics-mr1 
* commit '5a3e67c7811d4a7906548e113561cd1e901de9e2':
  docs: fix broken links in .jd docs
 2012-01-10 12:58:03 -08:00
Scott Main
5a3e67c781 am d1186cd5: Merge "docs: fix broken links in .jd docs" into ics-mr1 
* commit 'd1186cd5bb445e9b0768edf6cb87022865cada55':
  docs: fix broken links in .jd docs
 2012-01-10 12:55:36 -08:00