3601 Commits

Author SHA1 Message Date
Rich Cannings
d14f0dfd58 am 73698457: am 6bff8c79: Merge "Remove the use of FileInputStream.available()" into gingerbread
Merge commit '736984573a1975d69d1c6efd87e4af9ca16e505f'

* commit '736984573a1975d69d1c6efd87e4af9ca16e505f':
  Remove the use of FileInputStream.available()
2010-09-09 16:51:53 -07:00
Rich Cannings
736984573a am 6bff8c79: Merge "Remove the use of FileInputStream.available()" into gingerbread
Merge commit '6bff8c7994f35c5b8021f1f3da43f70739f472e0' into gingerbread-plus-aosp

* commit '6bff8c7994f35c5b8021f1f3da43f70739f472e0':
  Remove the use of FileInputStream.available()
2010-09-09 16:45:34 -07:00
Wu-cheng Li
477e49a3dd Merge "Only enable CAMERA_MSG_PREVIEW_FRAME when necessary." 2010-09-09 16:31:13 -07:00
Rich Cannings
8d578836dc Remove the use of FileInputStream.available()
Bug: 2976294
Change-Id: I34b13cedbf1d2338163ef74454817c318a3a24f5
2010-09-09 16:28:48 -07:00
Wu-cheng Li
d02c812a21 Only enable CAMERA_MSG_PREVIEW_FRAME when necessary.
Now camera driver uses ANativeWindow for display.
CameraService should not request preview callback from
camera hardware if applications have not requested it.

bug:2951018
Change-Id: I85f74ea4a61104feca018867bc9d6dfe3a9479f5
2010-09-09 16:23:35 -07:00
Mike Lockwood
dc936251c4 am 91cf049f: am 76e4fa19: Merge "Only pulse notification light if a new notification has been received since the screen was last turned off" into gingerbread
Merge commit '91cf049f34b4f3d53d39e868104f11156a332b65'

* commit '91cf049f34b4f3d53d39e868104f11156a332b65':
  Only pulse notification light if a new notification has been received since the screen was last turned off
2010-09-09 16:10:00 -07:00
Mike Lockwood
91cf049f34 am 76e4fa19: Merge "Only pulse notification light if a new notification has been received since the screen was last turned off" into gingerbread
Merge commit '76e4fa19264793e3ed7e2ee7afccfc808a1a7458' into gingerbread-plus-aosp

* commit '76e4fa19264793e3ed7e2ee7afccfc808a1a7458':
  Only pulse notification light if a new notification has been received since the screen was last turned off
2010-09-09 16:05:38 -07:00
Robert Greenwalt
057d5e9824 Fix the build
broken merge resolution.

Change-Id: Idf1abef1ef79ddc43b9eaba1e0e523085702e2fe
2010-09-09 14:05:10 -07:00
Mike Lockwood
76e4fa1926 Merge "Only pulse notification light if a new notification has been received since the screen was last turned off" into gingerbread 2010-09-09 14:02:19 -07:00
Robert Greenwalt
29c1ac170e Merge "resolved conflicts for merge of ec52c98d to master" 2010-09-09 13:37:42 -07:00
Robert Greenwalt
ca4306c976 resolved conflicts for merge of ec52c98d to master
Change-Id: I31297232c9d918a967b93c3ae977f81b6a94f2ed
2010-09-09 13:15:32 -07:00
Erik Gilling
980b38d2f5 Merge "surfaceflinger: give hwcomposer a chance to release buffers" 2010-09-09 13:01:27 -07:00
Erik Gilling
4b95ea0153 Merge "surfaceflinger: composite HWC_SKIP_LAYER layers" 2010-09-09 13:01:23 -07:00
Erik Gilling
1d3fc50ac0 Merge "surfaceflinger: unlock clients only after flip" 2010-09-09 13:01:18 -07:00
Antti Hatala
11042a41c1 surfaceflinger: give hwcomposer a chance to release buffers
Change-Id: I605fa779702022865dd58df3b36f37c2644ade36
2010-09-09 12:06:48 -07:00
Antti Hatala
982f58bdcc surfaceflinger: composite HWC_SKIP_LAYER layers
Change-Id: I363ede63287ae903d66d0d419343f4ecd81bcc00
2010-09-09 12:06:31 -07:00
Antti Hatala
4c0a4a2b74 surfaceflinger: unlock clients only after flip
Change-Id: I039291a36f05bbaa02b29325d4012114abd784b9
2010-09-09 12:06:18 -07:00
Robert Greenwalt
ec52c98d44 am 0727a865: Merge "Add network condition reporting." into gingerbread
Merge commit '0727a865d83b944c2fecc0bf1228a36976fe5300' into gingerbread-plus-aosp

