Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,511 Commits 3 Branches 0 Tags
51ed8aa9d24b338cbdf9a33d1171454ec62f97da
Commit Graph

32511 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gilles Debunne
51ed8aa9d2 am ed1cf3da: am f0fa2674: Merge "New assets: wifi signal 1, no sim card." into gingerbread 
Merge commit 'ed1cf3dab59d7af51240269308007546a816b1f4'

* commit 'ed1cf3dab59d7af51240269308007546a816b1f4':
  New assets: wifi signal 1, no sim card.
 2010-09-30 11:00:19 -07:00
Eric Fischer
8b75965525 am 97708b19: am 5f0c8fe6: Merge "Split strings with SD card references into variations." into gingerbread 
Merge commit '97708b19c564294182558d757a871abc892d6975'

* commit '97708b19c564294182558d757a871abc892d6975':
  Split strings with SD card references into variations.
 2010-09-30 11:00:01 -07:00
Chia-chi Yeh
5a7c6d298e am 1c2eab2d: am 955ab37c: Merge "RTP: Enable GSM-EFR codec." into gingerbread 
Merge commit '1c2eab2d86faa9c647a9893f761a50cfa28d9d57'

* commit '1c2eab2d86faa9c647a9893f761a50cfa28d9d57':
  RTP: Enable GSM-EFR codec.
 2010-09-30 10:59:48 -07:00
Stephen Hines
ec29213b69 Merge "Fix clear() operation for rsScriptC." 2010-09-30 10:57:17 -07:00
Owen Lin
e224fabb2c Fix segfault when tring to throw IOException. 
Change-Id: I530cc4409ba4ca17cec933afad077c5f60ba554f
 2010-09-30 16:56:03 +08:00
Owen Lin
a9164cbb30 Merge "Fix a initialization bug in BitmapRegionDecoder." 2010-09-29 22:57:08 -07:00
Chia-chi Yeh
8ff0722453 am 1254b9c5: am cd386649: Merge "RTP: Revise the workaround of private addresses and fix bugs." into gingerbread 
Merge commit '1254b9c534c5f027f8928fbb3e743e57d55bd13d'

* commit '1254b9c534c5f027f8928fbb3e743e57d55bd13d':
  RTP: Revise the workaround of private addresses and fix bugs.
 2010-09-29 22:13:44 -07:00
Joe Onorato
d4c2a2f187 am 198297b4: am f01a8730: Merge "Revert "Revert "Check for the DEVICE_POWER permission in userActivity.""" into gingerbread 
Merge commit '198297b495d975cd4889f5136cd69368bd319eed'

* commit '198297b495d975cd4889f5136cd69368bd319eed':
  Revert "Revert "Check for the DEVICE_POWER permission in userActivity.""
 2010-09-29 22:13:21 -07:00
Roy West
da5917ec35 am b4a28f24: (-s ours) am d146c233: Merge "Partial fix to bug 2992589: Edit dev admin strings." into gingerbread 
Merge commit 'b4a28f24263fbccce4b77b47c2f3ddac63a8a75f'

* commit 'b4a28f24263fbccce4b77b47c2f3ddac63a8a75f':
  Partial fix to bug 2992589: Edit dev admin strings.
 2010-09-29 22:12:19 -07:00
Gil Dobjanschi
a1ffc6f1ed Merge "Added ability to instantiate various implementations of the VideoEditor" 2010-09-29 19:47:38 -07:00
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
Gil Dobjanschi
048449ebfa Added ability to instantiate various implementations of the VideoEditor 
Change-Id: I5b09afafff1c009bada4f49a5568286fe3cd9aef
 2010-09-29 16:58:21 -07:00
Stephen Hines
01f0ad7c13 Fix clear() operation for rsScriptC. 
- This removes a memory leak where some elements were not getting tracked
  properly (and then triggering an assert when a context is destroyed).
- Convert ScriptCState to use a tracked object reference for mScript.
- Add a missing clear to FontState.
- Clean up synchronization in RSTest so that our graphics context outlives
  any subtest context.

Change-Id: I0d5768c4d2f8810dd1ae2f68b1edd7e150f382fd
 2010-09-29 16:58:17 -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
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
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
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