Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,486 Commits 3 Branches 0 Tags
41ee3072201d5cec5000307e0404044c35750061
Commit Graph

23486 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicolas Roard
41ee307220 Merge "resolved conflicts for merge of bfd6805a to master" 2010-05-11 10:42:41 -07:00
Nicolas Roard
9863ba94f0 resolved conflicts for merge of bfd6805a to master 
Change-Id: Ie975e4cd7391d62949c563453358aa999c8a4b45
 2010-05-11 10:40:11 -07:00
Joe Malin
ec9bbd6928 Merge "Doc Change: Testing Procedures documents testing_eclipse.html, testing_otheride.html, guide_toc.cs Change-Id: I25cc9f10f4b677ae4ac87e8f23524c395c17955e" 2010-05-11 10:39:57 -07:00
Dianne Hackborn
834910f51f am 217f2686: am 7d5cea98: am 7e76b6d1: am 6d00151c: Merge "Hopefully fix issue #2662536: Why is launcher being killed?" into froyo 2010-05-11 10:28:20 -07:00
Dirk Dougherty
e389ec59f9 am 775994e1: am c5803869: am 02168c41: am 1926c471: Merge "Doc change: Final api diffs 7 -> 8." into froyo 2010-05-11 10:28:16 -07:00
Dirk Dougherty
7d3563238e am 2ecef59c: am 0ab047c7: am 769612e1: am b32c2402: Doc change: add toc references to tictactoe sample apps and screen shots. 2010-05-11 10:28:11 -07:00
Jim Miller
f5eaee96b0 am c8212613: am 99dcfe7c: am 4d89954d: am a2757901: Merge "Fix 2660488: Add LockScreen/InCallScreen resources to preloads" into froyo 2010-05-11 10:28:06 -07:00
Nicolas Roard
bfd6805a82 am 2f68be54: am 373b4913: am f78acacb: Fix the \'wobbling fixed elements\' bug. Cherry-picked from master. This CL has a corresponding C++ counterpart (https://android-git.corp.google.com/g/#change,51149) 2010-05-11 10:26:20 -07:00
Dianne Hackborn
217f2686a3 am 7d5cea98: am 7e76b6d1: am 6d00151c: Merge "Hopefully fix issue #2662536: Why is launcher being killed?" into froyo 2010-05-11 10:26:15 -07:00
Dirk Dougherty
775994e12d am c5803869: am 02168c41: am 1926c471: Merge "Doc change: Final api diffs 7 -> 8." into froyo 2010-05-11 10:26:11 -07:00
Dirk Dougherty
2ecef59cba am 0ab047c7: am 769612e1: am b32c2402: Doc change: add toc references to tictactoe sample apps and screen shots. 2010-05-11 10:26:06 -07:00
Jim Miller
c821261345 am 99dcfe7c: am 4d89954d: am a2757901: Merge "Fix 2660488: Add LockScreen/InCallScreen resources to preloads" into froyo 2010-05-11 10:26:00 -07:00
Nicolas Roard
2f68be5417 am 373b4913: am f78acacb: Fix the \'wobbling fixed elements\' bug. Cherry-picked from master. This CL has a corresponding C++ counterpart (https://android-git.corp.google.com/g/#change,51149) 
Merge commit '373b4913ab5398736551ab718eb8c39d6f76e5d0' into kraken

* commit '373b4913ab5398736551ab718eb8c39d6f76e5d0':
  Fix the 'wobbling fixed elements' bug.
 2010-05-11 10:24:00 -07:00
Dianne Hackborn
7d5cea988b am 7e76b6d1: am 6d00151c: Merge "Hopefully fix issue #2662536: Why is launcher being killed?" into froyo 
Merge commit '7e76b6d191e1173bd85337a2861d9914922f5a0d' into kraken

* commit '7e76b6d191e1173bd85337a2861d9914922f5a0d':
  Hopefully fix issue #2662536: Why is launcher being killed?
 2010-05-11 10:23:56 -07:00
Dirk Dougherty
c5803869ff am 02168c41: am 1926c471: Merge "Doc change: Final api diffs 7 -> 8." into froyo 
Merge commit '02168c41c444e4f601a2809d6d948e4b051b3a3e' into kraken

* commit '02168c41c444e4f601a2809d6d948e4b051b3a3e':
  Doc change: Final api diffs 7 -> 8.
 2010-05-11 10:23:52 -07:00
Dirk Dougherty
0ab047c732 am 769612e1: am b32c2402: Doc change: add toc references to tictactoe sample apps and screen shots. 
Merge commit '769612e160c9be01c96371412e12d367e5063e9f' into kraken

* commit '769612e160c9be01c96371412e12d367e5063e9f':
  Doc change: add toc references to tictactoe sample apps and screen shots.
 2010-05-11 10:23:48 -07:00
Jim Miller
99dcfe7cda am 4d89954d: am a2757901: Merge "Fix 2660488: Add LockScreen/InCallScreen resources to preloads" into froyo 
Merge commit '4d89954dc4572a05339dc7a95ec683892558162b' into kraken

* commit '4d89954dc4572a05339dc7a95ec683892558162b':
  Fix 2660488: Add LockScreen/InCallScreen resources to preloads
 2010-05-11 10:23:42 -07:00
Nicolas Roard
373b4913ab am f78acacb: Fix the \'wobbling fixed elements\' bug. Cherry-picked from master. This CL has a corresponding C++ counterpart (https://android-git.corp.google.com/g/#change,51149) 
Merge commit 'f78acacb0d7a8e4d9e85a1cd6eed0f6bb38d6776' into froyo-plus-aosp

* commit 'f78acacb0d7a8e4d9e85a1cd6eed0f6bb38d6776':
  Fix the 'wobbling fixed elements' bug.
 2010-05-11 10:18:59 -07:00
Dianne Hackborn
7e76b6d191 am 6d00151c: Merge "Hopefully fix issue #2662536: Why is launcher being killed?" into froyo 
Merge commit '6d00151c519d5c131cc1480978fe4417cc7bcc79' into froyo-plus-aosp

* commit '6d00151c519d5c131cc1480978fe4417cc7bcc79':
  Hopefully fix issue #2662536: Why is launcher being killed?
 2010-05-11 10:18:55 -07:00
Dirk Dougherty
02168c41c4 am 1926c471: Merge "Doc change: Final api diffs 7 -> 8." into froyo 
Merge commit '1926c471a3acde38931f2cbd55415decc9879d2d' into froyo-plus-aosp

* commit '1926c471a3acde38931f2cbd55415decc9879d2d':
  Doc change: Final api diffs 7 -> 8.
 2010-05-11 10:18:51 -07:00
Dirk Dougherty
769612e160 am b32c2402: Doc change: add toc references to tictactoe sample apps and screen shots. 
Merge commit 'b32c2402c2b9d58b4f74be62dac6ce2781caec05' into froyo-plus-aosp

* commit 'b32c2402c2b9d58b4f74be62dac6ce2781caec05':
  Doc change: add toc references to tictactoe sample apps and screen shots.
 2010-05-11 10:18:47 -07:00
Jim Miller
4d89954dc4 am a2757901: Merge "Fix 2660488: Add LockScreen/InCallScreen resources to preloads" into froyo 
Merge commit 'a27579016caf1438400a3637e3896bec653e3756' into froyo-plus-aosp

* commit 'a27579016caf1438400a3637e3896bec653e3756':
  Fix 2660488: Add LockScreen/InCallScreen resources to preloads
 2010-05-11 10:18:38 -07:00
Robert Greenwalt
7819e1d72c Merge "Fix throttle datafile parsing." 2010-05-11 07:38:52 -07:00
Robert Greenwalt
9e3983fbde Fix throttle datafile parsing. 
"Optimization" yesterday was buggy.
bug:2674511

Change-Id: I3b1dde35a75b2017117c20905fcd82de405d41b5
 2010-05-11 07:31:42 -07:00
Steve Block
52ab0b39fc Merge webkit.org at r58033 : Update the WebKit UA string and LayoutTest ignore list 
Change-Id: I620e6da3f7318f329f3401075799e5659cacda82
 2010-05-11 14:28:10 +01:00
Mike Lockwood
31ac8e9d56 Add new permission android.permission.ACCESS_USB to allow access to USB devices 
Change-Id: Ib3dd573a5ef3950d20b21251fe7a3efad56b5c1f
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-05-11 08:29:19 -04:00
Bjorn Bringert
91882c4731 Merge "Added definitions for the ways in which VoiceIME can be started." 2010-05-11 03:23:02 -07:00
Joe Malin
9a5ce6146c Doc Change: Testing Procedures documents testing_eclipse.html, testing_otheride.html, guide_toc.cs 
Change-Id: I25cc9f10f4b677ae4ac87e8f23524c395c17955e

Conflicts:

	docs/html/guide/guide_toc.cs
 2010-05-10 22:36:14 -07:00
