Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
38,903 Commits 3 Branches 0 Tags
409a57504fe6bb915d85f1091267206f7e0dfdcd
Commit Graph

38903 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Steve Block
856f2859e8 Fix some bugs in DumpRenderTree2 when forming HTML diffs 
Change-Id: Id98c1b7dde1961c2dab4214a36ad43916baf8011
 2010-09-29 18:51:42 +01:00
Steve Block
fd487ad1b8 Use the empty string when expected text results are missing in DumpRenderTree2 
Change-Id: I204583ecc9c6a8017349124d5813c693c7f00dc9
 2010-09-29 18:51:42 +01:00
Steve Block
f460dd4219 Fix a bug with the expected result path in DumpRenderTree2 
If we fail to read from any of the possible expected result paths, we should
not record an expected result path.

Change-Id: Ica96b791c14a7755154be4ec9480be4d13f47a19
 2010-09-29 18:51:42 +01:00
Steve Block
fdffee828c Correctly implement EventSender mouse methods in DumpRenderTree2 
This is taken from a similar change to DumpRenderTree in
https://android-git.corp.google.com/g/62449

Change-Id: I01418100ace1cf1ccfbb4fd28d72b99b54e0c140
 2010-09-29 18:51:41 +01:00
Steve Block
c0f90a8f93 Trim empty lines when comparing text results in DumpRenderTree2 
Change-Id: I94c9de8e6131f6b60456700e9d5a3b27c8c9d1c3
 2010-09-29 18:51:41 +01:00
Steve Block
49aa65aa46 Reclassify failing multi-touch tests in DumpRenderTree ignore list 
Change-Id: I95c94354a4d4f38583251a2d5d1a7ab4cb554e00
 2010-09-29 18:51:41 +01:00
Steve Block
9d59429eaa Merge "Update WebView useragent string for merge to WebKit r67908" 2010-09-29 10:42:30 -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
Steve Block
f5c4e62af8 Update WebView useragent string for merge to WebKit r67908 
Change-Id: If09628fcc8c8e408d3e280f57c534cf87bcc997f
 2010-09-29 17:55:32 +01:00
Alex Sakhartchouk
4378f11755 More robust attribute binding 
Adding attribute and uniform debug logging.
Checking to see if aniso filtering is available.

Change-Id: I2ed9d166ed7ff3df971d7af18b7a33f4e3ade928
 2010-09-29 09:49:13 -07:00
Iain Merrick
5f421a5678 Update DumpRenderTree test expectations for fast/encoding 
New layout tests added in https://android-git.corp.google.com/g/70926

Change-Id: I3c12f44d2c283e8b1da1c10975d6e4dd567889f8
 2010-09-29 16:30:10 +01:00
Owen Lin
0ab9851308 Fix a initialization bug in BitmapRegionDecoder. 
Change-Id: I6c1151fd34970a84d4de52d664d9a5dc464892c5
 2010-09-29 23:12:44 +08: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
Ulf Rosdahl
39357708b7 Corrected visibility reporting error in WindowManager 
Correction for the error:
When a window is done animating and about to be destroyed,
it is still checked for visibility in the method
updateReportedVisibilityLocked in the WindowManager.
In the case where other windows are ready to be reported as
visible, this, not yet destroyed window which has the state
not visible, will prevent the visibility report message from
being sent.

Change-Id: I9e307a678a204f0883ccd78c2645c373d3f81066
 2010-09-29 12:34:38 +02: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
f46731ddde am 10b15c08: am d6877fa4: Merge "AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead." into gingerbread 
Merge commit '10b15c08bb8ffb1fddeac2e79c882a23ffe7a3de'

* commit '10b15c08bb8ffb1fddeac2e79c882a23ffe7a3de':
  AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead.
 2010-09-28 21:55:35 -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
5d5bf48c98 am 05e11050: am a25eabad: Merge "Revert "Check for the DEVICE_POWER permission in userActivity."" into gingerbread 
Merge commit '05e110506156a1b782232833b907afb428802b69'

* commit '05e110506156a1b782232833b907afb428802b69':
  Revert "Check for the DEVICE_POWER permission in userActivity."
 2010-09-28 20:21:48 -07: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
Jaikumar Ganesh
d9bb688c91 Update code for new BT APIs. 
The status bar shouldn't be knowing details like profiles etc.
It just needs to know whether we are connected to some device or not.

Change-Id: Ibaabf4581a134045b33069a2ea55a13032f1b357
 2010-09-28 20:03:16 -07:00
Jaikumar Ganesh
82aa7f017d Update code for new BT APIs. 
Change-Id: Idf806cba8160e6075e33e26ee9936663b850e96c
 2010-09-28 20:02:58 -07:00
Jaikumar Ganesh
7440fc2e0e Wifi: Update code for new BT Apis. 
Change-Id: I1deb0a9a1533958cdb79179bebd2d3b435b0b07c
 2010-09-28 20:02:33 -07:00
Jaikumar Ganesh
3f03496ad9 Update code for new BT APIs. 
Change-Id: I53aa17b6c2a5ee50d47df91960a7f997eb7b1107
 2010-09-28 20:02:12 -07:00
Jaikumar Ganesh
96a79830ea Update code for new BT public APIs. 
Change-Id: Id730fb6226db59f3a0416111c4790653c2fccb0b
 2010-09-28 20:00:53 -07:00
Jaikumar Ganesh
c9cc487b7b Merge "New public APIs for BluetoothA2dp and BluetoothHeadset profiles." 2010-09-28 19:56:05 -07:00
Jaikumar Ganesh
62c37efc9e New public APIs for BluetoothA2dp and BluetoothHeadset profiles. 
Change-Id: I1cc4b109542dfd62473cb95797c8c3d0d15725f4
 2010-09-28 19:53:53 -07:00
Chia-chi Yeh
dcf2be6cf6 am ebfe5632: am e006e4d2: Merge changes Iae1913fb,I38dbefef into gingerbread 
Merge commit 'ebfe5632db275a89b49ab828064ba90db59702cf'

* commit 'ebfe5632db275a89b49ab828064ba90db59702cf':
  RTP: Enable GSM codec.
  RTP: Refactor out G711 codecs into another file.
 2010-09-28 19:47:07 -07: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