* commit '0727a865d83b944c2fecc0bf1228a36976fe5300':
  Add network condition reporting.
2010-09-09 09:49:15 -07:00
Robert Greenwalt
0727a865d8 Merge "Add network condition reporting." into gingerbread 2010-09-09 09:41:05 -07:00
Robert Greenwalt
d7085fcf65 Add network condition reporting.
Apps can report if they like their connection to the nets
and we display either not-really-connected or fully-connected
icons.  Final icons TBD.

bug:2978624
Change-Id: I28be52085edfe54571c0d4559aba0df883548654
2010-09-09 09:33:02 -07:00
Mike Lockwood
2117f6fa38 Only pulse notification light if a new notification has been received since the screen was last turned off
BUG: 2980248

Change-Id: I4dca527a191fae4ad87eeff8ad32594fd6aeb417
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-09 09:48:08 -04:00
Chung-yih Wang
98093a9418 am b2118252: am 4d1e0121: Change the keep-alive interval to 10 seconds.
Merge commit 'b2118252545f4b3ab43ffb2cda4b956f8f85ff69'

* commit 'b2118252545f4b3ab43ffb2cda4b956f8f85ff69':
  Change the keep-alive interval to 10 seconds.
2010-09-08 22:47:30 -07:00
Chung-yih Wang
b211825254 am 4d1e0121: Change the keep-alive interval to 10 seconds.
Merge commit '4d1e0121277b566b5e1c22e790a3b607b75d945d' into gingerbread-plus-aosp

* commit '4d1e0121277b566b5e1c22e790a3b607b75d945d':
  Change the keep-alive interval to 10 seconds.
2010-09-08 22:42:52 -07:00
Chung-yih Wang
4d1e012127 Change the keep-alive interval to 10 seconds.
Change-Id: I216cee622f57ee18533de3960d4da1a41e01f1ae
2010-09-09 13:27:10 +08:00
Brad Fitzpatrick
debd36f7c9 am f2bf6d6e: am 65634a79: Merge "Don\'t block in the BackupManagerService.dataChanged() Binder call." into gingerbread
Merge commit 'f2bf6d6e705b655a546a9e6435e6acef3a82cda3'

* commit 'f2bf6d6e705b655a546a9e6435e6acef3a82cda3':
  Don't block in the BackupManagerService.dataChanged() Binder call.
2010-09-08 15:51:41 -07:00
Brad Fitzpatrick
f2bf6d6e70 am 65634a79: Merge "Don\'t block in the BackupManagerService.dataChanged() Binder call." into gingerbread
Merge commit '65634a7935ed6f173179e7ac91a05288693b2bbf' into gingerbread-plus-aosp

* commit '65634a7935ed6f173179e7ac91a05288693b2bbf':
  Don't block in the BackupManagerService.dataChanged() Binder call.
2010-09-08 15:26:57 -07:00
Brad Fitzpatrick
65634a7935 Merge "Don't block in the BackupManagerService.dataChanged() Binder call." into gingerbread 2010-09-08 15:20:20 -07:00
Dianne Hackborn
467e8e1332 am 5fdacb8a: am ee455f5a: Merge "People holding partial wake locks now get blamed for CPU usage." into gingerbread
Merge commit '5fdacb8a2818136218afdea4308ad1b10049a201'

* commit '5fdacb8a2818136218afdea4308ad1b10049a201':
  People holding partial wake locks now get blamed for CPU usage.
2010-09-08 14:38:20 -07:00
Jake Hamby
94bf9431e5 am e7578344: am 5872e9d7: Merge "Allow incoming SMS until internal storage is almost full." into gingerbread
Merge commit 'e75783440a55fb0a5ef75066be94a11898f652f0'