Wu-cheng Li
f0b8679b5d am 0c3bba3e: am e1b2b3b0: Merge "Add continuous focus mode constant." into kraken 2010-05-10 20:07:54 -07:00
Wu-cheng Li
0c3bba3ee5 am e1b2b3b0: Merge "Add continuous focus mode constant." into kraken 2010-05-10 20:06:04 -07:00
Wu-cheng Li
e1b2b3b0d2 Merge "Add continuous focus mode constant." into kraken 2010-05-10 20:04:14 -07:00
Nicolas Roard
f78acacb0d Fix the 'wobbling fixed elements' bug. 
Cherry-picked from master.
This CL has a corresponding C++ counterpart (https://android-git.corp.google.com/g/#change,51149)

Bug:2665696
Change-Id: I0a044661ff21ef601ba34782db8acdc9531f98e7
 2010-05-10 19:31:54 -07:00
Konstantin Lopyrev
6707341b28 Fixing bug 2660263, changed text for PIN unlock 
Change-Id: I904c7c4753b68195fbd547e97207aa3cceef3c6d
 2010-05-10 18:02:31 -07:00
Dianne Hackborn
6d00151c51 Merge "Hopefully fix issue #2662536: Why is launcher being killed?" into froyo 2010-05-10 17:27:14 -07:00
Dianne Hackborn
906497c574 Hopefully fix issue #2662536: Why is launcher being killed? 
It looks like there was a subtle bug where Process.setOomAdj() could
return false just because the given process doesn't exist, even though
it is documented to only return false if OOM killing is not supported
at all.  This would cause the activity manager to fall into its code
path of trying to clean up processes itself, which it does a much
poorer problem at.  I am thinking we may be seeing this problem more
now that the activity manager is killing background processes itself
when there are too many of them.

In addition, this change cleans up and reduces some of the logging
around killing processes.

Finally, try to improve process LRU management a bit by taking
into account process dependencies.  Any dependent processes are
pulled up in the LRU list with the processes that is actually
moving.  Also, we bring a process up if someone accesses its content
provider.

Change-Id: I34ea161f839679345578ffe681e8d9c5d26ab948
 2010-05-10 17:19:58 -07:00
Robert Greenwalt
24488bd094 Fix build. Instantiate object before use. 
bug:2673562
Change-Id: I1e39f7847c25c5c1923a7b7e864b402c94834528
 2010-05-10 17:02:55 -07:00
Nicolas Roard
46318cf9bf Fix the 'wobbling fixed elements' bug. 
This CL has a corresponding C++ counterpart (https://android-git.corp.google.com/g/#change,51149)

Bug:2665696
Change-Id: I28516005d03afa866efed2677197120ac6e2d579
 2010-05-10 16:35:52 -07:00
Dirk Dougherty
1926c471a3 Merge "Doc change: Final api diffs 7 -> 8." into froyo 2010-05-10 16:23:13 -07:00
Dirk Dougherty
b32c2402c2 Doc change: add toc references to tictactoe sample apps and screen shots. 
Change-Id: I7d520587c0e6b2252e819029a2f053893fdcd7c3
 2010-05-10 16:19:52 -07:00
Jim Miller
a27579016c Merge "Fix 2660488: Add LockScreen/InCallScreen resources to preloads" into froyo 2010-05-10 15:55:41 -07:00
Jim Miller
7d38886ba6 Fix 2660488: Add LockScreen/InCallScreen resources to preloads 
This adds the base SlidinTab drawable resources shared by
InCallScreen and LockScreen into the zygote process. It should
save approximately 375kB (mdpi) and 825kB (hdpi) of RAM by
sharing resource between the LockScreen and InCallScreen.

Change-Id: I05bcafa894ed27d419b171ad5041bd83134461f7
 2010-05-10 15:24:47 -07:00
Robert Greenwalt
0674cfbca3 Merge "Reduce lock contention" 2010-05-10 14:12:28 -07:00
The Android Open Source Project
ba6b4ee862 am 904d911f: am e88ae544: am b6f0cbdc: merge from open-source master 2010-05-10 13:54:14 -07:00
Robert Greenwalt
39e163f45a Reduce lock contention 
Reduce the amount of work done inside of synchronized blocks and
force the use of cached ntp data when publicly called.
bug:2662331

Change-Id: Ibafd29ea9e355fa8f875d06ce37870b0c01c57f4
 2010-05-10 13:52:32 -07:00
The Android Open Source Project
904d911f5f am e88ae544: am b6f0cbdc: merge from open-source master 2010-05-10 13:52:03 -07:00
The Android Open Source Project
e88ae544e3 am b6f0cbdc: merge from open-source master 
Merge commit 'b6f0cbdcbb566368ebe0468f61de024f644db6e1' into kraken

* commit 'b6f0cbdcbb566368ebe0468f61de024f644db6e1':
  Include the API level 4 fields in the Parcel.
 2010-05-10 13:50:32 -07:00
The Android Open Source Project
b6f0cbdcbb merge from open-source master 
Change-Id: Ia4cbea9d94b2ff34fc8ce97c1fe35ca5898d6c1c
 2010-05-10 13:48:37 -07:00
The Android Open Source Project
a7b01969f6 am cee6300c: am 38a410f1: am 686d9ff5: merge from open-source master 2010-05-10 12:56:46 -07:00
The Android Open Source Project
cee6300cf1 am 38a410f1: am 686d9ff5: merge from open-source master 2010-05-10 12:54:45 -07:00
The Android Open Source Project
38a410f12a am 686d9ff5: merge from open-source master 
Merge commit '686d9ff53c32ded9b2b02eb9f2040f2030846e51' into kraken

* commit '686d9ff53c32ded9b2b02eb9f2040f2030846e51':
  Use isLocationProviderEnabled to test for enabled providers
  Added WEB_URL_PATTERN for Montenegro ".me"
  long modifier was on the wrong argument.
 2010-05-10 12:53:28 -07:00