3436 Commits

Author SHA1 Message Date
Mathias Agopian
1bcb8b1afb Merge "surfaceflinger / GL extensions cleanup" into gingerbread 2010-09-16 17:55:05 -07:00
Jeff Brown
6f0ff46c6f am 9c258710: Merge "Fix app switch latency optimization." into gingerbread
Merge commit '9c2587104ae259b9fa6a3525063197cc08e8820b' into gingerbread-plus-aosp

* commit '9c2587104ae259b9fa6a3525063197cc08e8820b':
  Fix app switch latency optimization.
2010-09-16 17:15:48 -07:00
Jeff Brown
54a1825121 Fix app switch latency optimization.
This optimization was broken due to recent changes in how ANRs are handled.

Change-Id: Ic99248a12755fadac8d4893e7d305b773e038d3d
2010-09-16 16:41:46 -07:00
Hung-ying Tyan
f4fd88f8d8 am c7510581: SipService: add log control, suppress ping log.
Merge commit 'c7510581b81d63536db7d46ca8533106c8cf57c6' into gingerbread-plus-aosp

* commit 'c7510581b81d63536db7d46ca8533106c8cf57c6':
  SipService: add log control, suppress ping log.
2010-09-16 04:50:25 -07:00
Hung-ying Tyan
c7510581b8 SipService: add log control, suppress ping log.
Change-Id: I78332ddee1272be41b1fbc80c603e41200c6be1a
2010-09-16 19:45:20 +08:00
Chung-yih Wang
1e27dc978d am 0e063382: Fix the unhandled authentication message.
Merge commit '0e0633828928481658c0e09e5893f6214b57ba38' into gingerbread-plus-aosp

* commit '0e0633828928481658c0e09e5893f6214b57ba38':
  Fix the unhandled authentication message.
2010-09-15 23:32:34 -07:00
Chung-yih Wang
0e06338289 Fix the unhandled authentication message.
bug id: http://b/2991911

Change-Id: Iec86e3aee0fb12034ee25bc0e93fd575c1208a5f
2010-09-16 12:32:26 +08:00
Jeff Brown
7642c82c29 am f4d788c9: Merge "Make input dispatcher only ANR for foreground windows." into gingerbread
Merge commit 'f4d788c9309bc5480100d980608472e4cb04f309' into gingerbread-plus-aosp

* commit 'f4d788c9309bc5480100d980608472e4cb04f309':
  Make input dispatcher only ANR for foreground windows.
2010-09-15 18:57:48 -07:00
Jeff Brown
f4d788c930 Merge "Make input dispatcher only ANR for foreground windows." into gingerbread 2010-09-15 18:55:25 -07:00
Jeff Brown
519e024d1e Make input dispatcher only ANR for foreground windows.
Redesigned the input dispatcher's ANR timeout mechanism so it is much
closer to Froyo's policy.  ANR is only ever signalled if the dispatcher
is waiting on a window to finish processing its previous event(s) and
there is new pending input.

In the old code, we tracked the dispatch timeout separately for each
input channel.  This was somewhat complicated and also resulted in the
situation where applications could ANR long after the user had pushed
them into the background.

Change-Id: I666ecada0952d4b95f1d67b9f733842b745c7f4b
2010-09-15 18:52:08 -07:00
Robert Greenwalt
f434dd1660 am 134b28a7: Merge "Update Inet Connection Status display" into gingerbread
Merge commit '134b28a7f049719cb74fd5baadbbcc5915bc861b' into gingerbread-plus-aosp

* commit '134b28a7f049719cb74fd5baadbbcc5915bc861b':
  Update Inet Connection Status display
2010-09-15 18:02:59 -07:00
Robert Greenwalt
134b28a7f0 Merge "Update Inet Connection Status display" into gingerbread 2010-09-15 17:59:54 -07:00
Robert Greenwalt
1e9aac2bd8 Update Inet Connection Status display
Cellular signal strength should also be green - these assets aren't, but
the art guys are working on that.

Also using a new intent so we don't overload the CONNECTIVITY_ACTION and
confuse the apps.
bug:2994024

Change-Id: I6fe8f65dd6e9869d9724064c4fae45340491a4d8
2010-09-15 17:54:17 -07:00
Michael I. Gold
e20a56d929 surfaceflinger / GL extensions cleanup
Add correct enumerants for OES_EGL_image_external to glext.h.
SurfaceFlinger now checks for the correct extension name.

Change-Id: I2ba2728a01fa2260bd086d2df4316c68f694a9b1
2010-09-15 17:15:31 -07:00
Hung-ying Tyan
8a33e964c4 am 5306e0a8: Merge "SIP: add PEER_NOT_REACHABLE error feedback." into gingerbread
Merge commit '5306e0a85dabd4c18a7b3f81acc0f582f9429482' into gingerbread-plus-aosp

* commit '5306e0a85dabd4c18a7b3f81acc0f582f9429482':
  SIP: add PEER_NOT_REACHABLE error feedback.
