summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Expose a function to set OpenGL Trace level."Siva Velusamy2012-03-122-2/+18
|\
| * Expose a function to set OpenGL Trace level.Siva Velusamy2012-03-092-2/+18
| | | | | | | | | | | | | | This patch adds a function setGlDebugLevel() to libEGL, and exposes it to the Java layer at android.opengl.GLUtils.enableTracing(). Change-Id: Ia5abb130bc32fcfe3ab25b0a0a5283a54c54f357
* | Merge "Fix test flakiness"Xia Wang2012-03-121-0/+5
|\ \
| * | Fix test flakinessXia Wang2012-03-121-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Disable soft AP before start the wifi stress test. If soft AP test failed with AP enabled, the wifi client can not be enabled. Change-Id: Ie6950f6b5b662727f2e811d9b81aeb0f4f7cda91
* | | Merge "Let <path-permission> block unprotected providers."Jeff Sharkey2012-03-122-110/+162
|\ \ \
| * | | Let <path-permission> block unprotected providers.Jeff Sharkey2012-03-122-110/+162
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When accessing a ContentProvider that is unprotected by top-level permissions, and caller doesn't hold a matching <path-permission> permission, revoke the default top-level access. This enables an otherwise unprotected provider to enforce permissions on specific paths. Bug: 6131916 Change-Id: Icab89f765ccd90b1acea6988b05f00877fe2c11e
* | | | Merge "Removed the include header path since it is not needed."James Dong2012-03-121-1/+0
|\ \ \ \
| * | | | Removed the include header path since it is not needed.James Dong2012-03-121-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | o related-to-bug: 6044894 Change-Id: I15aec441dc0c75804aa33fc3e7ef977f7490922d
* | | | | Merge "Fix the build"Fabrice Di Meglio2012-03-121-0/+4
|\ \ \ \ \
| * | | | | Fix the buildFabrice Di Meglio2012-03-121-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - was missing the update to current.txt Change-Id: I7bbd363f989c3deae071dce60af75a76c9477695
* | | | | | Merge "Refactor smoke tests to enable one-app-per-testcase runs"Omari Stephens2012-03-123-53/+193
|\ \ \ \ \ \
| * | | | | | Refactor smoke tests to enable one-app-per-testcase runsOmari Stephens2012-03-123-53/+193
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also creates a special TestRunner which runs one app per testcase. Note that running the smoke tests with android.test.InstrumentationTestRunner will /also/ work, but will run all of the launchable activites in a single testcase called testRunAllActivities. Bug: 6128185 Change-Id: Iffedff7e6105bbca614778a4d294d3be421f19d6
* | | | | | | Merge "Make public more RTL APIs"Fabrice Di Meglio2012-03-121-5/+2
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Make public more RTL APIsFabrice Di Meglio2012-03-121-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - LocaleUtil will help developers to get the layout direction from a Locale Change-Id: I184ebcc9c208464b20f0454e7a915426640c74f0
* | | | | | | am b0a07985: (-s ours) am 4326da7e: Merge "DO NOT MERGE Fix back button ↵Andrew Flynn2012-03-120-0/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | state issue" into ics-scoop * commit 'b0a07985b99308109d8ca8e8758caca7a43c1bb2': DO NOT MERGE Fix back button state issue
| * \ \ \ \ \ \ am 4326da7e: Merge "DO NOT MERGE Fix back button state issue" into ics-scoopAndrew Flynn2012-03-121-0/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4326da7e0d5d63bad718e9848294405971f8f9ab': DO NOT MERGE Fix back button state issue
| | * \ \ \ \ \ \ Merge "DO NOT MERGE Fix back button state issue" into ics-scoopAndrew Flynn2012-03-121-0/+2
| | |\ \ \ \ \ \ \
| | | * | | | | | | DO NOT MERGE Fix back button state issueMichael Jurka2012-03-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Back button / down chevron button (eg when you have an IME visible) was not getting synced on rotation changes Bug: 6133831 Change-Id: Iefaf3babf92898fcc87a0b14c10b037de04d84e2
* | | | | | | | | | am a443d352: (-s ours) am 53935258: Merge "DO NOT MERGE" into ics-scoopAndrew Flynn2012-03-120-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a443d3520a3b399daee7504940274e09316fe38c': DO NOT MERGE
| * | | | | | | | | am 53935258: Merge "DO NOT MERGE" into ics-scoopAndrew Flynn2012-03-1216-71/+213
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5393525809115fcf5027f292a243ebe34cfbfb7c': DO NOT MERGE
| | * | | | | | | | Merge "DO NOT MERGE" into ics-scoopAndrew Flynn2012-03-1216-71/+213
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | DO NOT MERGEDaniel Sandler2012-03-1216-71/+213
| | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | System bar now renders the back button for recents We used to render the back button in Recents itself, but that had an inconsistent visual experience. As a part of this change, add the early beginning of support for private status bar APIs for dimming navigation buttons. Bug: 3448536 Change-Id: Ie64369e3df3178178f35b56763ea96d380b6ddd4
* | | | | | | | | | am 752c5db2: am 4f50ff1e: am f4ae6aab: Allow CDMA on LTE devices to get data ↵Wink Saville2012-03-120-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | connections even if otasp is needed. * commit '752c5db2cb0bb4104dbdcd99a5ae1103b650fc66':
| * | | | | | | | | am 4f50ff1e: am f4ae6aab: Allow CDMA on LTE devices to get data connections ↵Wink Saville2012-03-120-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | even if otasp is needed. * commit '4f50ff1ee39cdb3c93d2ef88c0007195765ec1c6':
| | * | | | | | | | am f4ae6aab: Allow CDMA on LTE devices to get data connections even if otasp ↵Wink Saville2012-03-121-1/+2
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is needed. * commit 'f4ae6aabbcefe39b3c85b03729c74044f02369d4': Allow CDMA on LTE devices to get data connections even if otasp is needed.
* | | | | | | | | | am 2a0eed20: am 442612a2: am f4ae6aab: Allow CDMA on LTE devices to get data ↵Wink Saville2012-03-121-1/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | connections even if otasp is needed. * commit '2a0eed20b5828877b2db24bf49468e10c3f1b36b': Allow CDMA on LTE devices to get data connections even if otasp is needed.
| * | | | | | | | | am 442612a2: am f4ae6aab: Allow CDMA on LTE devices to get data connections ↵Wink Saville2012-03-121-1/+2
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | even if otasp is needed. * commit '442612a273981a1b21fdb2e9c19a887ab710224d': Allow CDMA on LTE devices to get data connections even if otasp is needed.
| | * \ \ \ \ \ \ \ \ am f4ae6aab: Allow CDMA on LTE devices to get data connections even if otasp ↵Wink Saville2012-03-121-1/+2
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is needed. * commit 'f4ae6aabbcefe39b3c85b03729c74044f02369d4': Allow CDMA on LTE devices to get data connections even if otasp is needed.
| | | * | | | | | | | Allow CDMA on LTE devices to get data connections even if otasp is needed.Wink Saville2012-03-101-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bearer Independent Protocol (BIP) connections as defined in ETSI TS 102 223 "Smart Cards; Card Application Toolkit (CAT) (Release 11)" need to be able to establish data connections even when not provisioned. This can occur when trying to provision on via and EVDO network. Bug: 6110632 Change-Id: I85722e0ba2e2606ffcf2516b8f00be6ff5271adf
* | | | | | | | | | | Merge "Fix potential NPE in SQLiteProgram."Jeff Brown2012-03-121-9/+9
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix potential NPE in SQLiteProgram.Jeff Brown2012-03-121-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6122537 Change-Id: I76a12f58f08b708065dfdd11c78f54701d90873b
* | | | | | | | | | | | Merge "MediaPlayer doc for setDataSource by file pathname"Glenn Kasten2012-03-121-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | MediaPlayer doc for setDataSource by file pathnameGlenn Kasten2012-03-091-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icb5acbf75242ca2df62ccda5185f8841217653a0
* | | | | | | | | | | | | Merge "Handle view properties at the native level"Chet Haase2012-03-1216-118/+1606
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Handle view properties at the native levelChet Haase2012-03-1216-118/+1606
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Basic functionality of handling View properties (transforms, left/right/top/bottom, and alpha) at the native DisplayList level. This logic is disabled for now (via compile-time flags in View.java and DisplayListRenderer.h) as we continue work on it (there is no advantage to the new approach until we optimize invalidation and rendering paths to use the new code path). Change-Id: I370c8d21fbd291be415f55515ab8dced6f6d51a3
* | | | | | | | | | | | | | Merge "Add new READ_EXTERNAL_STORAGE permission."Dianne Hackborn2012-03-126-2/+76
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Add new READ_EXTERNAL_STORAGE permission.Dianne Hackborn2012-03-126-2/+76
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also adds some initial compatibility code for dealing with it. Change-Id: I104bff11798349e4aaa6da9b7be787b257daa1bb
* | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE"Eric Fischer2012-03-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-03-121-1/+1
| | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I183552feb00f1764db73bf6c7f16d5f5ef0f3b0f
* | | | | | | | | | | | | Inline applyVolume() into threadLoop_mix()Glenn Kasten2012-03-122-80/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also the declaration of applyVolume in PlaybackThread was dead. Change-Id: I4b1a9848d07d3d7f340baea05b17f667c78df868
* | | | | | | | | | | | | Merge "Remove unnecessary friend declarations"Glenn Kasten2012-03-121-42/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Remove unnecessary friend declarationsGlenn Kasten2012-03-091-42/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add comments to the remaining friends, so we know what is left if we decide to remove them later. Change-Id: I1de929257dc4700960f77902cda3d303177c72cf
* | | | | | | | | | | | | | Merge "Remove virtual from methods that don't need it"Glenn Kasten2012-03-122-3/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Remove virtual from methods that don't need itGlenn Kasten2012-03-092-3/+6
| |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I30e17e61aae25b036436c0e270313c80c43e5f06
* | | | | | | | | | | | | | Merge "Documentation/API update for MediaCodec/MediaExtractor, fixes to ↵Andreas Huber2012-03-124-12/+60
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MediaCodec."
| * | | | | | | | | | | | | | Documentation/API update for MediaCodec/MediaExtractor, fixes to MediaCodec.Andreas Huber2012-03-124-12/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and MediaExtractor.readSampleData now works with a non-direct byte buffer. Change-Id: Ifbe5c152d9550c34d3b1d493e12a223eb98e8b4e
* | | | | | | | | | | | | | | Merge "Don't allocate new typefaces when not needed."Romain Guy2012-03-121-14/+64
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Don't allocate new typefaces when not needed.Romain Guy2012-03-121-14/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Typeface.create(Typeface, int) API can be used to create a new typeface derived from an existing typeface. The implementation would however create a new Typeface instance on every call, creating unnecessary garbage in text-heavy applications. This changelist adds a small cache of derived typefaces to avoid allocations whenever possible. Change-Id: Ib7290b3183e372aae12cf66033690e15cd4d0691
* | | | | | | | | | | | | | | | Merge "Remove Logs inadvertently added to AutoCompletePopup."George Mount2012-03-121-12/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Remove Logs inadvertently added to AutoCompletePopup.George Mount2012-03-121-12/+0
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If5062ad8485a8f7ce66dd5b2196c8559bc6ff3e9
generated by cgit v1.1 at 2025-02-05 02:58:13 +0000