Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,911 Commits 3 Branches 0 Tags
4c19bf9833f59f58a9aaea566f0eb98a7fb7e2ea
Commit Graph

25911 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Huber
4c19bf9833 Work to support switching transport streams mid-stream and signalling discontinuities to the decoder. 
Change-Id: I7150e5e7342e1117c524856b204aadcb763e06ed
related-to-bug: 2368598
 2010-10-07 11:41:43 -07:00
Andreas Huber
02654f01bc Merge "On this particular device the hardware video decoder spits out buffers that don't actually contain our video data, so we cannot use them to restore the video frame after suspend/resume." into gingerbread 2010-10-07 10:57:32 -07:00
Kenny Root
e0c5ae7b55 Merge "Eliminate MCS_GIVE_UP state" into gingerbread 2010-10-07 10:54:14 -07:00
Kenny Root
480afe70fa Eliminate MCS_GIVE_UP state 
It's basically a duplicate of MCS_UNBIND state, so just get rid of it
which simplifies the state transitions.

Bug: 3067076
Change-Id: I34111be88dd727af8ad59c9f49debd54ede827ea
 2010-10-07 10:53:01 -07:00
Gilles Debunne
e86a6b2a4d Merge "Removed unused and broken screen_progress" into gingerbread 2010-10-07 10:52:11 -07:00
Brad Fitzpatrick
30f5c8fede More DropBoxManager javadoc love. 
Change-Id: I9b14f6905533e0af66bd64fc76352ed8fc365058
 2010-10-07 10:48:20 -07:00
Brad Fitzpatrick
fd124570ce Merge "DropBox.Entry javadoc syntax fix" into gingerbread 2010-10-07 10:20:32 -07:00
Kenny Root
0145e36cad Revert "Only allow 8 OBBs to be mounted by a UID" 
This reverts commit 27358a69b3.

Conflicts:

	services/java/com/android/server/MountService.java

Change-Id: Ia14be97b4f22e95daba0d191cfc62adf3d1469cd
 2010-10-07 10:14:09 -07:00
Brad Fitzpatrick
95173b14d6 DropBox.Entry javadoc syntax fix 
Change-Id: I32d055b39ca89ec9f6a7bf189263844424533b60
 2010-10-07 10:07:34 -07:00
John Wang
08fb5851bb Merge "Add flag to skip restoring network seletion." into gingerbread 2010-10-07 09:47:01 -07:00
John Wang
35c4c211e0 Add flag to skip restoring network seletion. 
For bug 3045366.

Change-Id: I7ad9ff89b0a77df473b638ad917b363c42de5405
 2010-10-07 09:44:19 -07:00
Andreas Huber
1e19416383 On this particular device the hardware video decoder spits out buffers that don't actually contain our video data, so we cannot use them to restore the video frame after suspend/resume. 
Change-Id: I1b8fe68c1766299844fe84ebbff49cb8b3e4cc7c
related-to-bug: 3070094
 2010-10-07 09:19:25 -07:00
Eric Rowe
f8d2acdc57 Merge "DO NOT MERGE Initialize bluetooth profiles in BT stress tests" into gingerbread 2010-10-07 09:06:30 -07:00
Eric Rowe
8bcc744e1b DO NOT MERGE Initialize bluetooth profiles in BT stress tests 
Change-Id: I0a8b75c8686d9d6969db51d618c1ddeacb2aba87
 2010-10-07 18:01:23 +02:00
Wink Saville
bbc80d3436 Merge "Changed handling of onQueryCompelete to not use mimeType." into gingerbread 2010-10-07 08:34:01 -07:00
Wink Saville
2e27a0be78 Changed handling of onQueryCompelete to not use mimeType. 
Using mimeType causes an IPC request to contacts which can
be slow. This can cause an ANR of the Phone app. This change
parses the URL and to decide which column to use for the person_id
and thus should not cause an ANR.

bug: 3060704
Change-Id: I750c72746c7269e162f0338c0a3e00230a600519
 2010-10-07 08:28:34 -07:00
