Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,892 Commits 3 Branches 0 Tags
6becff379d28ca0a03f4472e86c940af8f11383d
Commit Graph

8228 Commits

Author SHA1 Message Date
Amith Yamasani
c778f71d5c am 733a2f65: am 1b4c0d70: Merge "Fix a crash in BatteryStatsImpl, due to a previous fix." into froyo 
Merge commit '733a2f654934d452b2febf6f80cd1136830758d5' into kraken

* commit '733a2f654934d452b2febf6f80cd1136830758d5':
  Fix a crash in BatteryStatsImpl, due to a previous fix.
 2010-04-05 14:25:31 -07:00
Amith Yamasani
733a2f6549 am 1b4c0d70: Merge "Fix a crash in BatteryStatsImpl, due to a previous fix." into froyo 
Merge commit '1b4c0d702066794b9ce97b02721aa9e552997381' into froyo-plus-aosp

* commit '1b4c0d702066794b9ce97b02721aa9e552997381':
  Fix a crash in BatteryStatsImpl, due to a previous fix.
 2010-04-05 14:20:57 -07:00
Amith Yamasani
1b4c0d7020 Merge "Fix a crash in BatteryStatsImpl, due to a previous fix." into froyo 2010-04-05 14:17:55 -07:00
Ray Chen
507748e972 am 6c935602: am 44dcf658: Make createVideoThumbnail and createImageThumbnail look consistent. 
Merge commit '6c9356028cc94259c9d1f5f937d9cca1f45914d3' into kraken

* commit '6c9356028cc94259c9d1f5f937d9cca1f45914d3':
  Make createVideoThumbnail and createImageThumbnail look consistent.
 2010-04-05 13:19:39 -07:00
Ray Chen
6c9356028c am 44dcf658: Make createVideoThumbnail and createImageThumbnail look consistent. 
Merge commit '44dcf658718fcc0b563dcad50fb59e8fe507cd0a' into froyo-plus-aosp

* commit '44dcf658718fcc0b563dcad50fb59e8fe507cd0a':
  Make createVideoThumbnail and createImageThumbnail look consistent.
 2010-04-05 13:16:19 -07:00
Ray Chen
44dcf65871 Make createVideoThumbnail and createImageThumbnail look consistent. 
Change-Id: I9a4798fefe3968ac847d46100036a6dde39791c9
 2010-04-05 13:06:39 -07:00
Amith Yamasani
e5795610bd Fix a crash in BatteryStatsImpl, due to a previous fix. 
This is probably the real fix for the original bug. The last line was probably not
well formed and resulted in an overrun in the native code.

Bug: 2564824
Change-Id: I8a9cc267f8045a61eff4b5d532258afa32a8b837
 2010-04-05 12:43:44 -07:00
Cary Clark
1cab19369d am 6cf2c14f: am 3eefc126: check for webviewcore before reading settings 
Merge commit '6cf2c14f65336cf32dba5faa812cc2eca8c31a6a' into kraken

* commit '6cf2c14f65336cf32dba5faa812cc2eca8c31a6a':
  check for webviewcore before reading settings
 2010-04-05 12:33:03 -07:00
Cary Clark
6cf2c14f65 am 3eefc126: check for webviewcore before reading settings 
Merge commit '3eefc126e5a0b4af4738332e8d43fe2e2d00424c' into froyo-plus-aosp

* commit '3eefc126e5a0b4af4738332e8d43fe2e2d00424c':
  check for webviewcore before reading settings
 2010-04-05 12:30:12 -07:00
Cary Clark
3eefc126e5 check for webviewcore before reading settings 
In setActive(), the WebViewCore instance may
have already been destroyed before the settings
object can be read.

Change-Id: I46b2a57b2d92fc7216b1c984f7044fea1fc2409e
http://b/2570700
 2010-04-05 15:25:26 -04:00
Leon Scroggins
86d663faa0 am e64e090e: am f9b1a092: Only include WEB_EDIT if there are more textfields. 
Merge commit 'e64e090e0d4f70233fac901ac1b977123f6f0452' into kraken

* commit 'e64e090e0d4f70233fac901ac1b977123f6f0452':
  Only include WEB_EDIT if there are more textfields.
 2010-04-05 11:40:44 -07:00
Leon Scroggins
e64e090e0d am f9b1a092: Only include WEB_EDIT if there are more textfields. 
Merge commit 'f9b1a092b6c86549a8257015a03ea59ebcd9a85e' into froyo-plus-aosp

* commit 'f9b1a092b6c86549a8257015a03ea59ebcd9a85e':
  Only include WEB_EDIT if there are more textfields.
 2010-04-05 11:38:05 -07:00
