54556 Commits

Author SHA1 Message Date
Mathias Agopian
4838151d18 Merge "sensorservice: be more robust when there are no sensor h/w" 2011-07-14 18:04:09 -07:00
Jamie Gennis
06b54d7184 Merge changes Id9aa1003,I8c154189
* changes:
  SurfaceTexture: make (dis)connect into an IPC
  SurfaceTexture: add support for new connect values
2011-07-14 17:54:27 -07:00
Jamie Gennis
9709687463 SurfaceTexture: make (dis)connect into an IPC
This change makes the ANativeWindow connect and disconnect calls result
in an IPC to the SurfaceTexture object.  This will allow us to prevent
multiple simultaneous connections from different processes.

Change-Id: Id9aa1003b1335b96ca6bd4a1f5a67aa433d42efb
2011-07-14 17:48:32 -07:00
Dianne Hackborn
b3a26f4d94 Merge "Move LoadAverageService to the SystemUI apk." 2011-07-14 17:23:28 -07:00
Jeff Brown
7770b90129 Merge "Minor code cleanups in vector." 2011-07-14 17:08:16 -07:00
Jeff Brown
50a3e42094 Merge "Replace Vector _grow/_shrink checks with assert." 2011-07-14 16:52:10 -07:00
James Dong
8a65e1fb57 Merge "Revert "Add some logging to track down where ANR happens during MediaPlayer._release()."" 2011-07-14 16:42:34 -07:00
Mathias Agopian
29c176f043 sensorservice: be more robust when there are no sensor h/w
Bug: 5030108
Change-Id: I45b85b3c492b9268cb0ae44d2e5fc8c708b6e66e
2011-07-14 16:39:46 -07:00
James Dong
2c17f05a81 Revert "Add some logging to track down where ANR happens during MediaPlayer._release()."
This reverts commit a5293d1ca4459293f4993ea39c09ea703a022844.

Conflicts:

	media/libstagefright/AwesomePlayer.cpp

Change-Id: I2a5960208a6780b9a44ab5cce0ffc0e2fb28f426
2011-07-14 16:22:47 -07:00
Chia-chi Yeh
649a1418d9 Merge "VPN: close the socket in protectVpn() to avoid leaking descriptors." 2011-07-14 16:22:21 -07:00
Chia-chi Yeh
5779c9c2d9 VPN: close the socket in protectVpn() to avoid leaking descriptors.
Change-Id: Idda0c2ea1770abc490566e894711bcb08f60b354
2011-07-14 16:19:19 -07:00
Dianne Hackborn
45ce864ef4 Move LoadAverageService to the SystemUI apk.
Change-Id: I442e264802d1e35cd7d27bae121ae75f932595b6
2011-07-14 16:10:16 -07:00
Adam Cohen
d4ee810dce Merge "Catching RemoteViews#apply() layout inflation exceptions in RemoteViewsAdapter" 2011-07-14 15:55:55 -07:00
Adam Cohen
b7ffea6972 Catching RemoteViews#apply() layout inflation exceptions in RemoteViewsAdapter
Change-Id: I8a481e106b27d145fda92aa0d747e4a8615a5fd0
2011-07-14 15:45:59 -07:00
Jim Miller
fbaa1ea13c Merge "Fix 5027468: prevent screen from turning back on while lockscreen in password mode." 2011-07-14 15:43:17 -07:00
Fabrice Di Meglio
2c41fa18bb Merge "Fix bug #5025936 TableLayout layout direction resolution is broken" 2011-07-14 15:31:03 -07:00
Chia-chi Yeh
eb2591f8f7 Merge "VPN: Hook up the new control protocol and network state." 2011-07-14 15:22:59 -07:00
Chia-chi Yeh
97a61565ea VPN: Hook up the new control protocol and network state.
1. No more End-Of-Arguments.
2. Daemons close the control socket after they are initialized.
3. No more system properties.
4. ip-up-vpn now creates state to pass the configuration.
5. JNI methods are split again for legacy VPN.

