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

20776 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
2fecae386d am ad5499dd: Hopefully get rid of some ANRs. 
Merge commit 'ad5499dd204a1512471778462a805a288595f2f2' into froyo-plus-aosp

* commit 'ad5499dd204a1512471778462a805a288595f2f2':
  Hopefully get rid of some ANRs.
 2010-03-29 21:19:36 -07:00
Adam Powell
1aed070562 am ecf4406c: am 370fe2a9: am 9d32d24d: Remove overscrolling 2010-03-29 21:16:37 -07:00
Dianne Hackborn
e252246655 Fix issue #2547337: switching night modes 
Dumb.

Change-Id: Iaa72eaac54422f7fd95cf1050f6b7b6da55af0c3
 2010-03-29 21:13:31 -07:00
Adam Powell
ecf4406ce5 am 370fe2a9: am 9d32d24d: Remove overscrolling 
Merge commit '370fe2a91e9e824c6339fc836377c4aa6d80fc06' into kraken

* commit '370fe2a91e9e824c6339fc836377c4aa6d80fc06':
  Remove overscrolling
 2010-03-29 21:09:28 -07:00
Dianne Hackborn
ad5499dd20 Hopefully get rid of some ANRs. 
Don't hold the activity manager lock the entire time we are processing an ANR,
which often causes us to cause a second ANR as someone else calls into the
activity manager and gets blocked.

Change-Id: Ife4db82b12d6f4378ac2705bd6f60beb1244a1e6
 2010-03-29 21:07:23 -07:00
Adam Powell
370fe2a91e am 9d32d24d: Remove overscrolling 
Merge commit '9d32d24dbd8a015c9d5c44ed4901d5a666eb8e7f' into froyo-plus-aosp

* commit '9d32d24dbd8a015c9d5c44ed4901d5a666eb8e7f':
  Remove overscrolling
 2010-03-29 21:02:47 -07:00
Adam Powell
9d32d24dbd Remove overscrolling 
Change-Id: I7e9db8d8a9b8ef67f0c0c82bf57c9155b7ebabea
 2010-03-29 20:46:45 -07:00
Oscar Montemayor
0381bc1f1a am 1caca224: (-s ours) am 1ec71365: (-s ours) am f5f30067: Merge "DO NOT MERGE Removing unused features from source tree. Please refer to Bug#2502219." into froyo 2010-03-29 19:08:50 -07:00
Oscar Montemayor
1caca2248b am 1ec71365: (-s ours) am f5f30067: Merge "DO NOT MERGE Removing unused features from source tree. Please refer to Bug#2502219." into froyo 
Merge commit '1ec71365f98baa24f8df82d9c4a79dd6edc940eb' into kraken

* commit '1ec71365f98baa24f8df82d9c4a79dd6edc940eb':
  DO NOT MERGE
 2010-03-29 19:03:28 -07:00
Oscar Montemayor
1ec71365f9 am f5f30067: Merge "DO NOT MERGE Removing unused features from source tree. Please refer to Bug#2502219." into froyo 
Merge commit 'f5f300678abb79574bb56eee13c8dd2b7b98b740' into froyo-plus-aosp

* commit 'f5f300678abb79574bb56eee13c8dd2b7b98b740':
  DO NOT MERGE
 2010-03-29 19:01:16 -07:00
Oscar Montemayor
f5f300678a Merge "DO NOT MERGE Removing unused features from source tree. Please refer to Bug#2502219." into froyo 2010-03-29 18:56:57 -07:00
Charles Chen
6d3e41cce3 am e549ce98: am 629d03f1: am a599dafe: Merge "Fix for bug 2548048 - it was impossible for applications to discover if their TTS settings were being overridden by the user or not." into froyo 2010-03-29 18:52:47 -07:00
Charles Chen
e549ce98cf am 629d03f1: am a599dafe: Merge "Fix for bug 2548048 - it was impossible for applications to discover if their TTS settings were being overridden by the user or not." into froyo 
Merge commit '629d03f12251220daf26abc5be86d4649318a331' into kraken

