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

25437 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
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
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
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
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
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
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
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
Yu Shan Emily Lau
fd4a7c83b2 Add the a power test case which simply do the audio playback. The actual power measurement will be done by another application. 
Change-Id: I51008ffdbe60e7e0b298091eb914b74f2d6731f8
 2010-08-10 20:02:07 -07:00
Konstantin Lopyrev
8279c754d1 am 91a7f5fe: Making sure that the prefix is handled properly. 
Merge commit '91a7f5fef8a9fc496acef23f513cb48139e8dff5' into gingerbread-plus-aosp

* commit '91a7f5fef8a9fc496acef23f513cb48139e8dff5':
  Making sure that the prefix is handled properly.
 2010-08-10 19:02:51 -07:00
Konstantin Lopyrev
91a7f5fef8 Making sure that the prefix is handled properly. 
Change-Id: Ic50327b1ed4d6b54753b5b3887508a53cd7a3497
 2010-08-10 18:54:54 -07:00
Adam Powell
e8fa85d7a1 am 224ab9a5: Merge "Fix public bug http://code.google.com/p/android/issues/detail?id=10067" into gingerbread 
Merge commit '224ab9a5c6f7ae70fe55bf3d5604cbdf883baee7' into gingerbread-plus-aosp

* commit '224ab9a5c6f7ae70fe55bf3d5604cbdf883baee7':
  Fix public bug http://code.google.com/p/android/issues/detail?id=10067
 2010-08-10 17:54:58 -07:00
Konstantin Lopyrev
f00ee0f762 am f39d5987: Merge "Categorizing exported view properties." into gingerbread 
Merge commit 'f39d5987b977fdff8c34a2ddabaec31d1e909db3' into gingerbread-plus-aosp

* commit 'f39d5987b977fdff8c34a2ddabaec31d1e909db3':
  Categorizing exported view properties.
 2010-08-10 17:52:32 -07:00
Adam Powell
224ab9a5c6 Merge "Fix public bug http://code.google.com/p/android/issues/detail?id=10067" into gingerbread 2010-08-10 17:52:15 -07:00
Adam Powell
9bccdb7d5c Fix public bug http://code.google.com/p/android/issues/detail?id=10067 
Change-Id: I7b7a9a32e82fc7541beabe286b20b01f39406cc8
 2010-08-10 17:50:11 -07:00
Konstantin Lopyrev
f39d5987b9 Merge "Categorizing exported view properties." into gingerbread 2010-08-10 17:48:27 -07:00
Konstantin Lopyrev
bea95162ca Categorizing exported view properties. 
Change-Id: I79c42019836973d80662c21d195d088ae01537a0
 2010-08-10 17:45:03 -07:00
Jeff Brown
95105f3c25 am c3fc2d03: Fix safe mode and KeyEvent.getMaxKeyCode(). 
Merge commit 'c3fc2d03d58a258c53c9265a70143d4af076b764' into gingerbread-plus-aosp

* commit 'c3fc2d03d58a258c53c9265a70143d4af076b764':
  Fix safe mode and KeyEvent.getMaxKeyCode().
 2010-08-10 16:33:47 -07:00
Jeff Brown
d3cf0544cc am d98d0fc6: Merge "Optimize VelocityTracker to run in linear time." into gingerbread 
Merge commit 'd98d0fc6e9172d3f130794e499462c911920adf6' into gingerbread-plus-aosp

* commit 'd98d0fc6e9172d3f130794e499462c911920adf6':
  Optimize VelocityTracker to run in linear time.
 2010-08-10 16:31:04 -07:00
Jeff Brown
c3fc2d03d5 Fix safe mode and KeyEvent.getMaxKeyCode(). 
Bug: 2901731
Change-Id: I78617c1b9dee3790fc590e5af4b5083368873184
 2010-08-10 16:28:03 -07:00
Jeff Brown
d98d0fc6e9 Merge "Optimize VelocityTracker to run in linear time." into gingerbread 2010-08-10 16:26:56 -07:00
Kenny Root
a27484f068 am 6061af11: Merge "Sort the IME list before showing to user" 
Merge commit '6061af11cb2b59b6261d12f98b9e8dd395ea8ba7' into gingerbread-plus-aosp