Leon Scroggins
f9b1a092b6 Only include WEB_EDIT if there are more textfields. 
Fixes http://b/issue?id=2559070

Requires a change to external/webkit.

Change-Id: I411a04d260c781a91d16832704bb5c34e9751bc1
 2010-04-05 14:31:37 -04:00
San Mehat
d32de7f38f am 9d782f62: am 73a8f26a: Merge "NetworkManagementService: Combine setInterfaceRx/Tx throttle and add max speed" into froyo 
Merge commit '9d782f62defba898c3ebaa498ea1be9e5cb26ac7' into kraken

* commit '9d782f62defba898c3ebaa498ea1be9e5cb26ac7':
  NetworkManagementService: Combine setInterfaceRx/Tx throttle and add max speed
 2010-04-05 10:44:45 -07:00
San Mehat
9d782f62de am 73a8f26a: Merge "NetworkManagementService: Combine setInterfaceRx/Tx throttle and add max speed" into froyo 
Merge commit '73a8f26aef40184d9d5dfe9dabcfbd345deb6386' into froyo-plus-aosp

* commit '73a8f26aef40184d9d5dfe9dabcfbd345deb6386':
  NetworkManagementService: Combine setInterfaceRx/Tx throttle and add max speed
 2010-04-05 10:41:19 -07:00
San Mehat
73a8f26aef Merge "NetworkManagementService: Combine setInterfaceRx/Tx throttle and add max speed" into froyo 2010-04-05 10:35:56 -07:00
Mike Lockwood
79e642e8ed Call LocationManager.sendNiResponse() instead of calling directly to GpsLocationProvider 
Change-Id: I6a5b47abb0519f5228d29bc3340bb2490564803e
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-04-04 18:44:05 -04:00
Amith Yamasani
e27c176e6c am c2e060cb: am 0913ce95: Merge "Potential fix for bug: 2564824 : Device runtime restart in BatteryService" into froyo 
Merge commit 'c2e060cbedaa2371fcc5c909c216c8ceafa4f649' into kraken

* commit 'c2e060cbedaa2371fcc5c909c216c8ceafa4f649':
  Potential fix for bug: 2564824 : Device runtime restart in BatteryService
 2010-04-02 17:27:31 -07:00
Amith Yamasani
c2e060cbed am 0913ce95: Merge "Potential fix for bug: 2564824 : Device runtime restart in BatteryService" into froyo 
Merge commit '0913ce95c29371cb7b58e294a8d60262bc7f4329' into froyo-plus-aosp

* commit '0913ce95c29371cb7b58e294a8d60262bc7f4329':
  Potential fix for bug: 2564824 : Device runtime restart in BatteryService
 2010-04-02 17:24:49 -07:00
Amith Yamasani
0913ce95c2 Merge "Potential fix for bug: 2564824 : Device runtime restart in BatteryService" into froyo 2010-04-02 17:20:53 -07:00
Grace Kloba
1ea99657e7 am 6f8b89bb: am b2ade4a7: Merge "Make sure when WebView modified mScrollX/Y directly, onScrollChanged() is called so that the View system can do what it needs to adjust." into froyo 
Merge commit '6f8b89bb6641dfc34fa36dec52d25115b35b37ec' into kraken

* commit '6f8b89bb6641dfc34fa36dec52d25115b35b37ec':
  Make sure when WebView modified mScrollX/Y directly,
 2010-04-02 16:52:23 -07:00
Grace Kloba
6f8b89bb66 am b2ade4a7: Merge "Make sure when WebView modified mScrollX/Y directly, onScrollChanged() is called so that the View system can do what it needs to adjust." into froyo 
Merge commit 'b2ade4a7e60bed95a25714fbfaeb1a8d8f734dc0' into froyo-plus-aosp

* commit 'b2ade4a7e60bed95a25714fbfaeb1a8d8f734dc0':
  Make sure when WebView modified mScrollX/Y directly,
 2010-04-02 16:46:39 -07:00
Grace Kloba
b2ade4a7e6 Merge "Make sure when WebView modified mScrollX/Y directly, onScrollChanged() is called so that the View system can do what it needs to adjust." into froyo 2010-04-02 16:41:13 -07:00
Adam Powell
ffc67455f8 am 128f1a87: am 6024ca5c: Fix bug 2185026 - back button in context menu now calls onContextMenuClosed() 
Merge commit '128f1a87c55a291109ce521a92308c186e5d2db5' into kraken

* commit '128f1a87c55a291109ce521a92308c186e5d2db5':
  Fix bug 2185026 - back button in context menu now calls onContextMenuClosed()
 2010-04-02 16:25:33 -07:00