* commit '629d03f12251220daf26abc5be86d4649318a331':
  Fix for bug 2548048 - it was impossible for applications to discover
 2010-03-29 18:44:59 -07:00
Charles Chen
629d03f122 am a599dafe: Merge "Fix for bug 2548048 - it was impossible for applications to discover if their TTS settings were being overridden by the user or not." into froyo 
Merge commit 'a599dafe4ffc3e6cc4953a7e3d33f4da80aabf45' into froyo-plus-aosp

* commit 'a599dafe4ffc3e6cc4953a7e3d33f4da80aabf45':
  Fix for bug 2548048 - it was impossible for applications to discover
 2010-03-29 18:41:48 -07:00
Amith Yamasani
7666f580c6 am 51e2c991: am e7eb3a35: am 8c6af52f: Merge "Fix preloaded classes for API rename of BackupAgentHelper" into froyo 2010-03-29 18:41:39 -07:00
Charles Chen
a599dafe4f Merge "Fix for bug 2548048 - it was impossible for applications to discover if their TTS settings were being overridden by the user or not." into froyo 2010-03-29 18:37:41 -07:00
Charles Chen
42229259a6 Fix for bug 2548048 - it was impossible for applications to discover 
if their TTS settings were being overridden by the user or not.

Change-Id: I28856a1b79c9455435671d13ed614a1ccb4e95ea
 2010-03-29 18:35:30 -07:00
Amith Yamasani
51e2c99160 am e7eb3a35: am 8c6af52f: Merge "Fix preloaded classes for API rename of BackupAgentHelper" into froyo 
Merge commit 'e7eb3a35fe35b858597410d4b41c9d027c4b83c3' into kraken

* commit 'e7eb3a35fe35b858597410d4b41c9d027c4b83c3':
  Fix preloaded classes for API rename of BackupAgentHelper
 2010-03-29 18:33:55 -07:00
Amith Yamasani
e7eb3a35fe am 8c6af52f: Merge "Fix preloaded classes for API rename of BackupAgentHelper" into froyo 
Merge commit '8c6af52fdd572e19cd40a0be53615eb6c80ccde5' into froyo-plus-aosp

* commit '8c6af52fdd572e19cd40a0be53615eb6c80ccde5':
  Fix preloaded classes for API rename of BackupAgentHelper
 2010-03-29 18:28:14 -07:00
Amith Yamasani
8c6af52fdd Merge "Fix preloaded classes for API rename of BackupAgentHelper" into froyo 2010-03-29 18:24:59 -07:00
Joe Onorato
3685ef3666 am f523384c: am 82bac8ec: am 59fc58dc: fix the build 2010-03-29 18:22:03 -07:00
Joe Onorato
f523384cab am 82bac8ec: am 59fc58dc: fix the build 
Merge commit '82bac8ece4d0e07f0490c9852b295f465acd1dee' into kraken

* commit '82bac8ece4d0e07f0490c9852b295f465acd1dee':
  fix the build
 2010-03-29 18:13:38 -07:00
Oscar Montemayor
1f4df90bfa DO NOT MERGE 
Removing unused features from source tree.
Please refer to Bug#2502219.

Change-Id: I879c29bfd5ffe933f64bb1082aaae7c956450a5a
 2010-03-29 18:12:24 -07:00
Amith Yamasani
03aa34f50d Fix preloaded classes for API rename of BackupAgentHelper 
Change-Id: Ica6301b2aac6879702b98edfcf67fc7bc62002db
 2010-03-29 18:11:56 -07:00
Joe Onorato
82bac8ece4 am 59fc58dc: fix the build 
Merge commit '59fc58dc3f164e33a96aee09505fac5818747cb6' into froyo-plus-aosp

* commit '59fc58dc3f164e33a96aee09505fac5818747cb6':
  fix the build
 2010-03-29 18:10:09 -07:00
Joe Onorato
59fc58dc3f fix the build 
Change-Id: I39e1bdfbea1c9dfa6a4a09f94f6eb75095290427
 2010-03-29 18:06:11 -07:00
