drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
48,799 Commits 1 Branch 0 Tags
Commit Graph

48799 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Cohen
592cb584b0 Merge "Fix crash in bug 4259574" 2011-04-07 17:12:19 -07:00
Daisuke Miyakawa
52b952669d Merge "Add params for primary account to ContactsContract" 2011-04-07 17:03:18 -07:00
Wink Saville
5f2cff408d am 5f66c953: am 7183a7a5: Merge "Add RIL_UNSOL_RIL_CONNECTED and pass radio technology + 2 to setupDataCall." into honeycomb-LTE 
* commit '5f66c953a7ebf5dd6dc2ce1c79f2c2ee324dd13b':
  Add RIL_UNSOL_RIL_CONNECTED and pass radio technology + 2 to setupDataCall.
 2011-04-07 16:53:34 -07:00
Wink Saville
5f66c953a7 am 7183a7a5: Merge "Add RIL_UNSOL_RIL_CONNECTED and pass radio technology + 2 to setupDataCall." into honeycomb-LTE 
* commit '7183a7a584397142ab7347d6f721011d743fb699':
  Add RIL_UNSOL_RIL_CONNECTED and pass radio technology + 2 to setupDataCall.
 2011-04-07 16:51:50 -07:00
Wink Saville
7183a7a584 Merge "Add RIL_UNSOL_RIL_CONNECTED and pass radio technology + 2 to setupDataCall." into honeycomb-LTE 2011-04-07 16:49:02 -07:00
Adam Cohen
fa2e3ff3d3 Fix crash in bug 4259574 
Change-Id: I7fb3a4485ecfc2ac19eebdcfdcfe26e97a08e6b5
 2011-04-07 16:48:19 -07:00
Robert Greenwalt
e352d5f630 Merge "Fix build." 2011-04-07 16:01:46 -07:00
Robert Greenwalt
af6eddb1c2 Fix build. 
Change-Id: I9ac1c28de4f3f11f84b04923d4547ab64dd57f23
 2011-04-07 15:44:10 -07:00
Bill Gruber
05deb91a1e am 60bfa4d0: am 216d9894: am 6bb8b0ec: am afecd1e9: IAB docs--status codes fix Bug: 4208641 
* commit '60bfa4d0f5d55eb474146330be7f5404521b1c67':
  IAB docs--status codes fix Bug: 4208641
 2011-04-07 15:20:16 -07:00
Bill Gruber
60bfa4d0f5 am 216d9894: am 6bb8b0ec: am afecd1e9: IAB docs--status codes fix Bug: 4208641 
* commit '216d98949ddeb84359836594ab00be158d69545e':
  IAB docs--status codes fix Bug: 4208641
 2011-04-07 15:17:26 -07:00
Bill Gruber
216d98949d am 6bb8b0ec: am afecd1e9: IAB docs--status codes fix Bug: 4208641 
* commit '6bb8b0ecb558373ba99e44ad5c351e1d7bb410d6':
  IAB docs--status codes fix Bug: 4208641
 2011-04-07 15:14:54 -07:00
Bill Gruber
6bb8b0ecb5 am afecd1e9: IAB docs--status codes fix Bug: 4208641 
* commit 'afecd1e99284dc386f07571c69edfed8c12f1cef':
  IAB docs--status codes fix Bug: 4208641
 2011-04-07 15:09:33 -07:00
Wink Saville
1dd2ada5cf Add RIL_UNSOL_RIL_CONNECTED and pass radio technology + 2 to setupDataCall. 
Added CommandsInterface.registerForRilConnected which allows components
to register for when the ril connects and provides the version of the
ril to the registrants or a -1 if the ril disconnects.

For ril version 6 RIL.setupDataCall needs to have RadioTechnology + 2
as the radioTechnology parameter when the rilVersion is >= 6.

DataConnection then uses registersForRilConnected to get the ril
version and provide the proper radioTechnology value to
RIL.setupDataCall

Change-Id: Iacba764b9e38a4a138d186ccf1625fea760cc56d
 2011-04-07 14:34:29 -07:00
Wink Saville
097786507b am de1b950d: am 9e7a5a1e: Merge "ConnectivityService needs to use the new names for the NetConfig vars." into honeycomb-LTE 
* commit 'de1b950d2b07737e3d284ed2ada361737d8a5a1a':
  ConnectivityService needs to use the new names for the NetConfig vars.
 2011-04-07 14:31:20 -07:00
Bill Gruber
afecd1e992 IAB docs--status codes fix 
Bug: 4208641

Change-Id: I91d4448b62950579081a7ec99f4a39237140d299
 2011-04-07 14:30:38 -07:00
Wink Saville
de1b950d2b am 9e7a5a1e: Merge "ConnectivityService needs to use the new names for the NetConfig vars." into honeycomb-LTE 
* commit '9e7a5a1e567a0e696d9a7b68fffd00b7408e6ac1':
  ConnectivityService needs to use the new names for the NetConfig vars.
 2011-04-07 14:29:17 -07:00