Adam Powell
128f1a87c5 am 6024ca5c: Fix bug 2185026 - back button in context menu now calls onContextMenuClosed() 
Merge commit '6024ca5c90203b6c33acc6adfbf7e4e613549a0a' into froyo-plus-aosp

* commit '6024ca5c90203b6c33acc6adfbf7e4e613549a0a':
  Fix bug 2185026 - back button in context menu now calls onContextMenuClosed()
 2010-04-02 16:20:54 -07:00
Adam Powell
6024ca5c90 Fix bug 2185026 - back button in context menu now calls onContextMenuClosed() 
Change-Id: I6c16879a8ad8e4651d21f639a620a936bf991f8d
 2010-04-02 16:05:20 -07:00
Grace Kloba
327dce9e36 Make sure when WebView modified mScrollX/Y directly, 
onScrollChanged() is called so that the View system
can do what it needs to adjust.

As WebView's onScrollChanged will call sendOurVisibleRect(),
we don't need to call it explicitly any more.

Fix http://b/issue?id=2438457
 2010-04-02 15:38:55 -07:00
Amith Yamasani
2098eadfba Potential fix for bug: 2564824 : Device runtime restart in BatteryService 
Look for corrupted bytes and replace with ?

If the problem is in the parsing code, then this will not help.

Change-Id: If33643f126a4099d4113e37760c6ef74683fe97e
 2010-04-02 14:11:29 -07:00
Charles Chen
265bffa901 am 36b205dc: am 6df44727: Unhiding TTS API constants and methods needed for TTS plugin support. This is a fix for bug #2548048 
Merge commit '36b205dc6fbe010b393e2f885bd7d6d05b74919b' into kraken

* commit '36b205dc6fbe010b393e2f885bd7d6d05b74919b':
  Unhiding TTS API constants and methods needed for TTS plugin support.
 2010-04-02 13:48:25 -07:00
Charles Chen
36b205dc6f am 6df44727: Unhiding TTS API constants and methods needed for TTS plugin support. This is a fix for bug #2548048 
Merge commit '6df44727d06548015e741dd8f63716602ed1e5d1' into froyo-plus-aosp

* commit '6df44727d06548015e741dd8f63716602ed1e5d1':
  Unhiding TTS API constants and methods needed for TTS plugin support.
 2010-04-02 13:45:30 -07:00
Dianne Hackborn
4d075b029f am 9bdc4508: am e13beb09: Merge "Add a new intent category used for activities running in carmode." into froyo 
Merge commit '9bdc45084f963869d4e9dd68de2280d3de7dda1d' into kraken

* commit '9bdc45084f963869d4e9dd68de2280d3de7dda1d':
  Add a new intent category used for activities running in carmode.
 2010-04-02 13:42:09 -07:00
Charles Chen
6df44727d0 Unhiding TTS API constants and methods needed for TTS plugin support. 
This is a fix for bug #2548048

Change-Id: Ieb60979098c1d2e82618204882bd523d271a8784
 2010-04-02 13:39:53 -07:00
Dianne Hackborn
9bdc45084f am e13beb09: Merge "Add a new intent category used for activities running in carmode." into froyo 
Merge commit 'e13beb09dadfba4806e6784bc7cde1466eb54ca4' into froyo-plus-aosp

* commit 'e13beb09dadfba4806e6784bc7cde1466eb54ca4':
  Add a new intent category used for activities running in carmode.
 2010-04-02 13:39:11 -07:00
San Mehat
be23fba286 NetworkManagementService: Combine setInterfaceRx/Tx throttle and add max speed 
Change-Id: I1d6816c9754801504a988802118a2167e0eb8690
Signed-off-by: San Mehat <san@google.com>
 2010-04-02 11:50:27 -07:00
Adam Powell
942d070cc6 am 1f29b4cd: am 21990922: Merge "Fix AbsListView scrolling behavior at edges." into froyo 
Merge commit '1f29b4cd1280cc223b7bafd5d4d7a232a5b3c40f' into kraken

* commit '1f29b4cd1280cc223b7bafd5d4d7a232a5b3c40f':
  Fix AbsListView scrolling behavior at edges.
 2010-04-02 11:10:03 -07:00
Adam Powell
1f29b4cd12 am 21990922: Merge "Fix AbsListView scrolling behavior at edges." into froyo 
Merge commit '219909224d9f5fdb4fe1c97fad048894c4619fe7' into froyo-plus-aosp

* commit '219909224d9f5fdb4fe1c97fad048894c4619fe7':
  Fix AbsListView scrolling behavior at edges.
 2010-04-02 11:06:34 -07:00
Bernd Holzhey
aea4b678b5 Add a new intent category used for activities running in carmode. 
Change-Id: I4702538c9f53cc0b64eae72298e27232cdfb3548
 2010-04-02 20:04:10 +02:00
Adam Powell
219909224d Merge "Fix AbsListView scrolling behavior at edges." into froyo 2010-04-02 11:02:21 -07:00
Fred Quintana
a269a54e07 am 3667b9b4: am 30ed25c2: Merge "revert the stripping of System Group: from the names of google system groups" into froyo 
Merge commit '3667b9b471a6585d22106cbfe4a04111ca86643c' into kraken

* commit '3667b9b471a6585d22106cbfe4a04111ca86643c':
  revert the stripping of System Group:
 2010-04-02 11:00:30 -07:00
Fred Quintana
3667b9b471 am 30ed25c2: Merge "revert the stripping of System Group: from the names of google system groups" into froyo 
Merge commit '30ed25c252e9eb9923d71676e8f703bb775b7cdf' into froyo-plus-aosp

* commit '30ed25c252e9eb9923d71676e8f703bb775b7cdf':
  revert the stripping of System Group:
 2010-04-02 10:53:22 -07:00
Fred Quintana
30ed25c252 Merge "revert the stripping of System Group: from the names of google system groups" into froyo 2010-04-02 10:47:11 -07:00
Adam Powell
b7795432a5 Fix AbsListView scrolling behavior at edges. 
Allow the user to start scrolling back into content immediately
after dragging past the end of content.

Remove some dead code.

Change-Id: Ife8f60499ac58179ba1e2500ca8745916392a4bc
 2010-04-02 10:21:55 -07:00
Grace Kloba
c23799bc27 am f34d9e20: am 61c3a13e: Merge "Instead of holding an ApplicationContext, JWebCoreJavaBridge will have a reference of the current window\'s main WebView. It is only non-null if the WebView\'s window has the focus." into froyo 
Merge commit 'f34d9e20c7f4c5537beb4287c79b24ab351bcda4' into kraken

* commit 'f34d9e20c7f4c5537beb4287c79b24ab351bcda4':
  Instead of holding an ApplicationContext, JWebCoreJavaBridge
 2010-04-02 09:22:07 -07:00
Grace Kloba
f34d9e20c7 am 61c3a13e: Merge "Instead of holding an ApplicationContext, JWebCoreJavaBridge will have a reference of the current window\'s main WebView. It is only non-null if the WebView\'s window has the focus." into froyo 
Merge commit '61c3a13e5f9d20c621f49598a0082063404c5f7e' into froyo-plus-aosp

* commit '61c3a13e5f9d20c621f49598a0082063404c5f7e':
  Instead of holding an ApplicationContext, JWebCoreJavaBridge
 2010-04-02 09:19:06 -07:00
Grace Kloba
61c3a13e5f Merge "Instead of holding an ApplicationContext, JWebCoreJavaBridge will have a reference of the current window's main WebView. It is only non-null if the WebView's window has the focus." into froyo 2010-04-02 09:14:39 -07:00
Mike Lockwood
dfcb20d1c3 am a9e1a131: am 87e72cd3: Merge "Vibrate before shutting down." into froyo 
Merge commit 'a9e1a131e3a5dcde4d69ee9f99aee4702dcff909' into kraken

* commit 'a9e1a131e3a5dcde4d69ee9f99aee4702dcff909':
  Vibrate before shutting down.
 2010-04-01 21:15:11 -07:00
Mike Lockwood
a9e1a131e3 am 87e72cd3: Merge "Vibrate before shutting down." into froyo 
Merge commit '87e72cd3b327fefc39030a628e9e9b7141791d39' into froyo-plus-aosp

* commit '87e72cd3b327fefc39030a628e9e9b7141791d39':
  Vibrate before shutting down.
 2010-04-01 21:12:56 -07:00
Mike Lockwood
87e72cd3b3 Merge "Vibrate before shutting down." into froyo 2010-04-01 21:08:53 -07:00
Mike Lockwood
a717f64ddc Vibrate before shutting down. 
BUG: 2439291

Change-Id: I0f5abba34a14f1dd1cbe2077122d6f3e940b4d90
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-04-01 21:07:30 -07:00
Jim Miller
64265cc59b am 15be35f6: am bf1259b8: Fix 2538826: Allow aspect of LockPatternView to be customized. 
Merge commit '15be35f6c9a88f453ba3a6be8d93fed8537ad77e' into kraken

* commit '15be35f6c9a88f453ba3a6be8d93fed8537ad77e':
  Fix 2538826: Allow aspect of LockPatternView to be customized.
 2010-04-01 19:41:00 -07:00