Change-Id: I02fafdf01d425c965345ef712b2bd5fdee3a0cab
2011-07-14 15:07:42 -07:00
Jim Miller
dcb9376913 Fix 5027468: prevent screen from turning back on while lockscreen in password mode.
This fixes a bug where LockScreen would turn back on due to the sequence of events
that ultimately cause PasswordUnlockScreen.onResume() to be called when the device powers off.

This is required because the lockscreen rebuilds itself before the screen turns off
so that it's ready to show immediately when the device comes back on.

Change-Id: I86a61cc3b1d77cf7f2a9a198051ea2bbe90607b2
2011-07-14 15:04:42 -07:00
Jamie Gennis
a775f0d419 SurfaceTexture: add support for new connect values
This change adds support to SurfaceTextureClient for the new enum values
that can be passed to the ANativeWindow connect call.

Change-Id: I8c15418909e43a15673a9b22a5eb40df6923b273
2011-07-14 15:03:33 -07:00
Justin Ho
c843fdd7da Merge "Initial pass at some preload drawables Bug: 5020126" 2011-07-14 14:54:01 -07:00
Chia-chi Yeh
f483009573 Merge "ip-up-vpn: Create proper states for pppd and racoon." 2011-07-14 14:53:58 -07:00
Chia-chi Yeh
1591aa0045 ip-up-vpn: Create proper states for pppd and racoon.
VPN no longer uses system properties to pass parameters.

Change-Id: I13e4339ababb08552c4276c675c21176774da66c
2011-07-14 14:47:48 -07:00
Justin Ho
7fa1e191f6 Initial pass at some preload drawables
Bug: 5020126

Change-Id: I3c51e89774197caf50351ee55eb6922c9cdd32d5
2011-07-14 14:12:37 -07:00
John Wang
5f81f1bcd9 am 74c425d3: am 54b2a326: Merge "Show SIM blocked after 10 time puk wrong entries." into honeycomb-LTE
* commit '74c425d3e95ed0f47b1a5d447007886d01d7ff56':
  Show SIM blocked after 10 time puk wrong entries.
2011-07-14 14:03:11 -07:00
John Wang
74c425d3e9 am 54b2a326: Merge "Show SIM blocked after 10 time puk wrong entries." into honeycomb-LTE
* commit '54b2a3262738cdb3d0df747d8719e9a3cac33dfc':
  Show SIM blocked after 10 time puk wrong entries.
2011-07-14 14:00:58 -07:00
John Wang
54b2a32627 Merge "Show SIM blocked after 10 time puk wrong entries." into honeycomb-LTE 2011-07-14 13:59:10 -07:00
Eino-Ville Talvala
901e022c0c Merge "NEW_API: Add auto-exposure and auto-white balance locking to the Camera." 2011-07-14 13:38:55 -07:00
Elliott Hughes
49062e3b4c Merge "Fix aidl to cope with multiple collection types per method." 2011-07-14 13:28:00 -07:00
Andreas Huber
c1df573aed Merge "If audio startup fails while executing MediaPlayer::start() do NOT post an error" 2011-07-14 13:22:45 -07:00
Andreas Huber
232d5f2aa2 If audio startup fails while executing MediaPlayer::start() do NOT post an error
notification, the error returned by MediaPlayer::start() will suffice.

Change-Id: I49bd8d42078f039e5e6d8d4fed4f7f55dc5ff82a
related-to-bug: 5020200
2011-07-14 13:02:47 -07:00
Romain Guy
8cfe3d2d95 Merge "Force bitmaps to load in ARGB8888 by default. Bug #5024993" 2011-07-14 12:45:23 -07:00
Romain Guy
99b7b7a7f8 Force bitmaps to load in ARGB8888 by default.
Bug #5024993

Change-Id: Id0c63f675ae188e5a786b7fdd63916e114b9ed4a
2011-07-14 12:42:19 -07:00
Wink Saville
c9822c5aea Fix build.
Changes in ConnectivityService in hc-LTE when merged with changes
happening in Master caused the build to break.

Change-Id: I92a0b782ae58e9789b1e950c94ef966234fa94af
2011-07-14 12:23:28 -07:00
John Wang
98c3fcc7af Show SIM blocked after 10 time puk wrong entries.
After user enters 10 time wrong puk in puk unlock screen,
device need show the SIM permanently disabled message
is in lock screen.