* commit '6061af11cb2b59b6261d12f98b9e8dd395ea8ba7':
  Sort the IME list before showing to user
 2010-08-10 15:38:41 -07:00
Kenny Root
6061af11cb Merge "Sort the IME list before showing to user" 2010-08-10 15:22:13 -07:00
Andreas Huber
d35498f606 am 1a140bf6: Merge "Remove some obsolete code." into gingerbread 
Merge commit '1a140bf65c288fcb1458bbd694c9d6e7a567a0f5' into gingerbread-plus-aosp

* commit '1a140bf65c288fcb1458bbd694c9d6e7a567a0f5':
  Remove some obsolete code.
 2010-08-10 14:15:11 -07:00
Andreas Huber
1a140bf65c Merge "Remove some obsolete code." into gingerbread 2010-08-10 14:09:39 -07:00
Mathias Agopian
553a333d44 am 603a34ee: Merge "improve a bit the implementation of eglGetProcAddress" into gingerbread 
Merge commit '603a34ee30e7d14ddc02c1beb7bca915622ae4bf' into gingerbread-plus-aosp

* commit '603a34ee30e7d14ddc02c1beb7bca915622ae4bf':
  improve a bit the implementation of eglGetProcAddress
 2010-08-10 13:52:58 -07:00
Mathias Agopian
603a34ee30 Merge "improve a bit the implementation of eglGetProcAddress" into gingerbread 2010-08-10 13:50:22 -07:00
Andreas Huber
6fa131105d Remove some obsolete code. 
Change-Id: Ic4d21afe3721173d48db44b8ee4f836deee017ad
 2010-08-10 13:48:53 -07:00
James Dong
b9ddd779ae am 10ed3f74: Merge "Add input buffer size check for software video encoders" into gingerbread 
Merge commit '10ed3f7438f6ae797bac32476dc61465c6484c85' into gingerbread-plus-aosp

* commit '10ed3f7438f6ae797bac32476dc61465c6484c85':
  Add input buffer size check for software video encoders
 2010-08-10 13:28:56 -07:00
James Dong
10ed3f7438 Merge "Add input buffer size check for software video encoders" into gingerbread 2010-08-10 13:27:09 -07:00
Andreas Huber
4dc41bb445 am 18f0174f: Merge "We\'re now going to ignore timestamps completely in gtalk video conferencing, playing video as soon as it comes in. We also make up fake timestamps in the rtp code, ignoring rtcp SR information to enable early startup." into gingerbread 
Merge commit '18f0174ff4eef46f121e77a0dc1d7a8271621f48' into gingerbread-plus-aosp

* commit '18f0174ff4eef46f121e77a0dc1d7a8271621f48':
  We're now going to ignore timestamps completely in gtalk video conferencing, playing video as soon as it comes in. We also make up fake timestamps in the rtp code, ignoring rtcp SR information to enable early startup.
 2010-08-10 13:01:58 -07:00
Andreas Huber
18f0174ff4 Merge "We're now going to ignore timestamps completely in gtalk video conferencing, playing video as soon as it comes in. We also make up fake timestamps in the rtp code, ignoring rtcp SR information to enable early startup." into gingerbread 2010-08-10 12:59:27 -07:00
Eric Fischer
c7af4c5c5a am 605f4027: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
Merge commit '605f402796afa9c88e2f91284e98d1f59a0726aa' into gingerbread-plus-aosp

* commit '605f402796afa9c88e2f91284e98d1f59a0726aa':
  Import revised translations.  DO NOT MERGE
 2010-08-10 12:00:12 -07:00
Eric Rowe
7cb0fc5880 am edae848e: am 301c437b: Remove @LargeTest annotations 
Merge commit 'edae848eb62e27b8e987aa89557d1456304fada7' into gingerbread-plus-aosp

* commit 'edae848eb62e27b8e987aa89557d1456304fada7':
  Remove @LargeTest annotations
 2010-08-10 12:00:07 -07:00
Eric Fischer
605f402796 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-08-10 11:54:24 -07:00
Eric Rowe
edae848eb6 am 301c437b: Remove @LargeTest annotations 
Merge commit '301c437b554e2152f3f6fffadc680f5cbf8e8231' into gingerbread

* commit '301c437b554e2152f3f6fffadc680f5cbf8e8231':
  Remove @LargeTest annotations
 2010-08-10 11:53:59 -07:00