summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* More native code cleanup.Elliott Hughes2011-04-1216-150/+80
| | | | | | | | Don't keep unused global references to classes, don't throw exceptions when an exception is already pending, and fix a (harmless) misunderstanding about how GetStringChars works. Change-Id: Ie445036f057daa8a1c76aceb7bad2a84fb81d820
* Merge "Kill the global references in the OpenGL wrappers."Elliott Hughes2011-04-126-923/+756
|\
| * Kill the global references in the OpenGL wrappers.Elliott Hughes2011-04-116-923/+756
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just use jniThrowException instead. Note that it would be trivial to throw seemingly more appropriate exceptions (NullPointerException and OutOfMemoryException in particular), but I'm only attempting to preserve existing behavior here. I also found shadowing bugs in some of the special-case functions, which would previously always have leaked memory. This also moves an accidental change to a generated file (ActivityThread -> AppGlobals) into the generator, so it won't be overwritten in future. Change-Id: Iab570310b568cb406c60dd0e2b8211f8a36ae590
* | Merge "You don't need to poke around inside FileDescriptor manually."Elliott Hughes2011-04-1114-238/+73
|\ \
| * | You don't need to poke around inside FileDescriptor manually.Elliott Hughes2011-04-1114-238/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can help you with that. Note also that getParcelFileDescriptorFD did no such thing. All its callers were passing in a regular java.io.FileDescriptor and expecting the int. No ParcelFileDescriptors involved. Change-Id: Idc233626f20c092e719f152562601f406cc1b64a
* | | Merge "Fix in BreakIterator."Gilles Debunne2011-04-112-15/+20
|\ \ \
| * | | Fix in BreakIterator.Gilles Debunne2011-04-082-15/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An index equal to the length of text is indeed a valid position, representing a cursor located after the last character. Also changed iterator to comply to the documentation. Change-Id: I7b9e427e4e37df20ab7e66d99053a9d8a6af6eb3
* | | | Merge "Import revised translations."Eric Fischer2011-04-111-2/+2
|\ \ \ \
| * | | | Import revised translations.Eric Fischer2011-04-111-2/+2
| | |_|/ | |/| | | | | | | | | | Change-Id: Ib8940867bc7a807284dbb1297b5856e352690850
* | | | am f953d3e2: am 7f506024: am 78a9766b: Merge "Implement teardown script." ↵Jason parks2011-04-113-1/+92
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread * commit 'f953d3e2eac2af121e4b83f6bf613e0800fd7952': Implement teardown script.
| * \ \ \ am 7f506024: am 78a9766b: Merge "Implement teardown script." into gingerbreadJason parks2011-04-113-1/+92
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '7f506024e989c2c7dfa8f9f72ea088944e307c26': Implement teardown script.
| | * \ \ \ am 78a9766b: Merge "Implement teardown script." into gingerbreadJason parks2011-04-043-1/+92
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '78a9766be2a08e1f6a448bdb336f2afeff71a52b': Implement teardown script.
| | | * \ \ \ Merge "Implement teardown script." into gingerbreadJason parks2011-04-013-1/+92
| | | |\ \ \ \
| | | | * | | | Implement teardown script.Jason parks2011-04-013-1/+92
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1a3feda3b1007b08fcaa24c3f8dd21abf1efd885
* | | | | | | | am a83bc160: am 7bb236c3: am 84d34078: Make the NFC UID forward compatible.Jeff Hamilton2011-04-111-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | / | |_|_|_|_|_|/ |/| | | | | | * commit 'a83bc160892078c20489897190ee163d5c4d3783': Make the NFC UID forward compatible.
| * | | | | | am 7bb236c3: am 84d34078: Make the NFC UID forward compatible.Jeff Hamilton2011-04-111-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '7bb236c3b5e49f53b3110855276d99e664b29931': Make the NFC UID forward compatible.
| | * | | | | am 84d34078: Make the NFC UID forward compatible.Jeff Hamilton2011-04-041-1/+1
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * commit '84d340781b1e148ead9fb4790755737c9dcc1cde': Make the NFC UID forward compatible.
| | | * | | | Make the NFC UID forward compatible.Jeff Hamilton2011-04-011-1/+1
| | | |/ / / | | | | | | | | | | | | | | | | | | Change-Id: I67316ee7906c29ba11ca7c8eb36ca1b736fe59b1
| | * | | | am 8b312c6c: Merge "Import revised translations. DO NOT MERGE" into gingerbreadEric Fischer2011-04-048-20/+18
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit '8b312c6ca1c3f6dc4bec0c7d45bc9509afef4984': Import revised translations. DO NOT MERGE
| | | * | | Merge "Import revised translations. DO NOT MERGE" into gingerbreadEric Fischer2011-03-308-20/+18
| | | |\ \ \
| | | | * | | Import revised translations. DO NOT MERGEEric Fischer2011-03-298-20/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2d4afddb1ff99b9861647d479ef5ce2de49b684d
* | | | | | | Merge "Package manager changes to store and update user information."Amith Yamasani2011-04-116-63/+301
|\ \ \ \ \ \ \
| * | | | | | | Package manager changes to store and update user information.Amith Yamasani2011-04-116-63/+301
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some API stubs for managing users and storing their details. List of users is stored in an xml file. Each user's properties are stored in a separate xml file. Some unit tests for modifying the XML files. Change-Id: If2ce2420723111bd426f6762def3c2afc19a0ae5
* | | | | | | | am 1b00dc66: am 3156a8c1: Merge "Move ProcessedMessage into ↵Wink Saville2011-04-113-255/+230
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HierarchicalStateMachine." into honeycomb-LTE * commit '1b00dc66d4b61b9a2bf44f76a9d3f54be91a2dbf': Move ProcessedMessage into HierarchicalStateMachine.
| * | | | | | | am 3156a8c1: Merge "Move ProcessedMessage into HierarchicalStateMachine." ↵Wink Saville2011-04-113-255/+230
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into honeycomb-LTE * commit '3156a8c1694756dfa74c3918867f528bcf916e28': Move ProcessedMessage into HierarchicalStateMachine.
| | * \ \ \ \ \ \ Merge "Move ProcessedMessage into HierarchicalStateMachine." into honeycomb-LTEWink Saville2011-04-113-255/+230
| | |\ \ \ \ \ \ \
| | | * | | | | | | Move ProcessedMessage into HierarchicalStateMachine.Wink Saville2011-04-113-255/+230
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ProcessedMessage is really private to HSM and so moving it into the HSM class. Change-Id: Ida476fc7aae5e9bfb6ac632dac979e11f489b6fc
* | | | | | | | | | am 2df36fd6: am b7e8a54d: Merge "Add prepaid data services URL to Secure ↵Freeman Ng2011-04-111-0/+7
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | / / | |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Settings" into honeycomb-LTE * commit '2df36fd6ec39e096327032283d058b48be19e843': Add prepaid data services URL to Secure Settings
| * | | | | | | | am b7e8a54d: Merge "Add prepaid data services URL to Secure Settings" into ↵Freeman Ng2011-04-111-0/+7
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-LTE * commit 'b7e8a54d98f753406c8763a7075e5f6b92e9300e': Add prepaid data services URL to Secure Settings
| | * | | | | | | Merge "Add prepaid data services URL to Secure Settings" into honeycomb-LTEFreeman Ng2011-04-111-0/+7
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Add prepaid data services URL to Secure SettingsFreeman Ng2011-04-071-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is really a Gservices value being accessed through Secure Settings bug: 4100048 Change-Id: I6e2eb72b17594b5c8f14a6ecfc21eafeff80fa1b
* | | | | | | | | Merge "Rework thumbnails in activity manager."Dianne Hackborn2011-04-085-12/+99
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Rework thumbnails in activity manager.Dianne Hackborn2011-04-085-12/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now only keep a thumbnail for the task, not for each activity. However if you use FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET, we will make a new secondary thumbnail for that series of activities. There is a new API for the app to get these secondary thumbnails. Also set a default thumbnail size for non-xlarge screens so we have thumbnails on phones. (We need some smarter code in the platform for computing the actual thumbnail dimensions of the current device). And add a test app to show recent tasks + thumbnails. Change-Id: Ic36759f6635522118a2cb7f156662229a610c492
* | | | | | | | | | Merge "More JNI exception-throwing cleanup."Elliott Hughes2011-04-0816-475/+403
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | More JNI exception-throwing cleanup.Elliott Hughes2011-04-0816-475/+403
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are a few (unimportant) bug fixes here. There were several attempts to throw exceptions in situations where there's already a pending exception. There were also cases where the code was wrong; it was checking for a NULL return from Get*ArrayElements and throwing NPE, but passing NULL is an error that causes a crash and a NULL return means an exception has already been thrown. I didn't want to get into the Scoped* classes just yet, but that was by far the easiest way to fix this. Change-Id: I0b31160ee51b96e82539f6514b8412b149dba7c3
* | | | | | | | | | | Merge "Add keychain user with special keystore access permissions"Brian Carlstrom2011-04-081-0/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add keychain user with special keystore access permissionsBrian Carlstrom2011-04-081-0/+6
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I02fe5171add62c5cd9f57b01bc137f3bc1cb3a69
* | | | | | | | | | | Merge "TextLayoutCache - add glyphs caching"Fabrice Di Meglio2011-04-086-98/+190
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | TextLayoutCache - add glyphs cachingFabrice Di Meglio2011-04-086-98/+190
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - cache glyphs after Harfbuzz shaping - use "m" prefix for member variables - add temporary API for drawing text with glyphs - update BiDiTest app Change-Id: I619b3f313b15f010018daad21b3e5e486619b4e4
* | | | | | | | | | | Merge "Tolerate missing AccountManager resource, not just missing resource name"Brian Carlstrom2011-04-087-10/+37
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Tolerate missing AccountManager resource, not just missing resource nameBrian Carlstrom2011-04-077-10/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In addition to the primary change in the subject, also some minor cleanup of javadoc, typos, CloseGuard warning, etc found while working on a new AbstractAccountAuthenticator. Change-Id: I73f3408773a43a0021a15f8d051fd3dbbdf898a5
* | | | | | | | | | | | Merge "Use jniThrowException for exception throwing from native code."Elliott Hughes2011-04-0815-401/+325
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Use jniThrowException for exception throwing from native code.Elliott Hughes2011-04-0715-401/+325
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'll do media and the generated gl stuff separately. Otherwise, this cleans up all direct calls of ThrowNew/Throw except the one in the binder that needs to remain. Change-Id: I8f95a5f020f53b25926ad31ac0c9477ddf85d04b
* | | | | | | | | | | | Merge "Don't send pause again when coming back from full screen"Teng-Hui Zhu2011-04-081-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Don't send pause again when coming back from full screenTeng-Hui Zhu2011-04-071-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we enter full screen, the inline video has been paused. When we re-play in the inline mode, we don't need to paused the previous video, which is the full screen one. bug:4259109 Change-Id: Ib951846e6c22893713b00699263f7d038bcb7353
* | | | | | | | | | | | | Merge "Add camera focus area API."Wu-cheng Li2011-04-081-0/+158
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add camera focus area API.Wu-cheng Li2011-04-081-0/+158
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The API are still hidden. bug:3475893 Change-Id: I92405c9e332b7fb141788cda7ebc9705dd666c67
* | | | | | | | | | | | | | Rename CorrectionSpan to SuggestionSpansatok2011-04-084-23/+22
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I004b2e012b2de4de959a31da1f55b63ca7c14199
* | | | | | | | | | | | | Remove the deprecated things from Config.java. These haven't been working ↵Joe Onorato2011-04-0765-315/+113
| |_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | since before 1.0. Change-Id: Ic2e8fa68797ea9d486f4117f3d82c98233cdab1e
* | | | | | | | | | | | Merge "Improve activity manager debug dumps."Dianne Hackborn2011-04-078-89/+218
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |