26831 Commits

Author SHA1 Message Date
Kenny Root
79a1ee4249 am cee0b97e: Merge "Free AssetManager weak refs before unmounting" into gingerbread
Merge commit 'cee0b97eed0a460e2da58500e24d3e4dac5cb9f6' into gingerbread-plus-aosp

* commit 'cee0b97eed0a460e2da58500e24d3e4dac5cb9f6':
  Free AssetManager weak refs before unmounting
2010-09-14 18:04:53 -07:00
Kenny Root
cee0b97eed Merge "Free AssetManager weak refs before unmounting" into gingerbread 2010-09-14 18:02:39 -07:00
Steve Howard
d2de99e377 am 536ee090: Merge "Fix name shadowing bug with revoking URI permissions." into gingerbread
Merge commit '536ee090ef75add0f7244c1c22be83fe03a66010' into gingerbread-plus-aosp

* commit '536ee090ef75add0f7244c1c22be83fe03a66010':
  Fix name shadowing bug with revoking URI permissions.
2010-09-14 17:48:30 -07:00
Steve Howard
536ee090ef Merge "Fix name shadowing bug with revoking URI permissions." into gingerbread 2010-09-14 17:46:22 -07:00
Chris Palmer
c5e2e26b9d am 5bade703: Merge "DO NOT MERGE Correct the PackageManager.checkSignatures documentation." into gingerbread
Merge commit '5bade703fd8434ba4cd5c9d1e8e1dc0f383b32b5' into gingerbread-plus-aosp

* commit '5bade703fd8434ba4cd5c9d1e8e1dc0f383b32b5':
  DO NOT MERGE Correct the PackageManager.checkSignatures documentation.
2010-09-14 17:45:59 -07:00
Chris Palmer
5bade703fd Merge "DO NOT MERGE Correct the PackageManager.checkSignatures documentation." into gingerbread 2010-09-14 17:43:31 -07:00
Steve Howard
0de8ddb0cf Fix name shadowing bug with revoking URI permissions.
Change-Id: Ibfcb0dc73c6b1a111dbb8d56e6f0b78084f5e4e6
2010-09-14 16:29:26 -07:00
John Wang
8028bd5b69 am 6457a28b: Merge "Complete event registration in CallManager." into gingerbread
Merge commit '6457a28be8a0589fd027a86ebdee04a0cc6fefd5' into gingerbread-plus-aosp

* commit '6457a28be8a0589fd027a86ebdee04a0cc6fefd5':
  Complete event registration in CallManager.
2010-09-14 16:28:10 -07:00
John Wang
6457a28be8 Merge "Complete event registration in CallManager." into gingerbread 2010-09-14 16:26:14 -07:00
Erik
0b46070d88 am 426ee7f2: Fixes some bugs in TimeZoneUtils
Merge commit '426ee7f22eeaa016cdbf0addbb7b2cc6b6cc3487' into gingerbread-plus-aosp

* commit '426ee7f22eeaa016cdbf0addbb7b2cc6b6cc3487':
  Fixes some bugs in TimeZoneUtils
2010-09-14 16:19:03 -07:00
Erik
426ee7f22e Fixes some bugs in TimeZoneUtils
TimeZoneUtils was updating the db and modifying the selection. This
creates a static selection for each update type and creates new
values for each update. Also adds a method for apps to force the
local tz cache to refresh if they think another app has modified
the db.

Change-Id: Iaaade635ac8ff11bb116005a0f6b44efcd4c4056
2010-09-14 16:08:55 -07:00
John Wang
59f9bae81d Complete event registration in CallManager.
1. Originally CallManager registers for all phone events provided by registerFor interface,

which will cause error msg such as "registerForXXX() in PhoneBase should not be called, CDMAPhone inactive."

for CDMA only events. Register for those events only if phone is CDMA phone.

2. Add registerForPostDialCharacter().

Note, we can't use notifyRegistrants() in handler since we need send