Wink Saville
9e7a5a1e56 Merge "ConnectivityService needs to use the new names for the NetConfig vars." into honeycomb-LTE 2011-04-07 14:28:06 -07:00
Teng-Hui Zhu
825e28c6c5 am 4e790ee1: (-s ours) am 29fa50be: am bb55777b: Merge changes Ia44d880a,Ifbf63b24 into honeycomb-mr1 
* commit '4e790ee1894118a1ab2032d09e5016fa9414dae7':
  DO NOT MERGE : cherry pick of change Ieb7ae26b from master
  DO NOT MERGE : cherry pick of change I0f9f2c65 from master
 2011-04-07 14:27:03 -07:00
Teng-Hui Zhu
4e790ee189 am 29fa50be: am bb55777b: Merge changes Ia44d880a,Ifbf63b24 into honeycomb-mr1 
* commit '29fa50be2484ed9d7a5e8075b764caa37b6494b9':
  DO NOT MERGE : cherry pick of change Ieb7ae26b from master
  DO NOT MERGE : cherry pick of change I0f9f2c65 from master
 2011-04-07 14:24:22 -07:00
Xavier Ducrohet
9c461c6ea5 am 65ef6e86: (-s ours) am 96ac8560: am 515a08b0: Merge 59aad78e from master. do not merge. 
* commit '65ef6e8690cc13e9e20582fd0236b18eaae204b9':
  Merge 59aad78e from master. do not merge.
 2011-04-07 14:24:00 -07:00
Wink Saville
975c8488a3 ConnectivityService needs to use the new names for the NetConfig vars. 
Change-Id: I809a624057462871cd1849051286c2bffd5099e9
 2011-04-07 14:23:45 -07:00
Teng-Hui Zhu
29fa50be24 am bb55777b: Merge changes Ia44d880a,Ifbf63b24 into honeycomb-mr1 
* commit 'bb55777be1a3231d187205dc378ca35b01e8bc65':
  DO NOT MERGE : cherry pick of change Ieb7ae26b from master
  DO NOT MERGE : cherry pick of change I0f9f2c65 from master
 2011-04-07 14:22:33 -07:00
Robert Greenwalt
80f7c594fa am f4a29403: resolved conflicts for merge of 70c3d1c2 to honeycomb-plus-aosp 
* commit 'f4a29403ae5b6d3e8e754a025d33f0c33adecb21':
  Add external dependency API.
 2011-04-07 14:22:03 -07:00
Xavier Ducrohet
65ef6e8690 am 96ac8560: am 515a08b0: Merge 59aad78e from master. do not merge. 
* commit '96ac85607b1462508981936b1be29ae5f9e4271d':
  Merge 59aad78e from master. do not merge.
 2011-04-07 14:18:20 -07:00
Teng-Hui Zhu
bb55777be1 Merge changes Ia44d880a,Ifbf63b24 into honeycomb-mr1 
* changes:
  DO NOT MERGE : cherry pick of change Ieb7ae26b from master
  DO NOT MERGE : cherry pick of change I0f9f2c65 from master
 2011-04-07 14:17:52 -07:00
Robert Greenwalt
f4a29403ae resolved conflicts for merge of 70c3d1c2 to honeycomb-plus-aosp 
Change-Id: I0962138f6ecb1ed54fda25524d8850b086f13c4f
 2011-04-07 14:13:52 -07:00
Eric Fischer
567882e1f9 Merge "Import revised translations." 2011-04-07 14:08:55 -07:00
Eric Fischer
34ade71cff Import revised translations. 
Change-Id: I66670dc3d9c37fc3818764fa9839219208e83fbb
 2011-04-07 13:51:31 -07:00
Xavier Ducrohet
96ac85607b am 515a08b0: Merge 59aad78e from master. do not merge. 
* commit '515a08b01851a1ab9386f85dee6d9fd7b65ee7ad':
  Merge 59aad78e from master. do not merge.
 2011-04-07 13:38:13 -07:00
Jeff Brown
6181de3443 Merge "Coalesce input events that arrive faster than 333Hz." 2011-04-07 13:18:38 -07:00
Jeff Brown
4e91a180be Coalesce input events that arrive faster than 333Hz. 
Some drivers report individual finger updates one at a time
instead of all at once.  When 10 fingers are down, this can
cause the framework to have to handle 10 times as many events
each with 10 times as much data.  Applications like
PointerLocation would get significantly bogged down by all
of the redundant samples.

This change coalesces samples that are closely spaced in time,
before they are dispatched, as part of the motion event batching
protocol.

Increased the size of the InputChannel shared memory buffer so
that applications can catch up faster if they accumulate a
backlog of samples.

Added logging code to help measure input dispatch and drawing
latency issues in the view hierarchy.  See ViewDebug.DEBUG_LATENCY.