Wu-cheng Li
29332971dd Merge "Add javadoc for display orientation." into gingerbread 2010-10-07 05:49:27 -07:00
Wu-cheng Li
c157e0cd16 Add javadoc for display orientation. 
Display orientation should be considered while setting preview size,
picture size, or thumbnail size.

bug:3051937
Change-Id: I3b6bd1b920e4752ffdfc8aec56a0da9d474dd630
 2010-10-07 19:41:23 +08:00
Hung-ying Tyan
62ec9834a0 Merge "Make SipService broadcast SIP_SERVICE_UP when it's up." into gingerbread 2010-10-06 23:11:09 -07:00
Adam Powell
fbb3b4768e Fix bug 3066313 - integrate new text anchor assets. 
This adds the differentiated left/right anchors for hdpi and further
tweaks the behavior of text anchors.

Highlights:
* New assets are translucent - increased visibility for whatever is
  beneath.
* Start and end anchors may not cross one another.
* Minimum selection size is now 1.
* Touch targeting tweaked.

Change-Id: I601361323916ee19149562a23dc3242d908da45c
 2010-10-06 21:46:28 -07:00
Gilles Debunne
8b1764fdc8 Removed unused and broken screen_progress 
Change-Id: I3b9557d1d4bdc55d6468c276efc77bde440755af
 2010-10-06 19:09:52 -07:00
Hung-ying Tyan
9db99a4dc1 Make SipService broadcast SIP_SERVICE_UP when it's up. 
http://b/issue?id=3062010

Change-Id: I13419fa3a8fdfba1977260f703e4dcaa42a6606c
 2010-10-07 09:15:25 +08:00
Dianne Hackborn
bfba7cab94 Fix issue #3001362: API REVIEW: android.view.InputQueue.Callback 
Change-Id: Ibc12a7326a13c318205774e226ed1f62a5cf11eb
 2010-10-06 17:58:05 -07:00
Eric Fischer
70f1a3b8a0 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-10-06 17:32:17 -07:00
Xavier Ducrohet
656d21656a Merge "Parser is optional in obtainStyledAttributes." into gingerbread 2010-10-06 17:32:10 -07:00
Hung-ying Tyan
16c29bd7f2 Merge "SIP: Fix busy authentication loop." into gingerbread 2010-10-06 17:29:28 -07:00
Dianne Hackborn
9d6824cd53 Merge "Make Activity.removeDialog() less strict." into gingerbread 2010-10-06 17:26:16 -07:00
Eric Fischer
3d1841c788 Import revised translations. DO NOT MERGE 
Change-Id: Id9a7d2da704ed4d37efa8646815835fc6a7c5473
 2010-10-06 17:11:06 -07:00
Dianne Hackborn
d2ce8bbb84 Make Activity.removeDialog() less strict. 
It was extremely annoying not being able to do this.

Change-Id: I9a13b4fdd984a5e9d8f9ac49c7ede218c4481c2b
 2010-10-06 17:09:47 -07:00
Kenny Root
5919ac6b41 OBB: track binder death observers 
An incorrect assumption about how death observers were tracked lead to
an IllegalArgumentException in some cases. Make sure the linking and
unlinking of the Binder to its ObbState death observer is symmetric to
avoid this problem.

Bug: 3062360
Change-Id: Idd016db12551c80cd74d00f11cf6569bd3b4ce21
 2010-10-06 17:00:00 -07:00
Kenny Root
a3ee5c0351 Merge "Add MountService tests and fix a bug it found" into gingerbread 2010-10-06 16:59:23 -07:00
Dianne Hackborn
ef083ec008 Merge "Work on issue #3062691: GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider" into gingerbread 2010-10-06 16:56:02 -07:00
Hung-ying Tyan
ee8a884f35 SIP: Fix busy authentication loop. 
Add a retry count and give up after two attempts.
Also stop auto registration when server is unreachable.
And rename onError() to restartLater() for better readability.

http://b/issue?id=3066573

Change-Id: Icfa65c58546a1e2bf8e59e29584a3926c53c479b
 2010-10-07 07:04:46 +08:00