bug:4905509
Change-Id: I06242834972b3f403cfe99a2edd8bae47d7ed474
2011-07-14 11:46:24 -07:00
Philip Milne
d44264a5ee Merge "Rationalize API after adding maximum size feature." 2011-07-14 11:32:09 -07:00
Narayan Kamath
d1435e998b Merge "Minor documentation updates for the AudioTrack class." 2011-07-14 11:13:07 -07:00
Glenn Kasten
007e62172f Merge "Add MEDIA_UID" 2011-07-14 10:59:40 -07:00
Wink Saville
76326a9d7d am 3810361e: am 6d1d16c3: Merge "Remove STOPSHIP but allow seamless Handoff when possible." into honeycomb-LTE
* commit '3810361e4a3e93d3c8a10aaeec54f65dfcc2d03d':
  Remove STOPSHIP but allow seamless Handoff when possible.
2011-07-14 10:55:58 -07:00
Jaikumar Ganesh
8c1703015e am 6dd45316: (-s ours) resolved conflicts for merge of ab3ec176 to honeycomb-plus-aosp
* commit '6dd4531639157191e6224d3f8af5c9d099ca945f':
  Bluetooth: correcting return value from cancelDiscovery
2011-07-14 10:55:55 -07:00
John Wang
726492eae9 am 28d92afc: am 2ac78a2d: Merge "Add getImei() to Phone interface." into honeycomb-LTE
* commit '28d92afc0a17cbf9149a0c8be9c8795d6f3306a5':
  Add getImei() to Phone interface.
2011-07-14 10:49:38 -07:00
Dianne Hackborn
cadaa3a983 Merge "Improve handling of low memory." 2011-07-14 10:48:01 -07:00
Adam Powell
c29f4e52c3 Nicer API for disabling/enabling the home/up button in action bars.
Have an explicit call for enabling the home/up button. Auto-enable it
if the app targets < ICS to preserve Honeycomb behavior. Auto-enable
it if the app shows home as up.

This prevents unwanted touch/focus feedback on the home button when
the app hasn't wired it up to do anything useful.

Change-Id: Icfe95ab5a11b3998bca08b0fbbfe1bf6c3c89b5d
2011-07-14 10:42:36 -07:00
Dianne Hackborn
ce86ba86df Improve handling of low memory.
Now classify background processes into a set of bins of how much
memory they should try to clear.  The last bin also involves
destroying all activities in that process.

Removed the old code for the simulator that is no longer needed
(yay).  The debugging features it had are now integrated into the
regular oom adj code.

Small fixes to load average service.

Change-Id: Ic8df401714b188c73b50dbc8f8e6345b58f1f3a0
2011-07-14 10:39:39 -07:00
Narayan Kamath
88bde0ce37 Minor documentation updates for the AudioTrack class.
Change-Id: I0c3c220aa433d1917d997a7b1bfa54e61acc26b2
2011-07-14 18:10:47 +01:00
Jaikumar Ganesh
b85f49e2a4 Merge "Remove Car audio class from auto pairing." 2011-07-14 10:08:41 -07:00
Eino-Ville Talvala
83d3352cf7 NEW_API: Add auto-exposure and auto-white balance locking to the Camera.
Unhides the Camera API calls for using the auto-exposure and
auto-white balance locks. Adds documentation about the interaction
between auto-focus and the AE and AWB locks.

Change-Id: I5bf73b9dce1c93e11a17f9d3efb82db1261524c5
2011-07-14 10:05:04 -07:00
James Dong
ad07457ece Merge "Support profile and level query for SW video decoders" 2011-07-14 09:59:24 -07:00
Jeff Hamilton
840a02c3da Merge "unhide public apis" 2011-07-14 09:53:08 -07:00
Jaikumar Ganesh
31d6e440f9 Remove Car audio class from auto pairing.
Majority of the cars don't auto pair unlike headsets, as they have a display.
Instead of maintaining a blacklist of such cars, disable
auto pairing with 0000. This is legacy anyway as newer cars
come with 2.1 pairing.

Change-Id: I644e2da4d11cf2d250d846853523d7975ca000fc
2011-07-14 09:26:02 -07:00