Change-Id: Ia5898f781f19901d2225c529a910c32bdf4f504f
 2011-04-07 13:11:16 -07:00
Robert Greenwalt
70c3d1c23b Merge "Add external dependency API." into honeycomb-LTE 2011-04-07 13:02:28 -07:00
John Wang
6d4b4901eb am 91bc0f81: am 574d3c4b: Merge "Refactor onSetupConnectionCompleted." into honeycomb-LTE 
* commit '91bc0f818c9e4cfdffc09f6edecfd11a1ce1806e':
  Refactor onSetupConnectionCompleted.
 2011-04-07 12:48:22 -07:00
John Wang
52c858f5f0 am c343c183: am 5d6f1167: Merge "Make LinkProperties comparable." into honeycomb-LTE 
* commit 'c343c18376b8fd7d27a07adc5bb617d0260a8cdc':
  Make LinkProperties comparable.
 2011-04-07 12:48:17 -07:00
John Wang
91bc0f818c am 574d3c4b: Merge "Refactor onSetupConnectionCompleted." into honeycomb-LTE 
* commit '574d3c4b2cb120314b68bffa34aed2545d1b1158':
  Refactor onSetupConnectionCompleted.
 2011-04-07 12:46:21 -07:00
John Wang
c343c18376 am 5d6f1167: Merge "Make LinkProperties comparable." into honeycomb-LTE 
* commit '5d6f1167039e22889545212ce18192460f9b503e':
  Make LinkProperties comparable.
 2011-04-07 12:46:18 -07:00
John Wang
574d3c4b2c Merge "Refactor onSetupConnectionCompleted." into honeycomb-LTE 2011-04-07 12:44:14 -07:00
John Wang
5d6f116703 Merge "Make LinkProperties comparable." into honeycomb-LTE 2011-04-07 12:44:04 -07:00
John Wang
d3ba7d5bec Refactor onSetupConnectionCompleted. 
Refactor the part of setting linkProperties based
on data call responses.

Bug:3501569
Change-Id: I02bf0558e2f8a5924197b8c06f19673279dec815
 2011-04-07 12:37:05 -07:00
John Wang
4e900091c4 Make LinkProperties comparable. 
Add equals() and hashcode() to LinkProperties and related fields.

Bug:3501569
Change-Id: Ifa737a67c16867ac43cf76bf618a483e612a189e
 2011-04-07 12:36:56 -07:00
Robert Greenwalt
d55a6b498d Add external dependency API. 
An APN will not be connected to if some external dependency is not met.

bug:3486704
Change-Id: I7d94df343b260013efd11faa978deb13f07f1389
 2011-04-07 12:28:37 -07:00
Xavier Ducrohet
515a08b018 Merge 59aad78e from master. do not merge. 
LayoutLib: don't render when shader's local matrix is set to 0 scale.

Change-Id: I02c0ddd856026357f468dcc8b81e0520470118de
 2011-04-07 12:02:31 -07:00
Jason Sams
e651c68ee8 Merge "Migrate most GL from context to driver." 2011-04-07 11:33:11 -07:00
James Dong
c35f01dc0e Merge "Media JNI code cleanup" 2011-04-07 11:16:49 -07:00
James Dong
c371a02e7c Media JNI code cleanup 
o Don't throw exception again because an exception was already thrown
o Check on return values from FindClass() and GetMethodID

Change-Id: Id92bb8228f1f0d2798d1cdf7de73cbb43816060b
related-to-bug: 4139926
 2011-04-07 11:10:25 -07:00
Eric Laurent
62c1a92dc5 Merge "Do not disable effect in AudioEffect destructor." 2011-04-07 10:31:11 -07:00
Eric Laurent
b8da6cb5b2 Do not disable effect in AudioEffect destructor. 
Current implementation of AudioEffect class destructor disables
the effect before disconnecting from IAudioEffect interface.
This is problematic when more than one client has a handle on the same
effect engine as destroying one handle will disable the effect which is
not the intended behavior.

Change-Id: I10eacf981506469a7ef4eb9a1650813f0848de5d
 2011-04-07 09:41:46 -07:00
Wink Saville
749aaf934c am 7ff3c410: am add31091: Merge "Add a 4G icon for LTE." into honeycomb-LTE 
* commit '7ff3c410be00776159ff7a433ce218fabf3f44c4':
  Add a 4G icon for LTE.
 2011-04-07 09:38:41 -07:00
Wink Saville
7ff3c410be am add31091: Merge "Add a 4G icon for LTE." into honeycomb-LTE 
* commit 'add31091785c3de8df1555163cca9ee9d22c9968':
  Add a 4G icon for LTE.
 2011-04-07 09:37:06 -07:00
Wink Saville
add3109178 Merge "Add a 4G icon for LTE." into honeycomb-LTE 2011-04-07 09:35:18 -07:00