Kenny Root
17eb6fb07c Add MountService tests and fix a bug it found 
Add some MountService tests that are based partially on some stuff done
in PackageManagerTests. This allows us to test the OBB changes in an
easy way.

Also, it found some bugs in the DefaultContainerService connection state
machine, so fix those while we're at it.

Change-Id: I18f38593be754eb32fb6e842f88eec47e2beefce
 2010-10-06 15:39:28 -07:00
Gilles Debunne
1ae32bfebf New assets for buttons and notification 
Change-Id: I95ffa7600476f97e3be3c577ef55855abeaeac5e
 2010-10-06 14:32:29 -07:00
Dianne Hackborn
043fcd9847 Work on issue #3062691: GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider 
Exposes an Intent I need (okay it fixes an unrelated thing in the power widget),
and fixes some dump output.

Change-Id: I51d6c93a6ac879bab64e9d5aa21129e2bbcd461b
 2010-10-06 14:27:34 -07:00
Dianne Hackborn
6d44456da8 Merge "Make USB mass storage hide keyguard when shown." into gingerbread 2010-10-06 11:19:51 -07:00
Chung-yih Wang
18c000896f Merge "Misc fixes for sim-eng build." into gingerbread 2010-10-06 01:50:25 -07:00
Chung-yih Wang
fb116fbea3 Misc fixes for sim-eng build. 
Change-Id: I0c5dac1097abc924e66dab92d7d03d5051b4fd29
 2010-10-06 16:46:59 +08:00
Fred Chung
b50d5ede6f am 30264c9b: Merge "Doc change: Adding new docs for Device Admin API." into froyo 
Merge commit '30264c9b85109ae58c1e472a747bf47464cc1632' into gingerbread

* commit '30264c9b85109ae58c1e472a747bf47464cc1632':
  Doc change: Adding new docs for Device Admin API.
 2010-10-05 23:39:23 -07:00
Fred Chung
30264c9b85 Merge "Doc change: Adding new docs for Device Admin API." into froyo 2010-10-05 23:26:41 -07:00
Dianne Hackborn
a2a0a98ac7 Merge "Fix NPE if there is no accelerometer." into gingerbread 2010-10-05 19:02:52 -07:00
Dianne Hackborn
4e6baf2473 Merge "Fix issue #3001368: API REVIEW: android.app.Activity" into gingerbread 2010-10-05 18:56:54 -07:00
Dianne Hackborn
b499bb1069 Fix NPE if there is no accelerometer. 
Change-Id: I983290a7fc3deda2a82b03ff564f1b7201cc3dd3
 2010-10-05 18:54:49 -07:00
Hung-ying Tyan
fc7e7766e7 Merge "CallManager/SipPhone: fix reject a ringing call" into gingerbread 2010-10-05 18:33:22 -07:00
Hung-ying Tyan
17956e626b CallManager/SipPhone: fix reject a ringing call 
+ CallManager: fix getFirstActiveRingingCall(), getActiveFgCall(), getFirstActiveBgCall()
+ Set DisconnectCause to be INCOMING_REJECTED when a call is rejected

http://b/issue?id=3049671

Change-Id: Ica1d81ca4b71ab0ceb2ab437b82bbb4ccf86fe92
 2010-10-06 09:31:44 +08:00
Gilles Debunne
671b2a57bb Merge "Fix for IndexOutOfBounds in text pasting." into gingerbread 2010-10-05 18:11:09 -07:00
Dianne Hackborn
3c4c2b7e6f Fix issue #3001368: API REVIEW: android.app.Activity 
Bye bye, lots of junk.

Change-Id: Idd72fc525851277362b2a1ff3bb0f7865fe655fd
 2010-10-05 18:07:54 -07:00
Gilles Debunne
330e263c4a Fix for IndexOutOfBounds in text pasting. 
Made paste safe even in case of replace problems due to filters.

Bug 3042016

Change-Id: I9be34fa41fa6117502bbd959f91c562f28fb4237
 2010-10-05 17:33:08 -07:00
Eric Laurent
37947afe90 Merge "Fixed AudioFlinger not always pausing tracks" into gingerbread 2010-10-05 17:06:16 -07:00