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

28529 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Queru
f781b4ef4b am e37ab632: Merge "Fix build on some linux machines" 
Merge commit 'e37ab63221af94d69437741a3645fc0e14a680bc' into gingerbread-plus-aosp

* commit 'e37ab63221af94d69437741a3645fc0e14a680bc':
  Fix build on some linux machines
 2010-08-11 10:04:31 -07:00
Alex Sakhartchouk
a919112f4a Renaming stucts back. 
Change-Id: Ic9315c7fb2e03d0e88a07ae2361836d35106ab4b
 2010-08-11 10:04:21 -07:00
Naveen Kalla
cd397b73a8 am 371dbcba: am c4c4c98c: In CW Interrogation service class is not sent. 
Merge commit '371dbcba11070ed2fdd58a4c328b5d7b9ad65a40'

* commit '371dbcba11070ed2fdd58a4c328b5d7b9ad65a40':
  In CW Interrogation service class is not sent.
 2010-08-11 09:56:05 -07:00
Jean-Baptiste Queru
e37ab63221 Merge "Fix build on some linux machines" 2010-08-11 09:55:36 -07:00
Naveen Kalla
371dbcba11 am c4c4c98c: In CW Interrogation service class is not sent. 
Merge commit 'c4c4c98c5ca6b4c017a5b429a6bd80a440c63559' into gingerbread-plus-aosp

* commit 'c4c4c98c5ca6b4c017a5b429a6bd80a440c63559':
  In CW Interrogation service class is not sent.
 2010-08-11 09:53:01 -07:00
Jean-Baptiste Queru
5a90f6f594 am 92798a48: am 076d0654: Merge "SIM toolkit enhancements and bug fixes" 
Merge commit '92798a481cbd928711339606bc1d9e81fa80f7b2'

* commit '92798a481cbd928711339606bc1d9e81fa80f7b2':
  SIM toolkit enhancements and bug fixes
 2010-08-11 09:52:34 -07:00
Jean-Baptiste Queru
92798a481c am 076d0654: Merge "SIM toolkit enhancements and bug fixes" 
Merge commit '076d06547f90c480a4ed19da6f4b3d1270f57ec9' into gingerbread-plus-aosp

* commit '076d06547f90c480a4ed19da6f4b3d1270f57ec9':
  SIM toolkit enhancements and bug fixes
 2010-08-11 09:44:27 -07:00
Naveen Kalla
c4c4c98c5c In CW Interrogation service class is not sent. 
As per 3GPP TS 24.083, section 1.6 UE doesn't need to send service class
parameter in call waiting interrogation  to network. Some networks return error
if service class is sent. So setting service class to SERVICE_CLASS_NONE.

Change-Id: I396963d568573b88795ad2cf1844eb2e047b459e
 2010-08-11 09:44:04 -07:00
Jean-Baptiste Queru
076d06547f Merge "SIM toolkit enhancements and bug fixes" 2010-08-11 09:29:03 -07:00
hmepas
b7ffaf6ae2 Fix build on some linux machines 
This adds -lpthread on linux for aapt and localize, which appear to be
needed on some linux distros.

Signed-off-by: Jean-Baptiste Queru <jbq@google.com>
 2010-08-11 09:08:51 -07:00
Alex Sakhartchouk
0dde1f89a4 Merge "Adding quaternion functions to math library." 2010-08-11 09:02:51 -07:00
Daniel Sandler
90d8610a68 Merge "Apparently people want to know what time it is." 2010-08-11 08:47:44 -07:00
Daniel Sandler
6327b957e0 Apparently people want to know what time it is. 
Bug: 2897410
Change-Id: I8a9a995cf50d197f1f8894455372d0e325eb3eae
 2010-08-11 11:45:22 -04:00
Irfan Sheriff
994c57828f Fix build 
A local change had remained.

Change-Id: Iad01d6da7f6cc75b470296383e1121d21008883a
 2010-08-11 08:20:41 -07:00
Irfan Sheriff
9f3c5da382 Merge "Split WifiStateMachine from WifiStateTracker" 2010-08-11 07:53:51 -07:00
Patrick Scott
4668e77265 am dc1f0858: am 9902196f: Fix npe in getCacheTotalSize. 
Merge commit 'dc1f08586eadc3a3dbbdf22b520ba1065b2032f8'

* commit 'dc1f08586eadc3a3dbbdf22b520ba1065b2032f8':
  Fix npe in getCacheTotalSize.
 2010-08-11 07:21:25 -07:00
Patrick Scott
dc1f08586e am 9902196f: Fix npe in getCacheTotalSize. 
Merge commit '9902196f9885d369e37cf44084e3f04513511ab0' into gingerbread-plus-aosp

* commit '9902196f9885d369e37cf44084e3f04513511ab0':
  Fix npe in getCacheTotalSize.
 2010-08-11 07:18:27 -07:00