the character that is being processed in msg.arg1.

Change-Id: I48037c8a8e225bb82e203836a041f81f2445f4d8
2010-09-14 16:01:50 -07:00
Jeff Brown
14bc6b5d06 am 09340a4b: Merge "Replace epoll() with poll() and rename PollLoop to Looper." into gingerbread
Merge commit '09340a4bb99507d9b6bfbfc68a450d4d4f354d73' into gingerbread-plus-aosp

* commit '09340a4bb99507d9b6bfbfc68a450d4d4f354d73':
  Replace epoll() with poll() and rename PollLoop to Looper.
2010-09-14 15:32:03 -07:00
Jeff Brown
09340a4bb9 Merge "Replace epoll() with poll() and rename PollLoop to Looper." into gingerbread 2010-09-14 15:27:33 -07:00
Mathias Agopian
48a862407d am b3ffc78f: Merge "Add logging of various important graphics events" into gingerbread
Merge commit 'b3ffc78f3432344702e6f5232067ab624083cad2' into gingerbread-plus-aosp

* commit 'b3ffc78f3432344702e6f5232067ab624083cad2':
  Add logging of various important graphics events
2010-09-14 15:14:10 -07:00
Mathias Agopian
b3ffc78f34 Merge "Add logging of various important graphics events" into gingerbread 2010-09-14 15:11:33 -07:00
jsh
b30f218820 am 17fe229f: Merge "Unhide GsmCellLocation.getPsc()." into gingerbread
Merge commit '17fe229fe8b5c43fe1fbd0511d6e4f1565a957d4' into gingerbread-plus-aosp

* commit '17fe229fe8b5c43fe1fbd0511d6e4f1565a957d4':
  Unhide GsmCellLocation.getPsc().
2010-09-14 15:05:53 -07:00
jsh
17fe229fe8 Merge "Unhide GsmCellLocation.getPsc()." into gingerbread 2010-09-14 15:02:46 -07:00
Kenny Root
aa48540222 Free AssetManager weak refs before unmounting
AssetManagers are kept in WeakReference pools so there's a change
another thread in the system_server has opened a file on the external
card. Attempt to force a garbage collection to free these references
each time we're about to unmount a volume on the external storage.

Change-Id: I6e816e8c67b179887e488dc6758b43bcdd5914fb
2010-09-14 14:49:41 -07:00
Eric Laurent
23b8054e85 am eea35ce8: Merge "Added intents for audio effects control application" into gingerbread
Merge commit 'eea35ce87f179098215b590fbb21162cca5ff8da' into gingerbread-plus-aosp

* commit 'eea35ce87f179098215b590fbb21162cca5ff8da':
  Added intents for audio effects control application
2010-09-14 13:05:22 -07:00
Eric Laurent
eea35ce87f Merge "Added intents for audio effects control application" into gingerbread 2010-09-14 13:02:18 -07:00
Dianne Hackborn
227afd3a1b am 1188f5e7: Merge "Fix problem where power manager was calling battery stats with bad wl type." into gingerbread
Merge commit '1188f5e76cfcd512c4e2fae00ac0bfba3150bd7b' into gingerbread-plus-aosp

* commit '1188f5e76cfcd512c4e2fae00ac0bfba3150bd7b':
  Fix problem where power manager was calling battery stats with bad wl type.
2010-09-14 12:31:07 -07:00
Dianne Hackborn
1188f5e76c Merge "Fix problem where power manager was calling battery stats with bad wl type." into gingerbread 2010-09-14 12:28:08 -07:00
Erik
86e1991428 am b92788aa: Merge "Adds time zone functionality into fw as a hidden api" into gingerbread
Merge commit 'b92788aa040d0971b4e54589aef7675f34d96e5d' into gingerbread-plus-aosp

* commit 'b92788aa040d0971b4e54589aef7675f34d96e5d':
  Adds time zone functionality into fw as a hidden api
