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

34327 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gilles Debunne
d040f95190 Temporarily removed call to drawCircle in BulletSpan. 
Replaced by a drawPath. drawCircle is not supported by openGL for now.

Bug: 3101235

Change-Id: I0c050097e3cb87f9d4c703062d4250d08247c99e
 2010-10-18 15:29:02 -07:00
Romain Guy
dbde527e9b Merge "Small cleanup." 2010-10-18 15:14:16 -07:00
Romain Guy
2665b85b2b Small cleanup. 
Change-Id: I0e5b9154a2d93af793d62f462d68cb7c6c3f6d75
 2010-10-18 15:11:50 -07:00
Romain Guy
ab1c57593f Merge "Use VBOs to render most geometries." 2010-10-18 14:58:25 -07:00
Romain Guy
03750a067e Use VBOs to render most geometries. 
Change-Id: I4360dc4fe5693ab425450c107282b2c22db4dca7
 2010-10-18 14:49:19 -07:00
Gilles Debunne
651d813b3b Merge "Fix for text selection at end of line." 2010-10-18 14:10:44 -07:00
Brian Carlstrom
1b04ed793a Merge "Extended android.os.Debug.dumpNativeHeap to include /proc/self/maps contents" 2010-10-18 13:58:25 -07:00
Gilles Debunne
d7d3ad477c Fix for text selection at end of line. 
Bug 3106935

Change-Id: Ieee7f50385baae359db45472ffc800a01956cb40
 2010-10-18 13:20:53 -07:00
Kenny Root
027610a76e resolved conflicts for merge of 964eb438 to master 
Change-Id: I0c54d6b88356d8734d7f51234b0114434414502e
 2010-10-18 13:03:35 -07:00
Stephen Hines
afb05db237 Merge "Adding new unit test for rsDebug()." 2010-10-18 12:27:54 -07:00
Steve Block
16b8bf0793 Merge changes I4a85ff69,Idba4acc2 
* changes:
  Fix DumpRenderTree2 script to allow only one path to be specified
  Improve error handling in DumpRenderTree2 scripts
 2010-10-18 12:23:28 -07:00
Steve Block
fc16915d32 Fix DumpRenderTree2 script to allow only one path to be specified 
Change-Id: I4a85ff69554a9c76af0b2deea747b8414660fee2
 2010-10-18 20:20:42 +01:00
Steve Block
ae47ce0046 Improve error handling in DumpRenderTree2 scripts 
Change-Id: Idba4acc22dd037a001ea5c05cbd6a29292f6de2c
 2010-10-18 20:20:41 +01:00
Stephen Hines
e2a26e155b Adding new unit test for rsDebug(). 
Change-Id: I8a354e40640b83aca3148aa0cf13d3335ff37dd4
 2010-10-18 12:17:03 -07:00
Stephen Hines
2cd6f4709c Merge "Add support for rsDebug with 64-bit types." 2010-10-18 11:45:16 -07:00
Adam Powell
a6fdc38b24 Merge "Hide ButtonGroup - not ready for public consumption." 2010-10-18 11:42:20 -07:00
Adam Powell
0cd8122f75 Hide ButtonGroup - not ready for public consumption. 
Change-Id: I9afeac135c1d7a6115789ed2a2f43ad9aa9d4fcf
 2010-10-18 11:11:19 -07:00
Steve Block
1f696ffcdd Merge "Rename DeviceOrientationManager to DeviceMotionAndOrientationManager" 2010-10-18 10:40:47 -07:00
Romain Guy
65202242de am 157fa0ac: am 77c011ba: Set default heap size to 5MB. 
Merge commit '157fa0aca55b8e4747f00d2b729e5e361dea7ddb'

* commit '157fa0aca55b8e4747f00d2b729e5e361dea7ddb':
  Set default heap size to 5MB.
 2010-10-18 10:33:17 -07:00
Eric Laurent
dd70133ceb am 1a326022: am 208bb08a: Merge "Fix issue 3098880." into gingerbread 
Merge commit '1a32602212bad146990418094b0ffcab05c5eb7b'

* commit '1a32602212bad146990418094b0ffcab05c5eb7b':
  Fix issue 3098880.
 2010-10-18 10:32:05 -07:00
