Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,551 Commits 3 Branches 0 Tags
2c4573263a97cc80f441824a75d6502ae04292a8
Commit Graph

27551 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hung-ying Tyan
2c4573263a am 421c34c1: SipPhone: revise hangup() in SipCall and SipConnection. 
Merge commit '421c34c162098efe870574844a7ee49812bbb929' into gingerbread-plus-aosp

* commit '421c34c162098efe870574844a7ee49812bbb929':
  SipPhone: revise hangup() in SipCall and SipConnection.
 2010-09-30 10:09:33 -07:00
Gilles Debunne
8064dd2265 am 71e24862: Merge "New assets for status bar data_edge and overscroll" into gingerbread 
Merge commit '71e2486209856d33d027389be2bd4924a03c4f86' into gingerbread-plus-aosp

* commit '71e2486209856d33d027389be2bd4924a03c4f86':
  New assets for status bar data_edge and overscroll
 2010-09-30 10:08:38 -07:00
Ying Wang
3b197dfc7f am 3caaa64e: Merge "Fix proguard flag file dependency." into gingerbread 
Merge commit '3caaa64e866fa3aba1d5ba3070a3b092bb835a93' into gingerbread-plus-aosp

* commit '3caaa64e866fa3aba1d5ba3070a3b092bb835a93':
  Fix proguard flag file dependency.
 2010-09-30 09:33:19 -07:00
Hung-ying Tyan
421c34c162 SipPhone: revise hangup() in SipCall and SipConnection. 
Make them DISCONNECTED immediately. Don't enter DISCONNECTING state and wait
until SipSession ends the session. SipSession will get timed out eventually
but PhoneApp/user don't need to know this detail and wait.

This should fix the bug:
http://b/issue?id=3027719

Change-Id: Ida5a1bd09d08b9d591721384b4978127619aab51
 2010-09-30 08:26:59 +08:00
Gilles Debunne
71e2486209 Merge "New assets for status bar data_edge and overscroll" into gingerbread 2010-09-29 17:05:26 -07:00
Gilles Debunne
03b58063de New assets for status bar data_edge and overscroll 
Change-Id: I32b8e036fc54a912719df660db3063045d8d7c93
 2010-09-29 17:02:50 -07:00
Ying Wang
3caaa64e86 Merge "Fix proguard flag file dependency." into gingerbread 2010-09-29 16:13:21 -07:00
Ying Wang
d252a52028 Fix proguard flag file dependency. 
Change-Id: Ibc160fc98334ca83fa8059372d2384880069b9d2
 2010-09-29 15:18:06 -07:00
Joe Onorato
9a042772c2 am 2a0b3c0d: Merge "AnimatedImageView: Stop the animation when we\'re not visible." into gingerbread 
Merge commit '2a0b3c0d4cd98385ebfa60cc2014bdb2d7b5a7f5' into gingerbread-plus-aosp

* commit '2a0b3c0d4cd98385ebfa60cc2014bdb2d7b5a7f5':
  AnimatedImageView: Stop the animation when we're not visible.
 2010-09-29 14:28:03 -07:00
Joe Onorato
2a0b3c0d4c Merge "AnimatedImageView: Stop the animation when we're not visible." into gingerbread 2010-09-29 14:25:15 -07:00
Joe Onorato
1e7277e204 AnimatedImageView: Stop the animation when we're not visible. 
Change-Id: I5dedc4048806f1ea44ef4777ccf578a29e79869b
 2010-09-29 14:21:06 -07:00
David Brown
5cf44f6907 am 87fbcc2b: Merge "Implement contacts lookup (caller-id) for incoming SIP calls." into gingerbread 
Merge commit '87fbcc2b73b9b92d50c4520053bfc7bdff4cd91b' into gingerbread-plus-aosp

* commit '87fbcc2b73b9b92d50c4520053bfc7bdff4cd91b':
  Implement contacts lookup (caller-id) for incoming SIP calls.
 2010-09-29 14:10:37 -07:00
David Brown
87fbcc2b73 Merge "Implement contacts lookup (caller-id) for incoming SIP calls." into gingerbread 2010-09-29 14:08:31 -07:00
Doug Zongker
ab9f508292 am 981dec69: Merge "don\'t delete /cache/recovery/last_log on boot" into gingerbread 
Merge commit '981dec695f83eb51935fcf480ecbd76ae3f7d6c4' into gingerbread-plus-aosp

* commit '981dec695f83eb51935fcf480ecbd76ae3f7d6c4':
  don't delete /cache/recovery/last_log on boot
 2010-09-29 13:43:28 -07:00
Doug Zongker
981dec695f Merge "don't delete /cache/recovery/last_log on boot" into gingerbread 2010-09-29 13:41:00 -07:00
Jaikumar Ganesh
c10207b6bf am a5c742bf: Merge "Update local cache before sending intent." into gingerbread 
Merge commit 'a5c742bfd08df55849418cd1c77065ac54d83502' into gingerbread-plus-aosp