Romain Guy
6c48e1ab78 am 9634e349: am 1faae167: am 691b806f: Merge "Fix possible security issue. Bug #2553187" into froyo 2010-03-29 16:52:23 -07:00
Ben Cheng
b14fe53afc am 08eac7d5: am 8d0dc62f: am ef3f5ddc: Replace "safeMode" with a more specific name "vmSafeMode" in the public API. 2010-03-29 16:52:19 -07:00
Steve Howard
077b683d5a am 8bb0fc7f: am e9cd68f1: am 8deb2391: Merge "Remove upside-down portrait orientation." into froyo 2010-03-29 16:52:15 -07:00
Romain Guy
9634e3496d am 1faae167: am 691b806f: Merge "Fix possible security issue. Bug #2553187" into froyo 
Merge commit '1faae1677229bf9a4552cc3f90e0afe2858e7a4c' into kraken

* commit '1faae1677229bf9a4552cc3f90e0afe2858e7a4c':
  Fix possible security issue.
 2010-03-29 16:40:43 -07:00
Romain Guy
1faae16772 am 691b806f: Merge "Fix possible security issue. Bug #2553187" into froyo 
Merge commit '691b806ff8b4a6428588e8495cb1a5819a0aee99' into froyo-plus-aosp

* commit '691b806ff8b4a6428588e8495cb1a5819a0aee99':
  Fix possible security issue.
 2010-03-29 16:34:46 -07:00
Ben Cheng
08eac7d5cd am 8d0dc62f: am ef3f5ddc: Replace "safeMode" with a more specific name "vmSafeMode" in the public API. 
Merge commit '8d0dc62fe26e02a3a303c9286b06fc0c24c36dcb' into kraken

* commit '8d0dc62fe26e02a3a303c9286b06fc0c24c36dcb':
  Replace "safeMode" with a more specific name "vmSafeMode" in the public API.
 2010-03-29 16:32:11 -07:00
Steve Howard
8bb0fc7f89 am e9cd68f1: am 8deb2391: Merge "Remove upside-down portrait orientation." into froyo 
Merge commit 'e9cd68f18197bd4417a6fd4534979c4807568ecc' into kraken

* commit 'e9cd68f18197bd4417a6fd4534979c4807568ecc':
  Remove upside-down portrait orientation.
 2010-03-29 16:32:05 -07:00
Romain Guy
691b806ff8 Merge "Fix possible security issue. Bug #2553187" into froyo 2010-03-29 16:31:14 -07:00
Ben Cheng
8d0dc62fe2 am ef3f5ddc: Replace "safeMode" with a more specific name "vmSafeMode" in the public API. 
Merge commit 'ef3f5ddc2137ed99e41f00441b688fb56b855179' into froyo-plus-aosp

* commit 'ef3f5ddc2137ed99e41f00441b688fb56b855179':
  Replace "safeMode" with a more specific name "vmSafeMode" in the public API.
 2010-03-29 16:25:13 -07:00
Steve Howard
e9cd68f181 am 8deb2391: Merge "Remove upside-down portrait orientation." into froyo 
Merge commit '8deb239169f9b60cf19b6f4293978e654fa15a03' into froyo-plus-aosp

* commit '8deb239169f9b60cf19b6f4293978e654fa15a03':
  Remove upside-down portrait orientation.
 2010-03-29 16:25:09 -07:00
Ben Cheng
ef3f5ddc21 Replace "safeMode" with a more specific name "vmSafeMode" in the public API. 
Bug: 2553512
Change-Id: Id0dad80ecdcb8c7430dcf1ac26132ccd9c0770f5
 2010-03-29 16:17:58 -07:00