Nick Kralevich
1012f1f148 am 21059b63: am 5e7b7cd6: Merge "range checking for tnf" into gingerbread 
Merge commit '21059b637c30cbecbc4eb7e69481a5e582d0ba2b'

* commit '21059b637c30cbecbc4eb7e69481a5e582d0ba2b':
  range checking for tnf
 2010-10-18 10:31:58 -07:00
Kenny Root
46d2116125 am 097ea0bb: (-s ours) am dc83fd5a: Merge "Import revised translations DO NOT MERGE" into gingerbread 
Merge commit '097ea0bb508e3c6e9253e3c50dc9a6704681ce43'

* commit '097ea0bb508e3c6e9253e3c50dc9a6704681ce43':
  Import revised translations DO NOT MERGE
 2010-10-18 10:31:51 -07:00
Jeff Brown
195226a3c8 am 9e0e0543: am 36e65ffd: Merge "Fix a native crash in input dispatcher when windows are removed." into gingerbread 
Merge commit '9e0e054388689fd618c84a283c28ee484477b44d'

* commit '9e0e054388689fd618c84a283c28ee484477b44d':
  Fix a native crash in input dispatcher when windows are removed.
 2010-10-18 10:31:43 -07:00
Jeff Brown
d21de4b921 am 6ba052b4: (-s ours) am c1a564b1: Merge "Add support for secure system overlays. (DO NOT MERGE)" into gingerbread 
Merge commit '6ba052b4847d85831c38c9b8e2942cef4987e55b'

* commit '6ba052b4847d85831c38c9b8e2942cef4987e55b':
  Add support for secure system overlays.  (DO NOT MERGE)
 2010-10-18 10:31:38 -07:00
Justin Ho
1a2c6089f8 am bce520e6: (-s ours) am b3c2d480: Merge "DO NOT MERGE - Quick fix for menu background for SDK/emulator (mdpi)" into gingerbread 
Merge commit 'bce520e6460e712c0985f12cf212e2d72fd1b9e4'

* commit 'bce520e6460e712c0985f12cf212e2d72fd1b9e4':
  DO NOT MERGE - Quick fix for menu background for SDK/emulator (mdpi)
 2010-10-18 10:31:25 -07:00
Scott Main
5bb9e621e1 am 20856f71: am c9f7890a: Revise some javadocs for NFC; add package description 
Merge commit '20856f71d971a85a25307941055fb9543adcdc68'

* commit '20856f71d971a85a25307941055fb9543adcdc68':
  Revise some javadocs for NFC; add package description
 2010-10-18 09:31:09 -07:00
Shimeng (Simon) Wang
246d8b7d15 am 53820a96: (-s ours) am 7ef6834e: Merge "DO NOT MERGE" into gingerbread 
Merge commit '53820a9694a8f3c6564edb6caf90350e96b57567'

* commit '53820a9694a8f3c6564edb6caf90350e96b57567':
  DO NOT MERGE
 2010-10-18 09:30:57 -07:00
Jean-Baptiste Queru
613ef2efa3 Fix build (bad merge) 
Bug: 3101573
Change-Id: I2c0518e31f39c9a6e88d86cc468653bbcb5be05e
 2010-10-18 08:47:03 -07:00
Jean-Baptiste Queru
ac2a88061d Remove one more opencore include path 
Bug: 3101573
Change-Id: Id60845e4c46523e910504fe6e707f8247a3b6102
 2010-10-18 08:41:14 -07:00
Jean-Baptiste Queru
5582cc3a68 Merge fb474872 from gingerbread-plus-aosp 
Change-Id: I1bbb845a86a7b7df44ea175df3af22e5f47c44e3
 2010-10-18 08:33:38 -07:00
Andreas Huber
5b9fd116f9 am 746c6a1c: am ff7a7a45: Merge "Check-in of a copy of the Khronos OpenMAX headers formerly included from external/opencore." into gingerbread 
Merge commit '746c6a1c6d70769ee4b08b9a7b87d0c5aa65c2e4'

* commit '746c6a1c6d70769ee4b08b9a7b87d0c5aa65c2e4':
  Check-in of a copy of the Khronos OpenMAX headers formerly included from external/opencore.
 2010-10-18 08:05:09 -07:00