* commit 'a5c742bfd08df55849418cd1c77065ac54d83502':
  Update local cache before sending intent.
 2010-09-29 13:27:38 -07:00
Jaikumar Ganesh
a5c742bfd0 Merge "Update local cache before sending intent." into gingerbread 2010-09-29 13:24:53 -07:00
Doug Zongker
d059055fb3 don't delete /cache/recovery/last_log on boot 
Change-Id: I7739d7a61f4f0d0c2bc6324580404f61d435d716
 2010-09-29 13:22:49 -07:00
Gilles Debunne
ed1cf3dab5 am f0fa2674: Merge "New assets: wifi signal 1, no sim card." into gingerbread 
Merge commit 'f0fa267492353a98562d32d4359f2099df0f2fcd' into gingerbread-plus-aosp

* commit 'f0fa267492353a98562d32d4359f2099df0f2fcd':
  New assets: wifi signal 1, no sim card.
 2010-09-29 12:20:31 -07:00
Eric Fischer
97708b19c5 am 5f0c8fe6: Merge "Split strings with SD card references into variations." into gingerbread 
Merge commit '5f0c8fe6516ab2327f93f1c038d8854dbcbe7ce0' into gingerbread-plus-aosp

* commit '5f0c8fe6516ab2327f93f1c038d8854dbcbe7ce0':
  Split strings with SD card references into variations.
 2010-09-29 12:17:28 -07:00
Chia-chi Yeh
1c2eab2d86 am 955ab37c: Merge "RTP: Enable GSM-EFR codec." into gingerbread 
Merge commit '955ab37cee3b2c61e67a2f8ceca895b47f6a182c' into gingerbread-plus-aosp

* commit '955ab37cee3b2c61e67a2f8ceca895b47f6a182c':
  RTP: Enable GSM-EFR codec.
 2010-09-29 12:17:24 -07:00
Gilles Debunne
f0fa267492 Merge "New assets: wifi signal 1, no sim card." into gingerbread 2010-09-29 12:15:51 -07:00
Eric Fischer
5f0c8fe651 Merge "Split strings with SD card references into variations." into gingerbread 2010-09-29 12:14:10 -07:00
Chia-chi Yeh
955ab37cee Merge "RTP: Enable GSM-EFR codec." into gingerbread 2010-09-29 12:12:51 -07:00
Eric Fischer
d77782ed63 Split strings with SD card references into variations. 
Change-Id: I39ead98a753f26c00c1e2ba6344338696263c49b
 2010-09-29 12:09:04 -07:00
Chia-chi Yeh
f4ae94229d RTP: Enable GSM-EFR codec. 
Change-Id: I9d84009e4557a0a82c1f9d7d543922741be97c77
 2010-09-30 03:07:57 +08:00
Chia-chi Yeh
1254b9c534 am cd386649: Merge "RTP: Revise the workaround of private addresses and fix bugs." into gingerbread 
Merge commit 'cd38664916ca9e8c85c3269fec61e6a447ec7004' into gingerbread-plus-aosp

* commit 'cd38664916ca9e8c85c3269fec61e6a447ec7004':
  RTP: Revise the workaround of private addresses and fix bugs.
 2010-09-29 11:53:07 -07:00
Chia-chi Yeh
cd38664916 Merge "RTP: Revise the workaround of private addresses and fix bugs." into gingerbread 2010-09-29 11:50:16 -07:00
Chia-chi Yeh
fe5298992a RTP: Revise the workaround of private addresses and fix bugs. 
Change-Id: Ie654b569f47049aa452eca8d3e6d4a98ac18469c
 2010-09-30 02:43:48 +08:00
Joe Onorato
198297b495 am f01a8730: Merge "Revert "Revert "Check for the DEVICE_POWER permission in userActivity.""" into gingerbread 
Merge commit 'f01a873029641da2155ca1882f311d8f4e92675a' into gingerbread-plus-aosp

* commit 'f01a873029641da2155ca1882f311d8f4e92675a':
  Revert "Revert "Check for the DEVICE_POWER permission in userActivity.""
 2010-09-29 11:02:55 -07:00
Joe Onorato
f01a873029 Merge "Revert "Revert "Check for the DEVICE_POWER permission in userActivity.""" into gingerbread 2010-09-29 11:00:14 -07:00
Roy West
b4a28f2426 am d146c233: Merge "Partial fix to bug 2992589: Edit dev admin strings." into gingerbread 
Merge commit 'd146c233c570af3ee31d2e6ac44082571026d619' into gingerbread-plus-aosp

* commit 'd146c233c570af3ee31d2e6ac44082571026d619':
  Partial fix to bug 2992589: Edit dev admin strings.
 2010-09-29 10:40:06 -07:00
Roy West
d146c233c5 Merge "Partial fix to bug 2992589: Edit dev admin strings." into gingerbread 2010-09-29 10:37:11 -07:00
Jaikumar Ganesh
2dfe101149 Update local cache before sending intent. 
Change-Id: I0e016cae3070b1811dd68958afb8a8501081097d
 2010-09-29 10:31:02 -07:00