* commit 'e75783440a55fb0a5ef75066be94a11898f652f0':
  Allow incoming SMS until internal storage is almost full.
2010-09-08 14:38:15 -07:00
Jeff Brown
3dfc5721ad am 8723bb58: am b21fb104: Fix key repeat delay.
Merge commit '8723bb58b17a07b7ca036cc76d737c6c0f4b13c7'

* commit '8723bb58b17a07b7ca036cc76d737c6c0f4b13c7':
  Fix key repeat delay.
2010-09-08 14:38:09 -07:00
Dianne Hackborn
5fdacb8a28 am ee455f5a: Merge "People holding partial wake locks now get blamed for CPU usage." into gingerbread
Merge commit 'ee455f5a9572bc0d23c3328f6c22da91dc109a50' into gingerbread-plus-aosp

* commit 'ee455f5a9572bc0d23c3328f6c22da91dc109a50':
  People holding partial wake locks now get blamed for CPU usage.
2010-09-08 14:34:41 -07:00
Jake Hamby
e75783440a am 5872e9d7: Merge "Allow incoming SMS until internal storage is almost full." into gingerbread
Merge commit '5872e9d7f31e5a4c5f3d871dba02b6d72a7ada78' into gingerbread-plus-aosp

* commit '5872e9d7f31e5a4c5f3d871dba02b6d72a7ada78':
  Allow incoming SMS until internal storage is almost full.
2010-09-08 14:34:31 -07:00
Jeff Brown
8723bb58b1 am b21fb104: Fix key repeat delay.
Merge commit 'b21fb104cc95fe7e5daf3b3626241e525c39a3f1' into gingerbread-plus-aosp

* commit 'b21fb104cc95fe7e5daf3b3626241e525c39a3f1':
  Fix key repeat delay.
2010-09-08 14:34:26 -07:00
Dianne Hackborn
ee455f5a95 Merge "People holding partial wake locks now get blamed for CPU usage." into gingerbread 2010-09-08 14:15:35 -07:00
Jeff Brown
b380c4d7ed resolved conflicts for merge of a05088c1 to master
Change-Id: I7973f9f28586dec9b9659f8f662f40db7997a521
2010-09-08 13:02:55 -07:00
Jake Hamby
5872e9d7f3 Merge "Allow incoming SMS until internal storage is almost full." into gingerbread 2010-09-08 12:49:27 -07:00
Dianne Hackborn
0d903a84d0 People holding partial wake locks now get blamed for CPU usage.
For the duration of the wake lock, 50% of all CPU usage is now
accounted against the app(s) holding partial wake locks, evenly
distributed between them.  This is only while the device is on
battery and screen off.

Change-Id: I3e5c978b792b6ef17bf8540705bfe8343dadd464
2010-09-08 12:41:24 -07:00
Jake Hamby
bb37163323 Allow incoming SMS until internal storage is almost full.
Fix for bug 2382830: new incoming SMS should not be rejected when
running low on internal phone storage.

Testing revealed that the /data partition should have at least 256 KiB
available in order to prevent random app crashes (including system apps)
due to SQLite transaction failures. With 256 KiB free, the device should
safely boot without storage full errors. This takes into account the
36-40 KiB that the YAFFS2 filesystem reports as available even after
the partition has been completely filled. I've set the default full
threshold to 1 MiB to provide a generous safety margin.

For this bug, I changed the DeviceStorageMonitorService demon to send
two new hidden notifications for device storage "full" and "not full",
when the free space falls below the full threshold (default 1 MiB,
but configurable as a system setting), in addition to the existing
storage low/okay notifications sent when the storage crosses the threshold
of 90% full (also configurable).

The SMS code was changed to use these new notifications so that it can
accept messages until the data partition has been filled to the maximum
safe capacity rather than stopping when it hits 90% full. There should
be no negative impact on battery life because the additional check in
the storage polling service should be offset by an optimization to cache
the free threshold values which were previously being computed every time
through the loop.

While testing this change, I discovered that SMSDispatcher was being
instantiated twice, the first time in GSMPhone/CDMAPhone, and the second
time in SimSmsInterfaceManager / RuimSmsInterfaceManager. Changed the code
to pass the original SMSDispatcher to the Sim/RuimSmsInterfaceManager
constructor.

