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

27534 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Dianne Hackborn
cb51c0c7b1 am 3e94b94f: Merge "Remove old location classes." into gingerbread 
Merge commit '3e94b94f56888acbd1f8deb23c05474baaf4fae3' into gingerbread-plus-aosp

* commit '3e94b94f56888acbd1f8deb23c05474baaf4fae3':
  Remove old location classes.
 2010-09-28 18:20:26 -07:00
Dianne Hackborn
3e94b94f56 Merge "Remove old location classes." into gingerbread 2010-09-28 18:16:58 -07:00
Dianne Hackborn
0f5eee0bf8 Remove old location classes. 
Change-Id: Ib7e883c64996a8bfaaa755d88b855e17e3442e26
 2010-09-28 17:50:50 -07:00
Kenny Root
d8e8186c88 am 05105f7a: Update OBB API to include callbacks 
Merge commit '05105f7abe02b2dff91d6260b3628c8b97816bab' into gingerbread-plus-aosp

* commit '05105f7abe02b2dff91d6260b3628c8b97816bab':
  Update OBB API to include callbacks
 2010-09-28 17:33:47 -07:00
Kenny Root
05105f7abe Update OBB API to include callbacks 
Add a callback for users of the StorageManager API to be able to receive
notifications when the requested operation completes for mountObb and
unmountObb.

Add NDK API to get to ObbInfo like the Java API has.

Also update the docs for the API and remove the "STOPSHIP" comments.

Change-Id: I23a4409c7f8b74d3169614beba920b4d667990a4
 2010-09-28 17:23:26 -07:00
Joe Onorato
f5bdeba197 am ea2cf2f9: Merge "Check for the DEVICE_POWER permission in userActivity." into gingerbread 
Merge commit 'ea2cf2f936b03f1720bc43863e41c89ea2a7903a' into gingerbread-plus-aosp

* commit 'ea2cf2f936b03f1720bc43863e41c89ea2a7903a':
  Check for the DEVICE_POWER permission in userActivity.
 2010-09-28 17:22:09 -07:00
Joe Onorato
08a02039ee am f2f34505: Merge "Fix 3041579 overscroll effect in notification area looks strange" into gingerbread 
Merge commit 'f2f34505a1267955b5533ee04f803b1bcd83140a' into gingerbread-plus-aosp

* commit 'f2f34505a1267955b5533ee04f803b1bcd83140a':
  Fix 3041579 overscroll effect in notification area looks strange
 2010-09-28 17:22:02 -07:00
Joe Onorato
ea2cf2f936 Merge "Check for the DEVICE_POWER permission in userActivity." into gingerbread 2010-09-28 17:19:37 -07:00
Joe Onorato
f2f34505a1 Merge "Fix 3041579 overscroll effect in notification area looks strange" into gingerbread 2010-09-28 17:18:59 -07:00
Dianne Hackborn
e5317fbd48 am 4f67e1cc: Merge "Add location shared library for location provider APIs." into gingerbread 
Merge commit '4f67e1ccf1ae1a855521a307a13a728b8069838f' into gingerbread-plus-aosp

* commit '4f67e1ccf1ae1a855521a307a13a728b8069838f':
  Add location shared library for location provider APIs.
 2010-09-28 17:16:31 -07:00
Joe Onorato
059f8f93e6 Check for the DEVICE_POWER permission in userActivity. 
Change-Id: I6c8038a960bdf32dfad3b0571d86f51f87784370
 2010-09-28 17:14:34 -07:00
Dianne Hackborn
4f67e1ccf1 Merge "Add location shared library for location provider APIs." into gingerbread 2010-09-28 17:12:44 -07:00
Gilles Debunne
888dc9d117 New assets: wifi signal 1, no sim card. 
Change-Id: I2f7571769079998a171ac90d088ca4e82a53ce99
 2010-09-28 17:10:33 -07:00
Joe Onorato
ab014a03a0 Fix 3041579 overscroll effect in notification area looks strange 
Bug: 3041579
Change-Id: I72f5a51c86cf0e46143915e6d1fe404ffeceb925
 2010-09-28 17:02:03 -07:00
Eric Laurent
b047e3cdf2 am aeb2c62e: Merge "Fix several audio effects problems." into gingerbread 
Merge commit 'aeb2c62e7669f004512c42ad8572d1fdd2c25f68' into gingerbread-plus-aosp

* commit 'aeb2c62e7669f004512c42ad8572d1fdd2c25f68':
  Fix several audio effects problems.
 2010-09-28 16:42:14 -07:00
Eric Laurent
aeb2c62e76 Merge "Fix several audio effects problems." into gingerbread 2010-09-28 16:38:22 -07:00