Commit Graph

30532 Commits

Author SHA1 Message Date
John Wang
c03ea416ca am d8f62ec4: am a48dc39b: Add hangupForegroundResumeBackground().
Merge commit 'd8f62ec44706153490bf63cddeac7d9c76e9e742'

* commit 'd8f62ec44706153490bf63cddeac7d9c76e9e742':
  Add hangupForegroundResumeBackground().
2010-09-08 16:00:11 -07:00
John Wang
d8f62ec447 am a48dc39b: Add hangupForegroundResumeBackground().
Merge commit 'a48dc39bd55c5ddcd991e08f791fd18d94a0db12' into gingerbread-plus-aosp

* commit 'a48dc39bd55c5ddcd991e08f791fd18d94a0db12':
  Add hangupForegroundResumeBackground().
2010-09-08 15:56:41 -07: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
John Wang
a48dc39bd5 Add hangupForegroundResumeBackground().
To fix bug 2968310.

Handle the operation of hangupForegroundResumeBackground while foreground call and background call come from different phones.

Change-Id: Id83ca1b75031a8391c95c7f8b2be40e9067dd4cd
2010-09-08 15:50:57 -07:00
Gilles Debunne
fd1a8945be am de5cfcb6: am d9c80ab3: Merge "Fix for a memory leak in TextKeyListener." into gingerbread
Merge commit 'de5cfcb608f3432d98ae17e0febb6e726df79e90'

* commit 'de5cfcb608f3432d98ae17e0febb6e726df79e90':
  Fix for a memory leak in TextKeyListener.
2010-09-08 15:50:50 -07:00
Robert Greenwalt
fa01889064 Merge "Some cleanup of Proxy class." 2010-09-08 15:35:40 -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
Romain Guy
53e7ae9065 Merge "Fix possible infinite loop when purging textures." 2010-09-08 15:16:13 -07:00
Romain Guy
9aaa8269a3 Fix possible infinite loop when purging textures.
Change-Id: Ib05b398ae03e734da2dab0496df416fed4570b1c
2010-09-08 15:15:43 -07:00
Gilles Debunne
de5cfcb608 am d9c80ab3: Merge "Fix for a memory leak in TextKeyListener." into gingerbread
Merge commit 'd9c80ab31ac3755141765e2c030bd1404ff0b050' into gingerbread-plus-aosp

* commit 'd9c80ab31ac3755141765e2c030bd1404ff0b050':
  Fix for a memory leak in TextKeyListener.
2010-09-08 15:02:20 -07:00
Gilles Debunne
d9c80ab31a Merge "Fix for a memory leak in TextKeyListener." into gingerbread 2010-09-08 14:58:23 -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
Joe Onorato
de6386b8a6 Merge "move recent apps around, attempting to make it not crash." 2010-09-08 14:30:05 -07:00
Joe Onorato
013cfc1116 move recent apps around, attempting to make it not crash.
I think the problem is some kind of Context mismatch because the resource was in the framework but
referencing an app class.

Change-Id: Ia6b37c9c8be5dddc836331859e779cd80dd32596
2010-09-08 17:27:41 -04: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
d5948d23a6 am 6bb72458: (-s ours) am de2f3340: Update current.xml for touch filtering feature.
Merge commit '6bb72458f934f00fdfee75323a7919a9f10eba03'

* commit '6bb72458f934f00fdfee75323a7919a9f10eba03':
  Update current.xml for touch filtering feature.
2010-09-08 14:03:10 -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
6bb72458f9 am de2f3340: Update current.xml for touch filtering feature.
Merge commit 'de2f3340d64e20e51029ff438f0d635d97b8a3e0' into gingerbread-plus-aosp

* commit 'de2f3340d64e20e51029ff438f0d635d97b8a3e0':
  Update current.xml for touch filtering feature.
2010-09-08 12:29:49 -07:00
Jeff Brown
b21fb104cc Fix key repeat delay.
Change-Id: I6216e082324ee29bf50e37acc673350ca5417c4d
2010-09-08 12:28:43 -07:00
Jeff Brown
de2f3340d6 Update current.xml for touch filtering feature.
Change-Id: I4a6f971ad84e13ed8f81e7b00c727e94eb2d8765
2010-09-08 12:25:23 -07:00
Joe Onorato
35dc79da11 update clean spec
Change-Id: Ia511131fb55916690a3d459c7ab1e7b7ddb26c4b
2010-09-08 15:24:49 -04:00
Joe Onorato
414e7f761e Merge "Fix build due to stubs errors on filename changes" 2010-09-08 12:11:55 -07:00
Chet Haase
c639dc9e0d Fix build due to stubs errors on filename changes
Change-Id: I0802fa49d496046640ec7f656179382fd4d9e234
2010-09-08 12:09:39 -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
Jack Veenstra
f6aea42aff Merge "Add support for giving arrays of ints and longs to the "am" command." 2010-09-08 11:44:05 -07:00
Jack Veenstra
2d1b7a2239 Add support for giving arrays of ints and longs to the "am" command.
Change-Id: Ibc4ae63fb5f8025a847bec7d37a1fce5abd81b39
2010-09-08 11:42:33 -07:00
Gilles Debunne
d35180cf52 Fix for a memory leak in TextKeyListener.
Open source contribution https://review.source.android.com/#change,16985

