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

32480 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Winson Chung
4e2affec16 Merge "Fixing issue where notifyDataSetChanged was not properly being called while not loading items." 2010-09-29 18:03:07 -07:00
Winson Chung
6364f2bbe5 Fixing issue where notifyDataSetChanged was not properly being called while not loading items. 
Change-Id: I46bb30a5a95576891f11873b214f5c760f5d1757
 2010-09-29 18:01:15 -07:00
Kenny Root
ea7ee3f4d3 am 8bd545ab: am 212d81a0: Merge "Move all the permissions check up for unmount" into gingerbread 
Merge commit '8bd545ab4f7e75634c970b50ed15c20858d6ac0c'

* commit '8bd545ab4f7e75634c970b50ed15c20858d6ac0c':
  Move all the permissions check up for unmount
 2010-09-29 17:17:22 -07:00
Alex Sakhartchouk
3ebb1ba50c Merge "More robust attribute binding Adding attribute and uniform debug logging. Checking to see if aniso filtering is available." 2010-09-29 15:48:51 -07:00
Romain Guy
e17c054d34 Merge "Add display lists caching." 2010-09-29 13:37:37 -07:00
Romain Guy
b051e895cc Add display lists caching. 
Change-Id: Iac3a248a81ed8cb076a83ef9d186b8ebba685b4c
 2010-09-29 13:29:04 -07:00
Nick Pelly
4715bd91f5 resolved conflicts for merge of f4c3b7e9 to master 
Change-Id: Idcdc521144f3072058b2bb6cb383e42c852e64f4
 2010-09-29 12:20:51 -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
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
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
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 059f8f93e6e89f80dfb85cfdbcd3bce64c7b1e2c.
 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
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
Jeff Hamilton
d362391b96 Merge "Add a Settings table to BrowserContract." 2010-09-28 19:15:44 -07:00
Jim Miller
8a43c5bb30 Merge "Several improvements to RecentActivities:" 2010-09-28 18:46:01 -07:00
Joe Onorato
eb6801c4e3 Revert "Fix 3041579 overscroll effect in notification area looks strange" 
This reverts commit ab014a03a06a0044106ed9ad612b11e8197c8734.
 2010-09-28 18:33:46 -07:00
Dianne Hackborn
2a32c493ce am cb51c0c7: am 3e94b94f: Merge "Remove old location classes." into gingerbread 
Merge commit 'cb51c0c7b155a5141a51fc4d3e57792da7e89cc4'

* commit 'cb51c0c7b155a5141a51fc4d3e57792da7e89cc4':
  Remove old location classes.
 2010-09-28 18:24:48 -07: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
Kenny Root
bff405f910 resolved conflicts for merge of d8e8186c to master 
Change-Id: Ica3f6cd958717ea7033cab8b4bf9cd3425c1e1c5
 2010-09-28 18:16:50 -07:00
Gil Dobjanschi
e63f20b5fe Merge "Save overlays to XML" 2010-09-28 18:00:55 -07:00
Gil Dobjanschi
5665fd6ac2 Save overlays to XML 
Change-Id: I549c40b55a85022136dbd4899cc0d2d4da6e33de
 2010-09-28 17:54:09 -07:00