Roy West
7d3d88eec0 Partial fix to bug 2992589: Edit dev admin strings. 
Change-Id: Ifa73e2961fa03b5ac707a73d6932e724931ddb2c
 2010-09-29 10:28:56 -07:00
Joe Onorato
0c32c09cd3 Revert "Revert "Check for the DEVICE_POWER permission in userActivity."" 
This reverts commit 4da4827504.
 2010-09-29 10:20:59 -07:00
Kenny Root
8bd545ab4f am 212d81a0: Merge "Move all the permissions check up for unmount" into gingerbread 
Merge commit '212d81a004f50e51ed8f6d803b79f4b71546b351' into gingerbread-plus-aosp

* commit '212d81a004f50e51ed8f6d803b79f4b71546b351':
  Move all the permissions check up for unmount
 2010-09-29 07:53:06 -07:00
Kenny Root
212d81a004 Merge "Move all the permissions check up for unmount" into gingerbread 2010-09-29 07:40:32 -07:00
Kenny Root
f1121dc1d3 Move all the permissions check up for unmount 
We have already scanned the state of the OBB in mountObb, so check the
caller against the stored state in the unmountObb call. This allows us
to ensure the calling binder is the same one that mounted it since we
tie the lifecycle of the OBB to the lifecycle of the binder.

Change-Id: I45d9cfbab5d3f5b37a6a9b594b10bd8b91cccc45
 2010-09-29 07:38:55 -07:00
Nick Pelly
f4c3b7e916 am 038cabe0: NFC integration 
Merge commit '038cabe0247ee46df62f9363f1a303bc5b9c1028' into gingerbread-plus-aosp

* commit '038cabe0247ee46df62f9363f1a303bc5b9c1028':
  NFC integration
 2010-09-28 22:40:18 -07:00
Nick Pelly
038cabe024 NFC integration 
Source: Trusted_NFC_Device_Host_AA03.01e02_google.zip code drop (23-Sep-2010)

Conflicts:

	core/java/android/app/ApplicationContext.java
	core/java/android/provider/Settings.java
	core/jni/Android.mk
	core/jni/AndroidRuntime.cpp
	core/res/AndroidManifest.xml
	include/utils/Asset.h

Change-Id: I62c92f4c79f5ee65126c97602f6bc1c15794e573
Signed-off-by: Nick Pelly <npelly@google.com>
 2010-09-28 22:36:27 -07:00
Chia-chi Yeh
10b15c08bb am d6877fa4: Merge "AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead." into gingerbread 
Merge commit 'd6877fa4971710150de20453bf4ba54dca863429' into gingerbread-plus-aosp

* commit 'd6877fa4971710150de20453bf4ba54dca863429':
  AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead.
 2010-09-28 21:13:54 -07:00
Chia-chi Yeh
d6877fa497 Merge "AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead." into gingerbread 2010-09-28 21:11:27 -07:00
Chia-chi Yeh
081833d791 AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead. 
This allows gsmamr_enc.h and gsmamr_dec.h to be included in the same
file without conflict definition.

Change-Id: I1c8dac235c122735ba14a1af2fda48c0f8d9f87b
 2010-09-29 12:00:18 +08:00
Mike Lockwood
05e1105061 am a25eabad: Merge "Revert "Check for the DEVICE_POWER permission in userActivity."" into gingerbread 
Merge commit 'a25eabad23d7b8fd430ada757ae4e9f2559f8845' into gingerbread-plus-aosp

* commit 'a25eabad23d7b8fd430ada757ae4e9f2559f8845':
  Revert "Check for the DEVICE_POWER permission in userActivity."
 2010-09-28 20:18:36 -07:00
Mike Lockwood
a25eabad23 Merge "Revert "Check for the DEVICE_POWER permission in userActivity."" into gingerbread 2010-09-28 20:15:55 -07:00
Mike Lockwood
4da4827504 Revert "Check for the DEVICE_POWER permission in userActivity." 
The change broke SetupWizard and probably other apps

This reverts commit 059f8f93e6.
 2010-09-28 23:07:26 -04:00
Chia-chi Yeh
ebfe5632db am e006e4d2: Merge changes Iae1913fb,I38dbefef into gingerbread 
Merge commit 'e006e4d2c91c50795df0a02366b31610b4e97cb1' into gingerbread-plus-aosp

* commit 'e006e4d2c91c50795df0a02366b31610b4e97cb1':
  RTP: Enable GSM codec.
  RTP: Refactor out G711 codecs into another file.
 2010-09-28 19:43:50 -07:00
Chia-chi Yeh
e006e4d2c9 Merge changes Iae1913fb,I38dbefef into gingerbread 
* changes:
  RTP: Enable GSM codec.
  RTP: Refactor out G711 codecs into another file.
 2010-09-28 19:40:59 -07:00
Chia-chi Yeh
a6f950c968 RTP: Enable GSM codec. 
Change-Id: Iae1913fb0643f1c66b5d16f24d51924d363e5ef5
 2010-09-29 10:36:52 +08:00