summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Implement methods introduced in draft #5 NFC API.Sylvain Fonteneau2010-10-175-22/+163
| | | | | | | The API is implemented but still do not support muli-protocol tags. Change-Id: I5cea3eec7b5b92e8e1106d4660e2400e4433e943 Signed-off-by: Nick Pelly <npelly@google.com>
* Implement issue #3094621 and #3094609 - wipe sd cardDianne Hackborn2010-10-169-18/+325
| | | | | | | | | | | | | 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
* Set default heap size to 5MB.Romain Guy2010-10-151-0/+2
| | | | Change-Id: Iac8ae3cbe6b431767776653c9f430983172cfb6f
* Merge "Fix issue 3098880." into gingerbreadEric Laurent2010-10-151-0/+4
|\
| * Fix issue 3098880.Eric Laurent2010-10-151-0/+4
| | | | | | | | | | | | | | Test value returned by getJNIEnv() in android_media_AudioSystem_error_callback() and exit if NULL. Change-Id: If30e5a05c585f34c66e6ad8cece3f7b46ef4be8e
* | Merge "range checking for tnf" into gingerbreadNick Kralevich2010-10-151-0/+4
|\ \
| * | range checking for tnfNick Kralevich2010-10-151-0/+4
| | | | | | | | | | | | Change-Id: Ie94acd598d3b8b349ffa98cef0f64ef8fa9f9612
* | | Merge "Import revised translations DO NOT MERGE" into gingerbreadKenny Root2010-10-1520-601/+601
|\ \ \
| * | | Import revised translations DO NOT MERGEKenny Root2010-10-1520-601/+601
| | | | | | | | | | | | | | | | Change-Id: Ifa466bf152e7331f2ea16e925e714690d9034f3a
* | | | Merge "Fix a native crash in input dispatcher when windows are removed." ↵Jeff Brown2010-10-151-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | into gingerbread
| * | | | Fix a native crash in input dispatcher when windows are removed.Jeff Brown2010-10-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 3101826 Change-Id: I040838600a6105c8d9f3235025dc0a7b5b27da2e
* | | | | Merge "Add support for secure system overlays. (DO NOT MERGE)" into gingerbreadJeff Brown2010-10-156-7/+27
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | Add support for secure system overlays. (DO NOT MERGE)Jeff Brown2010-10-156-7/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds a new window type for secure system overlays created by the system itself from non-secure system overlays that might be created by applications that have the system alert permission. Secure views ignore the presence of secure system overlays. Bug: 3098519 Change-Id: I8f8398f4fdeb0469e5d71124c21bedf121bd8c07
* | | | Merge "DO NOT MERGE - Quick fix for menu background for SDK/emulator (mdpi)" ↵Justin Ho2010-10-152-0/+0
|\ \ \ \ | |/ / / |/| | | | | | | into gingerbread
| * | | DO NOT MERGE - Quick fix for menu background for SDK/emulator (mdpi)Justin Ho2010-10-152-0/+0
| | | | | | | | | | | | | | | | Change-Id: I5f86585618b008b727de2236b75b357c87840ecf
* | | | Revise some javadocs for NFC; add package descriptionScott Main2010-10-158-68/+104
| | | | | | | | | | | | | | | | Change-Id: I60223e2ad24af98b3b16a74960365185096ae614
* | | | Merge "DO NOT MERGE" into gingerbreadShimeng (Simon) Wang2010-10-151-0/+8
|\ \ \ \
| * | | | DO NOT MERGEShimeng (Simon) Wang2010-10-151-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add wrapper method for native JNI call. This is to check whether a given mimeType is supported in Android media framework. issue: 3101402 Change-Id: Ic8b412c045c36113c830296dacb42ed5f7371c9d
* | | | | Merge "Include the framework copy of the OpenMAX headers instead of ↵Andreas Huber2010-10-1517-20/+23
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | referencing external/opencore." into gingerbread
| * | | | | Include the framework copy of the OpenMAX headers instead of referencing ↵Andreas Huber2010-10-1517-20/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | external/opencore. Change-Id: I762f59acf5e1f770e4d7c2d89af362bfffebefa6 related-to-bug: 3101573
* | | | | | Merge "Check-in of a copy of the Khronos OpenMAX headers formerly included ↵Andreas Huber2010-10-1510-0/+6937
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | from external/opencore." into gingerbread
| * | | | | Check-in of a copy of the Khronos OpenMAX headers formerly included from ↵Andreas Huber2010-10-1510-0/+6937
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | external/opencore. Change-Id: Ie2ecf9558d4ee80cb5a2bbe66ad49f2165a7b09c related-to-bug: 3101573
* | | | | | Merge "Work on issue #3101415: Crespo apps seem to have their UID changed ↵Dianne Hackborn2010-10-1511-9/+52
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | over time." into gingerbread
| * | | | | | Work on issue #3101415: Crespo apps seem to have their UID changed over time.Dianne Hackborn2010-10-1511-9/+52
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | fsync! Change-Id: Ie6c5397202579935ac69bf61d3e7b3081ecf269c
* | | | | | Merge "fix build DO NOT MERGE" into gingerbreadIrfan Sheriff2010-10-151-1/+1
|\ \ \ \ \ \
| * | | | | | fix build DO NOT MERGEIrfan Sheriff2010-10-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | my local change and gerritt were out of sync Change-Id: Ie581425f0290bb78b289584067b70507d82d5a57
* | | | | | | Merge "DO NOT MERGE - Updated media transport controls (hdpi and mdpi)" into ↵Justin Ho2010-10-154-0/+0
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | / / | | |_|_|/ / | |/| | | | gingerbread
| * | | | | DO NOT MERGE - Updated media transport controls (hdpi and mdpi)Justin Ho2010-10-154-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9b91c4bc13909017f433724e7c21de0db690eff6
* | | | | | Merge "DO NOT MERGE" into gingerbreadShimeng (Simon) Wang2010-10-151-1/+5
|\ \ \ \ \ \
| * | | | | | DO NOT MERGEShimeng (Simon) Wang2010-10-151-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid sending false orientation event to webkit. issue: 3101311 Change-Id: I819f046a119ad108256d6cece3f2e6ec1d643145
* | | | | | | Merge "Line up textfield with WebTextView more often." into gingerbreadLeon Scroggins2010-10-151-10/+23
|\ \ \ \ \ \ \
| * | | | | | | Line up textfield with WebTextView more often.Leon Scroggins2010-10-151-10/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug:3097705 Line up when the selection changes (such as when the selection is altered by the context menu) or when the WebTextView scrolls. Change-Id: Ia491064548131be1ac6f4d701a43cd8419a25367
* | | | | | | | Merge "fetch macaddr right after supplicant connection" into gingerbreadIrfan Sheriff2010-10-151-0/+6
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | / | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | fetch macaddr right after supplicant connectionIrfan Sheriff2010-10-151-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 3072163 Change-Id: I13466e3bc73a1a95d42faf17650fad4383f7e5b2
* | | | | | | am fda5b19c: Merge "docs: fix typo; surface dev guide link in package ↵Scott Main2010-10-152-8/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | description" into froyo Merge commit 'fda5b19c757645e957c2a224f269aefe39fb1e1c' into gingerbread * commit 'fda5b19c757645e957c2a224f269aefe39fb1e1c': docs: fix typo; surface dev guide link in package description
| * \ \ \ \ \ \ Merge "docs: fix typo; surface dev guide link in package description" into froyoScott Main2010-10-152-8/+9
| |\ \ \ \ \ \ \
| | * | | | | | | docs: fix typo; surface dev guide link in package descriptionScott Main2010-10-152-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2dc09bb6b79cbe3f80819d6193eb0d8a3565310d
* | | | | | | | | am 09da9609: docs: fix code snippet errorsScott Main2010-10-151-4/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '09da96099917141f2b90d53f61baa822bdd434d7' into gingerbread * commit '09da96099917141f2b90d53f61baa822bdd434d7': docs: fix code snippet errors
| * | | | | | | | docs: fix code snippet errorsScott Main2010-10-151-4/+4
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie0ef6d4e642b6f9a68bdadd3e507f9fe2dd323d9
* | | | | | | | Merge "DO NOT MERGE - Updated ADB icon" into gingerbreadJustin Ho2010-10-152-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | / / | |_|_|_|_|/ / |/| | | | | |
| * | | | | | DO NOT MERGE - Updated ADB iconJustin Ho2010-10-152-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I358ce60203746ccf38d92f71d1c684670737c97b
* | | | | | | Debug logs for issue #3101415: Apps seem to have their UID changed over time.Dianne Hackborn2010-10-152-24/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Activity manager now prints the pid doing a startActivity request. - Package manager now remembers messages about problems it has parsing packages.xml. Change-Id: I11a75aa3953dbfa5dd41cfbdf69116c764ec228f
* | | | | | | Merge "NFC: Move NFC service implementation out of system_server." into ↵Nick Pelly2010-10-1519-3012/+344
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | gingerbread
| * | | | | | NFC: Move NFC service implementation out of system_server.Nick Pelly2010-10-1519-3012/+344
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: If8f00ce8f2053acfc9319ca366d4a9c02bd396e6 Signed-off-by: Nick Pelly <npelly@google.com>
* | | | | | Revert "Update the documentation for content provider security."Nick Kralevich2010-10-151-13/+4
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 4fe4d4c91cdfa59bb8161625be85252e187667a2.
* | | | | | Merge "Update the documentation for content provider security." into gingerbreadNick Kralevich2010-10-151-4/+13
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Update the documentation for content provider security.Chris Palmer2010-10-121-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this documentation fix, developers will not know that apps on pre-Gingercomb devices will inadvertantly export their content providers. With knowledge of the solid workaround, they can make their apps secure. Change-Id: I1f096aff19500cd3d3fd2955a9dec59d8e7c6a73
* | | | | | Merge "Make sure we cache the sampleTable again if using the caching ↵Andreas Huber2010-10-151-1/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | datasource." into gingerbread
| * | | | | | Make sure we cache the sampleTable again if using the caching datasource.Andreas Huber2010-10-151-1/+3
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QA-impact: This fixes http streaming again which I broke about 2 days ago. The previously observed symptoms were stuttering playback of http streams (think YouTube) after a certain playback position. Change-Id: I14050e3522ecd62c90d29310efdf508fdd2e87b5 related-to-bug: 3098873
* | | | | | Merge "Don't crash on null Vibrator during reboot." into gingerbreadBrad Fitzpatrick2010-10-152-3/+21
|\ \ \ \ \ \ | |/ / / / / |/| | | | |