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

64284 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xia Wang
4acb784630 am 87badc20: am 4ac4ab4e: Merge "Remove sleep from test acitivity to avoid ANR when key event is injected bug#: 5737922" into ics-mr1 
* commit '87badc20c7d5462ee27f13adf50acaf6a3232884':
  Remove sleep from test acitivity to avoid ANR when key event is injected bug#: 5737922
 2012-01-11 17:57:16 -08:00
Xia Wang
e328d6b0a6 am b18a7c3e: am 1446c7b2: Merge "Get average value for image processing test bug#: 5566079" into ics-mr1 
* commit 'b18a7c3ef1ff92ee2b8407743ffc4d7fd8b8ba70':
  Get average value for image processing test bug#: 5566079
 2012-01-11 17:57:14 -08:00
Xia Wang
87badc20c7 am 4ac4ab4e: Merge "Remove sleep from test acitivity to avoid ANR when key event is injected bug#: 5737922" into ics-mr1 
* commit '4ac4ab4ef046eed4d1ada7bbb1d54ee0a244d454':
  Remove sleep from test acitivity to avoid ANR when key event is injected bug#: 5737922
 2012-01-11 17:53:38 -08:00
Xia Wang
b18a7c3ef1 am 1446c7b2: Merge "Get average value for image processing test bug#: 5566079" into ics-mr1 
* commit '1446c7b2ed41f718afef86787b3ffd3f7b4ee9d7':
  Get average value for image processing test bug#: 5566079
 2012-01-11 17:53:36 -08:00
Xia Wang
4ac4ab4ef0 Merge "Remove sleep from test acitivity to avoid ANR when key event is injected bug#: 5737922" into ics-mr1 2012-01-11 17:52:06 -08:00
Xia Wang
1446c7b2ed Merge "Get average value for image processing test bug#: 5566079" into ics-mr1 2012-01-11 17:51:48 -08:00
Katie McCormick
6efe5b5615 am 3808f8cc: am 6a52c632: Merge "Doc change: Adding Bluetooth HDP info." into ics-mr1 
* commit '3808f8ccec18f7b04ef983d553fb10f3e2983216':
  Doc change: Adding Bluetooth HDP info.
 2012-01-11 16:45:00 -08:00
Katie McCormick
3808f8ccec am 6a52c632: Merge "Doc change: Adding Bluetooth HDP info." into ics-mr1 
* commit '6a52c632530fa39de570c9a6630264178c20e58e':
  Doc change: Adding Bluetooth HDP info.
 2012-01-11 16:42:29 -08:00
Katie McCormick
6a52c63253 Merge "Doc change: Adding Bluetooth HDP info." into ics-mr1 2012-01-11 16:40:37 -08:00
John Reck
b123e96059 Merge "Initial NavCache removal support" 2012-01-11 16:34:26 -08:00
Katie McCormick
2e32a78ead Doc change: Adding Bluetooth HDP info. 
Change-Id: Icdc19ed9ea09422ac2ea01c03b4a569d8ae94121
 2012-01-11 16:18:50 -08:00
John Wang
1f7b23dda2 am 70205788: am 6ad68ba9: Adjust the mapping of LTE signal bars. 
* commit '70205788fa39968b8331085597e3d3b61e271fbe':
  Adjust the mapping of LTE signal bars.
 2012-01-11 16:05:14 -08:00
Selim Gurun
dbc361df8b am 0265a4a0: (-s ours) am 51938e26: Merge "Do Not Merge. Move ssl callbacks to webcore thread." into ics-mr1 
* commit '0265a4a0e02db98b85bd7f9be8b866d3fb9889d2':
  Do Not Merge. Move ssl callbacks to webcore thread.
 2012-01-11 16:04:55 -08:00
John Wang
70205788fa am 6ad68ba9: Adjust the mapping of LTE signal bars. 
* commit '6ad68ba9d99d48cc5c189dc7e32e577f56ce51fd':
  Adjust the mapping of LTE signal bars.
 2012-01-11 15:36:00 -08:00
John Wang
6ad68ba9d9 Adjust the mapping of LTE signal bars. 
bug:5640958
Change-Id: I91efc5a81b505aae59dac9b1d69314efaffda6b6
 2012-01-11 14:47:19 -08:00
Selim Gurun
0265a4a0e0 am 51938e26: Merge "Do Not Merge. Move ssl callbacks to webcore thread." into ics-mr1 
* commit '51938e26913a98aa8de0292e9be8ea9d9ebc67c3':
  Do Not Merge. Move ssl callbacks to webcore thread.
 2012-01-11 14:20:32 -08:00
Selim Gurun
51938e2691 Merge "Do Not Merge. Move ssl callbacks to webcore thread." into ics-mr1 2012-01-11 14:18:14 -08:00
John Reck
4eda105cdb Initial NavCache removal support 
Change-Id: I927005093b620a1b1b60703bc8a58de539bdf3c8
 2012-01-11 13:59:41 -08:00
Glenn Kasten
a9830d430a Merge "Fix build warnings" 2012-01-11 13:42:47 -08:00
Glenn Kasten
129e19cb37 Fix build warnings 
Change-Id: I334e0a6e018bb1067c90e050cf3583c1057aacd9
 2012-01-11 13:40:05 -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
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