2010-09-15 07:42:48 -07:00
Hung-ying Tyan
8d9e8de2c9 am 096df819: Merge "SipService: send SERVER_ERROR if server doesn\'t provide nonce" into gingerbread
Merge commit '096df8197b9133703d2ed0abb69813db0c8b4129' into gingerbread-plus-aosp

* commit '096df8197b9133703d2ed0abb69813db0c8b4129':
  SipService: send SERVER_ERROR if server doesn't provide nonce
2010-09-15 07:42:38 -07:00
Hung-ying Tyan
5306e0a85d Merge "SIP: add PEER_NOT_REACHABLE error feedback." into gingerbread 2010-09-14 23:10:03 -07:00
Hung-ying Tyan
096df8197b Merge "SipService: send SERVER_ERROR if server doesn't provide nonce" into gingerbread 2010-09-14 23:09:26 -07:00
Hung-ying Tyan
ae076d3981 SIP: add PEER_NOT_REACHABLE error feedback.
http://b/issue?id=3002033

Change-Id: Ib64b08919d214acbab89945ac19dc113a68e62ad
2010-09-15 11:30:45 +08:00
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
Steve Howard
0de8ddb0cf Fix name shadowing bug with revoking URI permissions.
Change-Id: Ibfcb0dc73c6b1a111dbb8d56e6f0b78084f5e4e6
2010-09-14 16:29:26 -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
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
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
Hung-ying Tyan
88203cb111 SipService: send SERVER_ERROR if server doesn't provide nonce
in authentication response.

Change-Id: I93e8c0d6754399ca2f382033085e40fc4c6ccb19
2010-09-15 03:00:19 +08: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
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
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
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
Hung-ying Tyan
12bec5ddf5 SipService: ignore connect event for non-active networks.
+ sanity check and remove redundant code.

Change-Id: I4d3e226851ad7fc4d88ddcd0a5c58f7e33b6c14a
2010-09-15 00:49:02 +08:00
Kenny Root
3ca2691446 am 30434415: Merge "Dedupe timestamp in PackageSettings" into gingerbread
Merge commit '3043441511e4483d24dc6f42e1ee7f7e9dc71be2' into gingerbread-plus-aosp

* commit '3043441511e4483d24dc6f42e1ee7f7e9dc71be2':
  Dedupe timestamp in PackageSettings
2010-09-14 09:46:40 -07:00
Hung-ying Tyan
3692af92ab am 99bf4e45: SIP: remove dependency on javax.sip
Merge commit '99bf4e45c4566172189735b34b368b76660ca57a' into gingerbread-plus-aosp

* commit '99bf4e45c4566172189735b34b368b76660ca57a':
  SIP: remove dependency on javax.sip
2010-09-14 09:43:54 -07:00
Chung-yih Wang
316e72cb05 am 5dde95b8: Merge "Fix the bug of authentication in an outgoing call." into gingerbread
Merge commit '5dde95b8fe0fea1a115a68f8acf826371da89da7' into gingerbread-plus-aosp

* commit '5dde95b8fe0fea1a115a68f8acf826371da89da7':
  Fix the bug of authentication in an outgoing call.
2010-09-14 09:43:46 -07:00
Hung-ying Tyan
ca83c25dec am 4565933f: Merge "SipService: deliver connectivity change to all sessions." into gingerbread
Merge commit '4565933f03a99750a333e97e95408c404984510f' into gingerbread-plus-aosp

* commit '4565933f03a99750a333e97e95408c404984510f':
  SipService: deliver connectivity change to all sessions.
2010-09-14 09:43:17 -07:00
Kenny Root
3043441511 Merge "Dedupe timestamp in PackageSettings" into gingerbread 2010-09-14 09:29:48 -07:00
Brad Fitzpatrick
50d66f9fcd Unify some duplicate StrictMode-enabling code.
Change-Id: Ifb92f35d9e245dbdb5e201597d8be702bce9e8b8
2010-09-14 08:22:30 -07:00
Hung-ying Tyan
99bf4e45c4 SIP: remove dependency on javax.sip
and change errorCodeString to errorCode in
SipRegistrationListener.onRegistrationFailed().

Change-Id: Id9618f5a4b0effaed04f8b0dc60347499d9e4501
2010-09-14 20:29:02 +08:00
Jeff Brown
4fe6c3e51b Replace epoll() with poll() and rename PollLoop to Looper.
As part of this change, consolidated and cleaned up the Looper API so
that there are fewer distinctions between the NDK and non-NDK declarations
(no need for two callback types, etc.).

Removed the dependence on specific constants from sys/poll.h such as
POLLIN.  Instead looper.h defines events like LOOPER_EVENT_INPUT for
the events that it supports.  That should help make any future
under-the-hood implementation changes easier.

Fixed a couple of compiler warnings along the way.

Change-Id: I449a7ec780bf061bdd325452f823673e2b39b6ae
2010-09-14 01:59:45 -07:00
Chung-yih Wang
7d137e40cd Fix the bug of authentication in an outgoing call.
Since we missed the check of another challenge header in the
proxy authentication response.

Change-Id: Ie5b9d22c6c55b4d65619d2194c88845e7dd59f15
2010-09-14 14:17:02 +08:00