Change-Id: Iebf09e147dd26575ca1a3f02180a678583671a68
2010-09-08 11:26:55 -07:00
Jean-Baptiste Queru
cf67abbc48 am 6ffee9bb: Merge "Revert "resolve conflicts"" into gingerbread-plus-aosp
Merge commit '6ffee9bbba53700d33456261b986ac8a3f333b9e'

* commit '6ffee9bbba53700d33456261b986ac8a3f333b9e':
  Revert "resolve conflicts"
2010-09-08 11:07:30 -07:00
Erik
d41b037c6b am c4f628a1: am c0b4f6d3: Merge "Adds a time zone parameter to formatDateRange" into gingerbread
Merge commit 'c4f628a1ba359926cf53ed7652d9abba6ea29123'

* commit 'c4f628a1ba359926cf53ed7652d9abba6ea29123':
  Adds a time zone parameter to formatDateRange
2010-09-08 11:04:41 -07:00
Jean-Baptiste Queru
6ffee9bbba Merge "Revert "resolve conflicts"" into gingerbread-plus-aosp 2010-09-08 11:03:22 -07:00
Jean-Baptiste Queru
2cc595af65 Revert "resolve conflicts"
This reverts commit 84f992a249.
2010-09-08 11:01:40 -07:00
Erik
c4f628a1ba am c0b4f6d3: Merge "Adds a time zone parameter to formatDateRange" into gingerbread
Merge commit 'c0b4f6d30d962d75125628317b5f5ea622531dfe' into gingerbread-plus-aosp

* commit 'c0b4f6d30d962d75125628317b5f5ea622531dfe':
  Adds a time zone parameter to formatDateRange
2010-09-08 11:01:27 -07:00
Erik
c0b4f6d30d Merge "Adds a time zone parameter to formatDateRange" into gingerbread 2010-09-08 10:58:12 -07:00
Erik
577ec9eb3a Adds a time zone parameter to formatDateRange
For a critical feature request in Calendar we need the ability
to format a date range in a time zone other than the local tz.
This adds a new method signature to formatDateRange to allow for
a tz to be specified and maintains the old behavior if the parameter
is not used. Also deprecates the FORMAT_UTC flag.

Change-Id: I16b3e939760ec86c954b51a318d01b7bbf86acc9
2010-09-08 10:53:40 -07:00
Mike Lockwood
33788f9fb5 Merge changes Ib18b93bf,I4c86d7e3
* changes:
  MTP: Allow transfering arbitrary file types.
  Rename the media database's "objects" table to "files"
2010-09-08 10:52:44 -07:00
Mike Lockwood
e521169ff5 MTP: Allow transfering arbitrary file types.
Change-Id: Ib18b93bff4f9993d95b26ca200fe6169b71453ac
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-08 13:50:45 -04:00
Gilles Debunne
ad3183509c am d4fd86d1: (-s ours) am 468394fc: Text Selection: smart word detection. DO NOT MERGE.
Merge commit 'd4fd86d19a070a355255b51742075fbf8e69fa4a'

* commit 'd4fd86d19a070a355255b51742075fbf8e69fa4a':
  Text Selection: smart word detection. DO NOT MERGE.
2010-09-08 10:38:45 -07:00
Elliott Hughes
cfa5903926 am 664c48e9: am 4c7d3f28: Merge "Remove dead code: NIOBuffer." into gingerbread
Merge commit '664c48e991a70d07646d54125e97f579f3a33be4'

* commit '664c48e991a70d07646d54125e97f579f3a33be4':
  Remove dead code: NIOBuffer.
2010-09-08 10:38:41 -07:00
Chung-yih Wang
7e0598d066 am 4f24aed2: am 66907078: Merge "Fix the dialing from contact for internet address." into gingerbread
Merge commit '4f24aed2a13d9ba89e2402894353176e19571e6e'

* commit '4f24aed2a13d9ba89e2402894353176e19571e6e':
  Fix the dialing from contact for internet address.
2010-09-08 10:38:35 -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