Change-Id: Ie0c6d05294778ab6ee42e0fa01313af96d824c77
2010-09-08 12:37:18 -07:00
Jeff Brown
b21fb104cc Fix key repeat delay.
Change-Id: I6216e082324ee29bf50e37acc673350ca5417c4d
2010-09-08 12:28:43 -07:00
Jeff Brown
a05088c18d am 85a31767: Add support for secure views.
Merge commit '85a3176704b5bfbeece9bd928369fbb76eec7dc6' into gingerbread-plus-aosp

* commit '85a3176704b5bfbeece9bd928369fbb76eec7dc6':
  Add support for secure views.
2010-09-08 11:55:24 -07:00
Jeff Brown
85a3176704 Add support for secure views.
Added the MotionEvent.FLAG_WINDOW_IS_OBSCURED flag which is set by the
input manager whenever another visible window is partly or wholly obscured
the target of a touch event so that applications can filter touches
accordingly.

Added a "filterTouchesWhenObscured" attribute to View which can be used to
enable filtering of touches when the view's window is obscured.

Change-Id: I936d9c85013fd2d77fb296a600528d30a29027d2
2010-09-08 11:50:55 -07:00
Chung-yih Wang
d48a709e3e am 576b492c: am 5de1d36d: Log outbound proxy address if exists for debugging.
Merge commit '576b492c15a079c9d3d818f3f7fadc4408c2908a'

* commit '576b492c15a079c9d3d818f3f7fadc4408c2908a':
  Log outbound proxy address if exists for debugging.
2010-09-08 10:35:11 -07:00
Chung-yih Wang
576b492c15 am 5de1d36d: Log outbound proxy address if exists for debugging.
Merge commit '5de1d36dd0415c4cf9afdf093a4915951ef6c770' into gingerbread-plus-aosp

* commit '5de1d36dd0415c4cf9afdf093a4915951ef6c770':
  Log outbound proxy address if exists for debugging.
2010-09-08 10:28:09 -07:00
Mike Lockwood
b8a8a578c2 Fix Intent.ACTION_REBOOT
Turns out this would be useful for automated testing.

Change-Id: Idd5e35a8d4a354447b17a77fe0b606f78df844d0
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-08 07:47:03 -04:00
Brad Fitzpatrick
3dd42334ee Don't block in the BackupManagerService.dataChanged() Binder call.
This unnecessarily blocks callers.

Bug: 2977348
Change-Id: I5267e575cdd5eb2136379f9710126b62a1bd75ad
2010-09-07 23:40:30 -07:00
Chung-yih Wang
5de1d36dd0 Log outbound proxy address if exists for debugging.
Change-Id: I2d2dffe3536e674b6956164c400e397c2f00f212
2010-09-08 13:15:55 +08:00
Hung-ying Tyan
3a47e9524a am b6432ca4: am 960b31e3: Merge "SipService: unset session listener if listener is gone." into gingerbread
Merge commit 'b6432ca4a090c02a07038f926e9e514d8cb1b657'

* commit 'b6432ca4a090c02a07038f926e9e514d8cb1b657':
  SipService: unset session listener if listener is gone.
2010-09-06 20:19:52 -07:00
Hung-ying Tyan
b6432ca4a0 am 960b31e3: Merge "SipService: unset session listener if listener is gone." into gingerbread
Merge commit '960b31e3b3b40f92665be4b7a79da7f05ea19751' into gingerbread-plus-aosp

* commit '960b31e3b3b40f92665be4b7a79da7f05ea19751':
  SipService: unset session listener if listener is gone.
2010-09-06 20:16:51 -07:00
Hung-ying Tyan
1b1601d740 SipService: unset session listener if listener is gone.
Change-Id: I0b85ee7bcb32c24cf64dfc3edc40c0cad9717562
2010-09-05 00:26:11 +08:00
Dianne Hackborn
004abb1223 resolved conflicts for merge of 3d7d3690 to master
Change-Id: I1d1d7a448b3ae8a86600addfa75f2448a98327bf
2010-09-03 14:07:25 -07:00