Dianne Hackborn
875ecaa511 am 13e46665: am 736f5ec4: Merge "Work on issue #3101415: Crespo apps seem to have their UID changed over time." into gingerbread 
Merge commit '13e46665ff69c1a37880762d7d611aacdf02dac7'

* commit '13e46665ff69c1a37880762d7d611aacdf02dac7':
  Work on issue #3101415: Crespo apps seem to have their UID changed over time.
 2010-10-18 08:04:47 -07:00
Irfan Sheriff
dab540e6f8 am cf66f587: (-s ours) am 4e08a985: Merge "fix build DO NOT MERGE" into gingerbread 
Merge commit 'cf66f587514a935c290c8c9558243a48ba0243eb'

* commit 'cf66f587514a935c290c8c9558243a48ba0243eb':
  fix build DO NOT MERGE
 2010-10-18 08:04:35 -07:00
Justin Ho
f58546da65 am e35cd5f5: (-s ours) am 73dbdc35: Merge "DO NOT MERGE - Updated media transport controls (hdpi and mdpi)" into gingerbread 
Merge commit 'e35cd5f569fe760385198f485e4610ad13033dd3'

* commit 'e35cd5f569fe760385198f485e4610ad13033dd3':
  DO NOT MERGE - Updated media transport controls (hdpi and mdpi)
 2010-10-18 08:04:28 -07:00
Shimeng (Simon) Wang
8b1373fbed am d687504e: (-s ours) am 31e4d66a: Merge "DO NOT MERGE" into gingerbread 
Merge commit 'd687504e73b9d4a41b7ba28de864b4f3ab5c48e4'

* commit 'd687504e73b9d4a41b7ba28de864b4f3ab5c48e4':
  DO NOT MERGE
 2010-10-18 08:04:08 -07:00
Leon Scroggins
e8aa954e46 resolved conflicts for merge of 46ca6a22 to master 
Change-Id: I8302fa2f5acf91fb3793e5978a5dc63ac8f3a457
 2010-10-18 10:09:07 -04:00
Brian Carlstrom
393b84c137 Extended android.os.Debug.dumpNativeHeap to include /proc/self/maps contents 
Change-Id: I86da98bc48111007d8226d8d0dbc7be470bde877
 2010-10-17 23:40:43 -07:00
Irfan Sheriff
7a1af97689 am cf054d1c: (-s ours) am f8834f87: Merge "fetch macaddr right after supplicant connection" into gingerbread 
Merge commit 'cf054d1cf605d46d3b2e459c28fe4516df104a39'

* commit 'cf054d1cf605d46d3b2e459c28fe4516df104a39':
  fetch macaddr right after supplicant connection
 2010-10-17 22:02:32 -07:00
Nick Pelly
cd0e839a24 NFC: Move NFC service implementation out of system_server. 
NFC service is now an application service in packages/apps/Nfc.

NFC service is registered through ServiceManager.addService(), and the proxy
object NfcAdapter obtains a handle to it through ServiceManager.getService().

**Important** Had to add new symbols AID_NFC / NFC_UID / android.uid.nfc and
modify service_manager.c, Process.java and PackageManagerService.java in order
to force the com.android.nfc process to take a fixed uid, so that it can use
ServiceManager.addService().

Most of the JNI has moved to packages/apps/Nfc/jni. However NdefRecord and
NdefMessage require some in-process native code, so android_com_NdefMessage.cpp
and android_com_NdefRecord.cpp stay in frameworks/base/core/jni. They link to
a very small library libnfc_ndef.so that implements NDEF message parsing. This
has been added to core.mk so all devices (even without NFC hardware) can work
with NDEF data.

Bug: 3041259
Bug: 3097445
Change-Id: If7f00cd8f2053acfc9319ca366d4a9c02bd396e6
Signed-off-by: Nick Pelly <npelly@google.com>
 2010-10-17 18:35:29 -07:00
Scott Main
dbb78f0e4e am 81df9841: am 2c1dab44: am fda5b19c: Merge "docs: fix typo; surface dev guide link in package description" into froyo 
Merge commit '81df9841c64e417fe2adfab0e8d694af09e07c0d'

* commit '81df9841c64e417fe2adfab0e8d694af09e07c0d':
  docs: fix typo; surface dev guide link in package description
 2010-10-17 13:49:45 -07:00
