summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Use NULL instead of 0 when invoking CallStaticVoidMethodHaitao Feng2015-01-082-2/+2
| | | | | | | | | | | | | | | | | static void CallStaticVoidMethod is variable argument function. if pass 0 to the function like: CallStaticVoidMethod(......, 0), 0 will be treated as INT data type.but in the CallStaticVoidMethod implement 0 will be treated as pointer data type.Pointer in 64bit system occupied 8 bytes, but in 64bit system int occupied 4 bytes. if call function like: CallStaticVoidMethod(......, 0), only low 4 bytes will be assigned 0.Turned out it actually call function like this: CallStaticVoidMethod(......, 0xXXXXXXXX00000000). intent to pass NULL to function but passed non-NULL parameter to the function.this will cause GCDaemon crash. Bug: 18911458 Change-Id: I9d700d3790a80dbee6826f64baf9ef5d81ca390f Reviewed-by: Liao, Bruce <bruce.liao@intel.com> Signed-off-by: Yong Yao <yong.yao@intel.com>
* Merge "Removing DUN APN for Koodo CA (302-220)" into lmp-mr1-devSanket Padawe2015-01-081-1/+0
|\
| * Removing DUN APN for Koodo CA (302-220)Sanket Padawe2015-01-081-1/+0
| | | | | | | | | | Bug: 18813997 Change-Id: I7d129dfa0015d8a1d01e749dafcb7d95f837a5ec
* | Merge "NoMan: Cancel previous instance of ignored notification" into lmp-mr1-devChristoph Studer2015-01-081-3/+11
|\ \
| * | NoMan: Cancel previous instance of ignored notificationChristoph Studer2015-01-061-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | When a notification is ignored due to notification group optimization, make sure any existing instance of the ignored notification is canceled. Bug: 18914108 Change-Id: Ifcc4833df019ea5cb7048eaab11ae76e7fa2a31c
* | | Merge "Fix pointer index out of range exception DO NOT MERGE" into lmp-mr1-devCraig Mautner2015-01-081-0/+1
|\ \ \
| * | | Fix pointer index out of range exception DO NOT MERGEtingna_sung2015-01-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid pointer index out of range error if return value is -1 of findPointerIndex() when there is no data available for that pointer identifier. Change-Id: I2a08f04c678164e220852094baa124ba157e2e42 Signed-off-by: tingna_sung <tingna_sung@htc.com> Fixes bug 18883936
* | | | Merge "Add new debug feature to track associations between processes. Also ↵Dianne Hackborn2015-01-082-16/+256
|\ \ \ \ | | | | | | | | | | | | | | | add some debugging for spurious service ANRs." into lmp-mr1-dev
| * | | | Add new debug feature to track associations between processes. AlsoDianne Hackborn2015-01-072-16/+256
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add some debugging for spurious service ANRs. Bug: 18201239 Change-Id: Icd43f35c696d71453e1d4deea855984b2d14b347
* | | | | Merge "Wipe FRP partition if OEM unlock enabled" into lmp-mr1-devAndres Morales2015-01-081-19/+33
|\ \ \ \ \
| * | | | | Wipe FRP partition if OEM unlock enabledAndres Morales2015-01-071-19/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not all devices invoke recovery on every userdata wipe, so we can't rely on code in the recovery OS to do this. This results in fastboot -w not properly wiping the FRP partition. This patch fixes the issue by having the framework level service check the OEM unlock enabled bit, and wiping the partition if it is set. Bug: 18644051 Change-Id: Id97a29916fe39561700912a920c5741109842bdb
* | | | | | Merge "Check for OOM in BitmapFactory's getMimeTypeString()." into lmp-mr1-devVladimir Marko2015-01-081-4/+9
|\ \ \ \ \ \
| * | | | | | Check for OOM in BitmapFactory's getMimeTypeString().Vladimir Marko2015-01-071-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18909596 (cherry picked from commit 7ab249a18e08bfefb8c2d60af1fb668c67ba4368) Change-Id: Ie7be228442876d47faf37e3f664e378253dab6e3
* | | | | | | Merge "Revert "GpsLocationProvider: Read data enabled status from ↵Bryce Lee2015-01-081-1/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | TelephonyManager."" into lmp-mr1-dev
| * | | | | | | Revert "GpsLocationProvider: Read data enabled status from TelephonyManager."Bryce Lee2015-01-081-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit fabbdf7204474a9f789ce441219b3b9f3df66bb8. Causes NPE on devices without telephony (Android Wear for example) Bug:18922524 Change-Id: I3be4187a20da11fd5a302dd88e808a68cd7e5737
* | | | | | | | Merge "CEC: Handle <Active Source> arriving before ↵Jinsuk Kim2015-01-083-13/+66
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | TvInputCallback.onAddInput" into lmp-mr1-dev
| * | | | | | | | CEC: Handle <Active Source> arriving before TvInputCallback.onAddInputJinsuk Kim2015-01-083-13/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolves a timing-related bug that fails to process the command <Active Source> at TV boot up. Checks if TV input required for the command is ready to accept the request. If not, makes sure the command is buffered, and processed later when the input is ready. Bug: 18896770 Change-Id: Id17e5e8468519b17daf61c962dd718ccc56fb0ea
* | | | | | | | | Merge "Replace java.util.LinkedHashMap.eldest()" into lmp-mr1-devDeepanshu Gupta2015-01-083-2/+68
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Replace java.util.LinkedHashMap.eldest()Deepanshu Gupta2015-01-073-2/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide an alternate implementation for the above method and replace the calls to it, since the method is not available on host VM. Change-Id: I329d86b457d1859b137da8fb2790ddd7f8efa788
* | | | | | | | | | Merge "Add missing DateFormat method." into lmp-mr1-devDeepanshu Gupta2015-01-081-0/+5
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Add missing DateFormat method.Deepanshu Gupta2015-01-071-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia03023e65ef4a7ec90b61f1f538cbe74868c63c5
* | | | | | | | | | Merge "Update platform.dir search in tests." into lmp-mr1-devDeepanshu Gupta2015-01-081-2/+18
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | / / / / / / / / | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Update platform.dir search in tests.Deepanshu Gupta2015-01-071-2/+18
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tests search for a built sdk using some heuristics. The default path of the built sdk has changed now, and this updates the search accordingly. Change-Id: I36d465d8c5f6cfd971bbdf95878fb144de233c6c
* | | | | | | | am 3bd33f1d: Merge "Fix tests on jenkins, take 2." into lmp-devDeepanshu Gupta2015-01-071-4/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 0b1188e * commit '0b1188e3c1ff6c814dc64c51c83b19afa36d8ce9': Fix tests on jenkins, take 2.
| * \ \ \ \ \ \ \ am 3bd33f1d: Merge "Fix tests on jenkins, take 2." into lmp-devDeepanshu Gupta2015-01-071-4/+6
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3bd33f1d9e8af826fa95095ca391d40f6c75ca2a': Fix tests on jenkins, take 2.
| | * \ \ \ \ \ \ \ Merge "Fix tests on jenkins, take 2." into lmp-devDeepanshu Gupta2015-01-071-4/+6
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Fix tests on jenkins, take 2.Deepanshu Gupta2015-01-071-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I67386c34a7abd7c3afdf9f0768f36f4786399be0
* | | | | | | | | | | am d385640f: am 491a8257: docs: Update Dashboard for January 2015Joe Fernandez2015-01-071-25/+25
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 0e13957 * commit '0e13957a4deab3a90492d9ae2f6d35d3b5c1773e': docs: Update Dashboard for January 2015
| * | | | | | | | | | am d385640f: am 491a8257: docs: Update Dashboard for January 2015Joe Fernandez2015-01-071-25/+25
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd385640f815a820aa1fecc2c009e1d0dfbe23777': docs: Update Dashboard for January 2015
| | * | | | | | | | | am 491a8257: docs: Update Dashboard for January 2015Joe Fernandez2015-01-071-25/+25
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '491a8257f46999d75ddc5c4c9eb599067ad380a0': docs: Update Dashboard for January 2015
| | | * | | | | | | | docs: Update Dashboard for January 2015Joe Fernandez2015-01-071-25/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I20b2b2e22199db64367d5ed99b751353c3add07b
* | | | | | | | | | | Merge "Support single-package backup rejection by the transport" into ↵Christopher Tate2015-01-072-11/+25
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev
| * | | | | | | | | | | Support single-package backup rejection by the transportChristopher Tate2015-01-062-11/+25
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now cleanly handle the case of the transport blacklisting specific packages from key/value backup. Previously we would halt the entire backup pass and reschedule if the transport returned any error from performBackup(pkg). Now, we recognize the TRANSPORT_PACKAGE_REJECTED result from that invocation, and properly drop that package's work but proceed with running the rest of the backup queue as expected. Bug 18694053 Change-Id: Id0dd6d59492bdea9f970540d776f37db0cc5d99c
* | | | | | | | | | | Don't unmute when trying to show volume UI. DO NOT MERGERoboErik2015-01-072-10/+11
| |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a MediaSession is active the adjust volume event to show UI was causing the stream to be unmuted. Since this happens after every mute event you were unable to mute while a session was active. This change doesn't unmute for events that just show the UI. bug:18844550 Change-Id: Ic8b0f1ab1354646724ead4572a973c302c275eab
* | | | | | | | | | Merge "Bring task with root activity to front when launching from recents." ↵Wale Ogunwale2015-01-071-14/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev
| * | | | | | | | | | Bring task with root activity to front when launching from recents.Wale Ogunwale2015-01-061-14/+6
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change makes sure we cover all cases where a task should be brought to front if it already has a root activity and we are launching from recents. Bug: 18846206 Change-Id: I2e67a4c163c5a5ed6784ed620583f85d9c6ed731
* | | | | | | | | | Merge "Add <ol> formatting to WebView#enableSlowWholeDocumentDraw ↵Ben Murdoch2015-01-071-5/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | documentation." into lmp-mr1-dev
| * | | | | | | | | | Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation.Ben Murdoch2015-01-071-5/+6
| | |_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug:18072267 Change-Id: I21eec752ca9a0a6c0dab92f3748e687dd13961fa
* | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-01-0772-619/+907
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I41b418841fd7a2c436257ec29312411b1277b867 Auto-generated-cl: translation import
* | | | | | | | | | Merge "Profile owner hint in warning for extra CAs" into lmp-mr1-devRobin Lee2015-01-073-32/+40
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Profile owner hint in warning for extra CAsRobin Lee2015-01-053-32/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The version of the warning with a named installer should be shown in the case of a managed profile, not only a managed device. Bug: 18224038 Change-Id: I58bddb162799481d5e8feb169b0c0bff17cbeeb7
* | | | | | | | | | am 7f9582ce: am 48603a39: Fix tests on jenkinsDeepanshu Gupta2015-01-071-0/+1
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7f9582ce616a81b70794d7942b39f8442f5ef9d5': Fix tests on jenkins
| * | | | | | | | | am 48603a39: Fix tests on jenkinsDeepanshu Gupta2015-01-071-0/+1
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '48603a39d4dd721d231c99e10908f4f00c4ec6b9': Fix tests on jenkins
| | * | | | | | | | Fix tests on jenkinsDeepanshu Gupta2015-01-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the tests are run on the build server, they are run from the jar, as opposed to the extracted build, which is default when run from an IDE. Thus, when class.getResourceAsStream() is called with ".." in the path, it is not resolved properly. This change explicitly resolves the relative path, so that the test is run properly on the server. Change-Id: Ib5fabd617dca4052220e5173a8bf4fb4234254ff
* | | | | | | | | | am 96f11258: am dc649c8d: am 8a195822: Merge "docs: Added explicit filepath ↵Quddus Chong2015-01-071-2/+4
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for Android Media Browser and Android Messaging simulators. bug: 18759727" into lmp-docs * commit '96f11258ab19962c93b615c00b387bdc05c0d75b': docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug: 18759727
| * | | | | | | | | am dc649c8d: am 8a195822: Merge "docs: Added explicit filepath for Android ↵Quddus Chong2015-01-061-2/+4
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Media Browser and Android Messaging simulators. bug: 18759727" into lmp-docs * commit 'dc649c8da46dc1cc2ac7df41ddde0f28c64db687': docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug: 18759727
| | * | | | | | | | am 8a195822: Merge "docs: Added explicit filepath for Android Media Browser ↵Quddus Chong2015-01-061-2/+4
| | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and Android Messaging simulators. bug: 18759727" into lmp-docs * commit '8a195822e264754f08f43322348ebce273f72c40': docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug: 18759727
| | | * | | | | | | Merge "docs: Added explicit filepath for Android Media Browser and Android ↵Quddus Chong2015-01-061-2/+4
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Messaging simulators. bug: 18759727" into lmp-docs
| | | | * | | | | | | docs: Added explicit filepath for Android Media Browser and Android ↵Quddus Chong2015-01-051-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Messaging simulators. bug: 18759727 Change-Id: Ided6dc4f30d43f8fce252e56a6291bbb1a3d2e05
* | | | | | | | | | | am decac431: am 14694d6e: am 3bdc68ed: Merge "docs: Updated GMS version ↵Quddus Chong2015-01-071-19/+19
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | numbering to be consistent with blog post. bug: 18718181" into lmp-docs * commit 'decac4319172c5f1c618de93dcb2a15678c3e214': docs: Updated GMS version numbering to be consistent with blog post. bug: 18718181
generated by cgit v1.1 at 2025-01-10 21:03:55 +0000