2010-09-14 12:25:31 -07:00
Erik
b92788aa04 Merge "Adds time zone functionality into fw as a hidden api" into gingerbread 2010-09-14 12:21:53 -07:00
Dianne Hackborn
264e727775 am 934516e1: Merge "Fix issue #2999795: Runtime restart on Crespo" into gingerbread
Merge commit '934516e10150874fd1db5ab9e0be3ae793441fd8' into gingerbread-plus-aosp

* commit '934516e10150874fd1db5ab9e0be3ae793441fd8':
  Fix issue #2999795: Runtime restart on Crespo
2010-09-14 11:54:28 -07:00
Dianne Hackborn
934516e101 Merge "Fix issue #2999795: Runtime restart on Crespo" into gingerbread 2010-09-14 11:50:51 -07:00
Dianne Hackborn
83770289f8 Fix issue #2999795: Runtime restart on Crespo
Change-Id: I7138b031298a234f3f35aec4a003d25cf86a57ff
2010-09-14 11:45:44 -07:00
Brad Fitzpatrick
f26ac1f8ed am 96d6c345: Merge "Unify some duplicate StrictMode-enabling code." into gingerbread
Merge commit '96d6c3454c3550486a2efa25ca0c83732b5e2eaf' into gingerbread-plus-aosp

* commit '96d6c3454c3550486a2efa25ca0c83732b5e2eaf':
  Unify some duplicate StrictMode-enabling code.
2010-09-14 11:39:54 -07:00
Brad Fitzpatrick
79cc46d1b0 am fb85bc66: Merge "Add missing wallpaper service lock." into gingerbread
Merge commit 'fb85bc66c467be96fe8420338321df6f15359d7d' into gingerbread-plus-aosp

* commit 'fb85bc66c467be96fe8420338321df6f15359d7d':
  Add missing wallpaper service lock.
2010-09-14 11:39:43 -07:00
Brad Fitzpatrick
96d6c3454c Merge "Unify some duplicate StrictMode-enabling code." into gingerbread 2010-09-14 11:37:13 -07:00
Brad Fitzpatrick
fb85bc66c4 Merge "Add missing wallpaper service lock." into gingerbread 2010-09-14 11:37:05 -07:00
Romain Guy
282315e154 am 52e19d59: Merge "Change the keep alive time for excess idle threads." into gingerbread
Merge commit '52e19d5917b8f057131c1dc8b3eb772febd791d9' into gingerbread-plus-aosp

* commit '52e19d5917b8f057131c1dc8b3eb772febd791d9':
  Change the keep alive time for excess idle threads.
2010-09-14 11:36:55 -07:00
Romain Guy
52e19d5917 Merge "Change the keep alive time for excess idle threads." into gingerbread 2010-09-14 11:34:01 -07:00
Brad Fitzpatrick
194b19a4b3 Add missing wallpaper service lock.
Unimportant, but found while reading the code for other reasons.

Change-Id: I9f2fad3ff5d081aef7a35e5f33ec5de7dc92195e
2010-09-14 11:30:29 -07:00
Romain Guy
6b424f4770 Change the keep alive time for excess idle threads.
Change-Id: Ie076544df5ee8df185f0824333fdc62203a565c2
2010-09-14 11:30:27 -07:00
Brian Carlstrom
e68f8b7ebe am 405d4db5: Rename internal SSLParameters to SSLParametersImpl to avoid collision with new javax.net.ssl.SSLParameters
Merge commit '405d4db50b3db1fc5e015475218e190d193332d4' into gingerbread-plus-aosp

* commit '405d4db50b3db1fc5e015475218e190d193332d4':
  Rename internal SSLParameters to SSLParametersImpl to avoid collision with new javax.net.ssl.SSLParameters