Patrick Scott
9902196f98 Fix npe in getCacheTotalSize. 
Bug: 2882277
Change-Id: I9319a48e0ed75561d3d04691fb288f69d11edc84
 2010-08-11 09:48:43 -04:00
Maksymilian Osowski
0186c93a6e Merge "Added a basic version of python script and supporting code in DumpRenderTree." 2010-08-11 05:26:38 -07:00
Steve Block
f4a705f045 Update DeviceOrientationManager to be specific to a WebViewCore 
This avoids the need to pass the WebViewCore to its methods.

Change-Id: Ieec414f0819f06c8f5568ae5d6dd81a48d05fd6e
 2010-08-11 13:14:43 +01:00
Maksymilian Osowski
a0a586cd2f Fixes crash when root dir does not exist. 
Bug: 2904439
Change-Id: I629f88626e165348dd414f3ad49d9b415ab336cf
 2010-08-11 12:55:01 +01:00
Maksymilian Osowski
5fb9ff420d Added a basic version of python script and supporting code in DumpRenderTree. 
Change-Id: Ic60ef9b89f74a3a36a4c31765f99c8de08dce911
 2010-08-11 12:20:30 +01:00
Maksymilian Osowski
cbfe6ec1b4 Merge "Resets Summarizer after everything's finished." 2010-08-11 04:02:21 -07:00
Hung-ying Tyan
003ffe72e0 am 03381faf: (-s ours) am 1777a274: SIP: remove unused file. 
Merge commit '03381faf3492cd1360b3d239c6f23a801c9d4b7f'

* commit '03381faf3492cd1360b3d239c6f23a801c9d4b7f':
  SIP: remove unused file.
 2010-08-11 03:09:42 -07:00
Hung-ying Tyan
03381faf34 am 1777a274: SIP: remove unused file. 
Merge commit '1777a2748bfa25dfd9d081d71504572b9a7256b1' into gingerbread-plus-aosp

* commit '1777a2748bfa25dfd9d081d71504572b9a7256b1':
  SIP: remove unused file.
 2010-08-11 01:56:56 -07:00
Hung-ying Tyan
1777a2748b SIP: remove unused file. 
Change-Id: Ifb3582da888926e62775a73a6b3080d15f1c3e42
 2010-08-11 16:48:14 +08:00
Dianne Hackborn
7b6d0d99b6 am 679ac09a: am a5ae50cd: Merge "More native work." into gingerbread 
Merge commit '679ac09a5c22175354f3a04b28456b323839530e'

* commit '679ac09a5c22175354f3a04b28456b323839530e':
  More native work.
 2010-08-11 00:50:56 -07:00
Dianne Hackborn
679ac09a5c am a5ae50cd: Merge "More native work." into gingerbread 
Merge commit 'a5ae50cd838b5725c63ed485292aae4edd1a98cb' into gingerbread-plus-aosp

* commit 'a5ae50cd838b5725c63ed485292aae4edd1a98cb':
  More native work.
 2010-08-11 00:47:51 -07:00
Dianne Hackborn
a5ae50cd83 Merge "More native work." into gingerbread 2010-08-11 00:45:44 -07:00
Dianne Hackborn
08d5b8fad8 More native work. 
Implement save/restore of state, and add native APIs for
configuration information.

Change-Id: I2a3ddc2ba605db58d7c8b2b31b9215fb323f90b5
 2010-08-11 00:29:59 -07:00
Chung-yih Wang
ea65ec23f6 am 0a6db9be: am 2725a655: Fix a bug in unregisterPhone(). 
Merge commit '0a6db9bebbd58c6a7e2ad2070d2649a2be57a09a'

* commit '0a6db9bebbd58c6a7e2ad2070d2649a2be57a09a':
  Fix a bug in unregisterPhone().
 2010-08-10 23:44:52 -07:00
Chung-yih Wang
0a6db9bebb am 2725a655: Fix a bug in unregisterPhone(). 
Merge commit '2725a6551261044318e42ccc9ebeabed7edf5ee7' into gingerbread-plus-aosp

* commit '2725a6551261044318e42ccc9ebeabed7edf5ee7':
  Fix a bug in unregisterPhone().
 2010-08-10 23:41:48 -07:00
Chung-yih Wang
2725a65512 Fix a bug in unregisterPhone(). 
Change-Id: Ifaef66d45043dc5376688a77f9d18124a9c29576
 2010-08-11 14:22:34 +08:00
Romain Guy
3fa3403e2e Merge "Support non-PorterDuff xfermodes with Xfermode." 2010-08-10 21:56:12 -07:00
Romain Guy
8918190a19 Support non-PorterDuff xfermodes with Xfermode. 
Change-Id: Icef17b72da2d047a24aaac1ddf5cdae77b40d5b4
 2010-08-10 21:55:44 -07:00