Jack Palevich
eae38936a3 Merge "Add a test program for Sapphire viewport rotation issue." 2010-03-29 16:12:11 -07:00
Christopher Tate
de0d50f8b7 am 2eb13d3f: am 245df5ad: am 3f264c4f: Merge "API CHANGE: rename BackupHelperAgent => BackupAgentHelper per API Council" into froyo 2010-03-29 16:07:47 -07:00
Mathias Agopian
b33e8741d7 am de984ec8: am 0815235f: am a019df87: Merge "Fix Android\'s glEGLImageTargetRenderbufferOES() wrapper" into froyo 2010-03-29 16:07:44 -07:00
Mathias Agopian
6f1765b3a1 am 22db6f53: am 6874362a: am 04fdd180: Merge "fix [2542425] memory leak during video recording" into froyo 2010-03-29 16:07:39 -07:00
Steve Howard
8deb239169 Merge "Remove upside-down portrait orientation." into froyo 2010-03-29 16:05:35 -07:00
Jack Palevich
c49eeba5d8 Add a test program for Sapphire viewport 
rotation issue.
 2010-03-29 16:04:21 -07:00
Romain Guy
2aba11f6b9 Fix possible security issue. 
Bug #2553187

Limit the max number of lines for each entry in the ResolveActivity to 2. Also
make sure to discard potential styling tags and newlines/space characters from
package name and activity labels.

Change-Id: Ibda3688267aa948b921164d3d3abc8c9236e61a2
 2010-03-29 16:03:01 -07:00
Christopher Tate
2eb13d3f46 am 245df5ad: am 3f264c4f: Merge "API CHANGE: rename BackupHelperAgent => BackupAgentHelper per API Council" into froyo 
Merge commit '245df5ad16ff227761906c10dc97c01901232666' into kraken

* commit '245df5ad16ff227761906c10dc97c01901232666':
  API CHANGE: rename BackupHelperAgent => BackupAgentHelper per API Council
 2010-03-29 15:57:01 -07:00
Mathias Agopian
de984ec8dc am 0815235f: am a019df87: Merge "Fix Android\'s glEGLImageTargetRenderbufferOES() wrapper" into froyo 
Merge commit '0815235ffceb9e079185c1a3c78e2793157523f9' into kraken

* commit '0815235ffceb9e079185c1a3c78e2793157523f9':
  Fix Android's glEGLImageTargetRenderbufferOES() wrapper
 2010-03-29 15:56:57 -07:00
Mathias Agopian
22db6f535e am 6874362a: am 04fdd180: Merge "fix [2542425] memory leak during video recording" into froyo 
Merge commit '6874362a6b3e0b75f42a2d1bf266eb2d25580b47' into kraken

* commit '6874362a6b3e0b75f42a2d1bf266eb2d25580b47':
  fix [2542425] memory leak during video recording
 2010-03-29 15:56:54 -07:00
Christopher Tate
245df5ad16 am 3f264c4f: Merge "API CHANGE: rename BackupHelperAgent => BackupAgentHelper per API Council" into froyo 
Merge commit '3f264c4fba416f55247da3fafd6afbe55bf93598' into froyo-plus-aosp

* commit '3f264c4fba416f55247da3fafd6afbe55bf93598':
  API CHANGE: rename BackupHelperAgent => BackupAgentHelper per API Council
 2010-03-29 15:53:54 -07:00
Mathias Agopian
0815235ffc am a019df87: Merge "Fix Android\'s glEGLImageTargetRenderbufferOES() wrapper" into froyo 
Merge commit 'a019df875d991ce61c93720f37c036655723f5f6' into froyo-plus-aosp

* commit 'a019df875d991ce61c93720f37c036655723f5f6':
  Fix Android's glEGLImageTargetRenderbufferOES() wrapper
 2010-03-29 15:53:48 -07:00
Mathias Agopian
6874362a6b am 04fdd180: Merge "fix [2542425] memory leak during video recording" into froyo 
Merge commit '04fdd180cc64f2724c8b8598f1b8495fb1fa1d93' into froyo-plus-aosp

* commit '04fdd180cc64f2724c8b8598f1b8495fb1fa1d93':
  fix [2542425] memory leak during video recording
 2010-03-29 15:53:44 -07:00