2010-09-14 11:29:57 -07:00
Brian Carlstrom
405d4db50b Rename internal SSLParameters to SSLParametersImpl to avoid collision with new javax.net.ssl.SSLParameters
Bug: 2672817
Change-Id: Ibe20830f024f76232f3628cfca922d49a5a06bef
2010-09-14 11:24:13 -07:00
Brian Carlstrom
0535d8577f am 94126238: Merge "Remove SSLContextImpl.engineInit(..) that takes persistent cache arguments" into gingerbread
Merge commit '94126238427f04ecb86fe6832113afb2f04e89b5' into gingerbread-plus-aosp

* commit '94126238427f04ecb86fe6832113afb2f04e89b5':
  Remove SSLContextImpl.engineInit(..) that takes persistent cache arguments
2010-09-14 11:17:22 -07:00
Erik
71ad58c751 Adds time zone functionality into fw as a hidden api
This is the start of work towards pushing api that is needed for
Calendar to become unbundled into frameworks. This adds functions
for getting and setting time zones for the Calendar app. The new
methods are currently hidden.

Change-Id: I1b4265b23630c46d9730a179ec02da8d6c0e03ea
2010-09-14 11:16:08 -07:00
Brian Carlstrom
9412623842 Merge "Remove SSLContextImpl.engineInit(..) that takes persistent cache arguments" into gingerbread 2010-09-14 11:15:01 -07:00
jsh
2ec0e6fe1e Unhide GsmCellLocation.getPsc().
bug: 2465036
Change-Id: If071c4e0f1f3484c010ec908b02800361cbf8a86
2010-09-14 11:13:27 -07:00
Dianne Hackborn
70be1673ab Fix problem where power manager was calling battery stats with bad wl type.
Also fiddle code to reduce duplication.

Change-Id: I3f1b086e53ef88dac1ec1896fe711b3cfe7fdd58
2010-09-14 11:13:03 -07:00
John Wang
e92fdd261e am e7b92d7b: Merge "Return immutable copies of private callList." into gingerbread
Merge commit 'e7b92d7b53343119173558302ecfb3986ae0fbd6' into gingerbread-plus-aosp

* commit 'e7b92d7b53343119173558302ecfb3986ae0fbd6':
  Return immutable copies of private callList.
2010-09-14 10:31:45 -07:00
John Wang
e7b92d7b53 Merge "Return immutable copies of private callList." into gingerbread 2010-09-14 10:28:33 -07:00
Leon Scroggins III
720d5985f5 am 901b7b9b: am ca8f3d04: Merge "Add an option to hide the Voice Search icon." into froyo
Merge commit '901b7b9b17d20dc8085fb5fd3bab0f0804f3906b' into gingerbread-plus-aosp

* commit '901b7b9b17d20dc8085fb5fd3bab0f0804f3906b':
  Add an option to hide the Voice Search icon.
2010-09-14 10:26:44 -07:00
Leon Scroggins III
901b7b9b17 am ca8f3d04: Merge "Add an option to hide the Voice Search icon." into froyo
Merge commit 'ca8f3d04284a26477257a0c2b34d83c86d15efe9' into gingerbread

* commit 'ca8f3d04284a26477257a0c2b34d83c86d15efe9':
  Add an option to hide the Voice Search icon.
2010-09-14 10:23:35 -07:00
Leon Scroggins III
ca8f3d0428 Merge "Add an option to hide the Voice Search icon." into froyo 2010-09-14 10:21:25 -07:00
Hung-ying Tyan
188a8f1b72 am 89a7180a: Merge "SipService: ignore connect event for non-active networks." into gingerbread
Merge commit '89a7180a242043a0b4d6695bf386c93365bf6797' into gingerbread-plus-aosp

* commit '89a7180a242043a0b4d6695bf386c93365bf6797':
  SipService: ignore connect event for non-active networks.
2010-09-14 10:00:14 -07:00
Hung-ying Tyan
89a7180a24 Merge "SipService: ignore connect event for non-active networks." into gingerbread 2010-09-14 09:57:47 -07:00