Hung-ying Tyan
4d0e7cd790 am 9a025349: am 091c5238: Merge "SipAudioCall: perform local ops before network op in endCall()" into gingerbread 
Merge commit '9a025349dc5a4e699fbe99a714f523e9903fa534'

* commit '9a025349dc5a4e699fbe99a714f523e9903fa534':
  SipAudioCall: perform local ops before network op in endCall()
 2010-08-10 21:54:07 -07:00
Chung-yih Wang
a5d4503bc4 am 2c9de2b9: am f57324cf: Add getSipUri() for identification. 
Merge commit '2c9de2b9e5568c8918b36866d3cf20833a8c20e1'

* commit '2c9de2b9e5568c8918b36866d3cf20833a8c20e1':
  Add getSipUri() for identification.
 2010-08-10 21:54:01 -07:00
Yu Shan Emily Lau
e381c4bc39 am 1ded9f95: am fbb936bf: Merge "Add the a power test case which simply do the audio playback. The actual power measurement will be done by another application." into gingerbread 
Merge commit '1ded9f95636a83298658bfcd840ae8e51127c714'

* commit '1ded9f95636a83298658bfcd840ae8e51127c714':
  Add the a power test case which simply do the audio playback. The actual power measurement will be done by another application.
 2010-08-10 21:53:54 -07:00
Konstantin Lopyrev
12fb5a3573 am 8279c754: am 91a7f5fe: Making sure that the prefix is handled properly. 
Merge commit '8279c754d176d5c2aa23f6f7ad16fcea03278788'

* commit '8279c754d176d5c2aa23f6f7ad16fcea03278788':
  Making sure that the prefix is handled properly.
 2010-08-10 21:53:49 -07:00
Adam Powell
f98d3e3047 am e8fa85d7: am 224ab9a5: Merge "Fix public bug http://code.google.com/p/android/issues/detail?id=10067" into gingerbread 
Merge commit 'e8fa85d7a1a75d6894a75b1c25abf99bbff50085'

* commit 'e8fa85d7a1a75d6894a75b1c25abf99bbff50085':
  Fix public bug http://code.google.com/p/android/issues/detail?id=10067
 2010-08-10 21:53:40 -07:00
Konstantin Lopyrev
ea5282cf90 Merge "resolved conflicts for merge of f00ee0f7 to master" 2010-08-10 21:49:04 -07:00
Konstantin Lopyrev
ecb1d5ded9 resolved conflicts for merge of f00ee0f7 to master 
Change-Id: I13b968bde37fad8fffdaa9bb94a0f1da9b2e6e0c
 2010-08-10 21:47:34 -07:00
Romain Guy
9e187ed821 Merge "Add extra blending modes." 2010-08-10 21:43:09 -07:00
Romain Guy
48daa54d31 Add extra blending modes. 
This change adds the following blending modes for shaders and color filters:
Add
Multiply
Screen
Overlay
Darken
Lighten

Change-Id: Iff22f5ce6041b43c71b1857d73013f5010ab3413
 2010-08-10 21:42:40 -07:00
Hung-ying Tyan
9a025349dc am 091c5238: Merge "SipAudioCall: perform local ops before network op in endCall()" into gingerbread 
Merge commit '091c5238a00ca51dc69b8b09459e6ac88e1eb077' into gingerbread-plus-aosp

* commit '091c5238a00ca51dc69b8b09459e6ac88e1eb077':
  SipAudioCall: perform local ops before network op in endCall()
 2010-08-10 20:50:40 -07:00
Hung-ying Tyan
091c5238a0 Merge "SipAudioCall: perform local ops before network op in endCall()" into gingerbread 2010-08-10 20:48:18 -07:00
Chung-yih Wang
2c9de2b9e5 am f57324cf: Add getSipUri() for identification. 
Merge commit 'f57324cf4f82947296f4d1acb9df1f3c9c03134e' into gingerbread-plus-aosp

* commit 'f57324cf4f82947296f4d1acb9df1f3c9c03134e':
  Add getSipUri() for identification.
 2010-08-10 20:47:18 -07:00
Chung-yih Wang
f57324cf4f Add getSipUri() for identification. 
Change-Id: Iabffd38ad554c34a34977c833e6699747cbf0f63
 2010-08-11 11:13:49 +08:00
Yu Shan Emily Lau
1ded9f9563 am fbb936bf: Merge "Add the a power test case which simply do the audio playback. The actual power measurement will be done by another application." into gingerbread 
Merge commit 'fbb936bfab22cb1c3748cccffe67f42f7d764b54' into gingerbread-plus-aosp

* commit 'fbb936bfab22cb1c3748cccffe67f42f7d764b54':
  Add the a power test case which simply do the audio playback. The actual power measurement will be done by another application.
 2010-08-10 20:09:24 -07:00
Yu Shan Emily Lau
fbb936bfab Merge "Add the a power test case which simply do the audio playback. The actual power measurement will be done by another application." into gingerbread 2010-08-10 20:06:39 -07:00