Scott Main
2d8933879c am b2bd4700: am 7f3addf3: am 09da9609: docs: fix code snippet errors 
Merge commit 'b2bd470010279fe45e2848aa8cd0b3ad6f6ca800'

* commit 'b2bd470010279fe45e2848aa8cd0b3ad6f6ca800':
  docs: fix code snippet errors
 2010-10-17 13:49:35 -07:00
Justin Ho
2b7b7c1543 am 92e0fd6c: (-s ours) am d3643668: Merge "DO NOT MERGE - Updated ADB icon" into gingerbread 
Merge commit '92e0fd6ce20a111e9ad82b5b252b892e2b971b98'

* commit '92e0fd6ce20a111e9ad82b5b252b892e2b971b98':
  DO NOT MERGE - Updated ADB icon
 2010-10-17 13:49:27 -07:00
Dianne Hackborn
1769256966 am 10d48f26: am efb58101: Debug logs for issue #3101415: Apps seem to have their UID changed over time. 
Merge commit '10d48f26e72dc7978ae683e8f99cc71409eb75ef'

* commit '10d48f26e72dc7978ae683e8f99cc71409eb75ef':
  Debug logs for issue #3101415: Apps seem to have their UID changed over time.
 2010-10-17 13:49:16 -07:00
Jean-Baptiste Queru
7247cfa9cd am 36e7790b: (-s ours) Merge a851d8d0 from gingerbread 
Merge commit '36e7790b6b3c2c36c67fbe5dc2e2313cdd537349'

* commit '36e7790b6b3c2c36c67fbe5dc2e2313cdd537349':
  NFC: Move NFC service implementation out of system_server.
 2010-10-17 13:49:03 -07:00
Dianne Hackborn
964eb4389b am 42499170: Implement issue #3094621 and #3094609 - wipe sd card 
Merge commit '424991704b5fb7a64f6cf0fcc3f4b1aabbf2a2e0' into gingerbread-plus-aosp

* commit '424991704b5fb7a64f6cf0fcc3f4b1aabbf2a2e0':
  Implement issue #3094621 and #3094609 - wipe sd card
 2010-10-16 16:51:13 -07:00
Dianne Hackborn
424991704b Implement issue #3094621 and #3094609 - wipe sd card 
3094621: add "wipe sd card" option to factory data reset
3094609: collapse unmount/format into one command

Also since we have decided that it is important to consider
the Crespo storage as internal storage, DevicePolicyManager
gets a new API to be able to wipe it.  (No big deal, since
all of the work for this is now done in the implementation
of the new UI.)

Change-Id: I32a77c410f710a87dcdcbf6586c09bd2e48a8807
 2010-10-16 16:32:15 -07:00
Nick Kralevich
5ac4fe5113 am 6bc34da8: am 612ebb92: Revert "Update the documentation for content provider security." 
Merge commit '6bc34da8acf26c8e70325719fe43eaf22489809d'

* commit '6bc34da8acf26c8e70325719fe43eaf22489809d':
  Revert "Update the documentation for content provider security."
 2010-10-16 09:43:23 -07:00
Nick Kralevich
8bc68360b6 am 86052a87: am 66f1c459: Merge "Update the documentation for content provider security." into gingerbread 
Merge commit '86052a87409e7ceac654ffebbb9bcfce1597c5d8'

* commit '86052a87409e7ceac654ffebbb9bcfce1597c5d8':
  Update the documentation for content provider security.
 2010-10-16 09:14:21 -07:00
Andreas Huber
8f9486c1ad am cb90947b: am e1f3976b: Merge "Make sure we cache the sampleTable again if using the caching datasource." into gingerbread 
Merge commit 'cb90947bf8ed2c898c1b7e529dd0c99d112ed611'

* commit 'cb90947bf8ed2c898c1b7e529dd0c99d112ed611':
  Make sure we cache the sampleTable again if using the caching datasource.
 2010-10-16 09:14:06 -07:00
Brad Fitzpatrick
da3fe88b2d am 33476b2d: am feebaf35: Merge "Don\'t crash on null Vibrator during reboot." into gingerbread 
Merge commit '33476b2db82b5a7f025eb9625fa56f94290e97f4'

* commit '33476b2db82b5a7f025eb9625fa56f94290e97f4':
  Don't crash on null Vibrator during reboot.
 2010-10-16 09:13:39 -07:00