summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Correct executable bit for source filesKenny Root2012-11-07642-0/+0
| | | | | | | | | Many media files and source code files were marked as executable in Git. Remove those. Also a shell script and python script were not marked as executable. Change-Id: Ieb51bafb46c895a21d2e83696f5a901ba752b2c5
* Merge "Clarify ViewStub.setVisibility() documentation to state that it works ↵Romain Guy2012-11-061-1/+2
|\ | | | | | | after inflation."
| * Clarify ViewStub.setVisibility() documentation to state that it works after ↵Tim Hutt2012-11-021-1/+2
| | | | | | | | | | | | | | inflation. Change-Id: I8414b7002af1a51a10db95758e36c471b51e6355 Signed-off-by: Tim Hutt <tdhutt@gmail.com>
* | Merge "Removed offensive music genre"Marco Nelissen2012-11-051-2/+2
|\ \ | |/ |/|
| * Removed offensive music genreJohan Redestig2012-08-311-2/+2
| | | | | | | | | | | | | | | | The genre is a bad joke, not a real thing. See http://en.wikipedia.org/wiki/Negerpunk Change-Id: I073c89e286ef4b8f9d678e1b137c657b26066099
* | Merge "Sensors could be disabled by any application"Nick Kralevich2012-10-241-1/+2
|\ \
| * | Sensors could be disabled by any applicationMagnus Hallqvist2012-09-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the SensorManager API unregisterListener any application could unregister any sensor. This lets any application disable a sensor which another application is using. This fix restricts the applications to only be able to unregister a sensor it has previously registered to. Change-Id: Ief926dd29f480dd97626160810dff87a8d3ac8dc
* | | Merge "Reattach header view after DPAD scroll."Adam Powell2012-10-232-6/+21
|\ \ \
| * | | Reattach header view after DPAD scroll.Mattias Niklewski2012-09-112-6/+21
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | A header view that was scrolled off screen using the DPAD would not be reattached properly when scrolled back into view, due to the flag recycledHeaderFooter. Solved this by using detachViewFromParent() instead of removeViewInLayout(). Compare to AbsListView.trackMotionScroll(). Change-Id: I0ac0ec0f9bf23bc62430c1f62ae7d1a8570b0a24
* | | Merge "Fix mistaken removal of setfilecon"Kenny Root2012-10-171-1/+8
|\ \ \
| * | | Fix mistaken removal of setfileconKenny Root2012-10-171-1/+8
|/ / / | | | | | | | | | | | | | | | | | | Previous commit attempted to move setfilecon above chown, but mistakenly squashed libdir and pkgdir setfilcon into one incorrect setfilecon. Change-Id: I1ad00eae8a0e69ae88ce47cd5571558ce1ad2145
* | | Merge "Remove HAVE_SELINUX guards"Kenny Root2012-10-174-99/+12
|\ \ \
| * | | Remove HAVE_SELINUX guardsKenny Root2012-10-164-99/+12
|/ / / | | | | | | | | | Change-Id: I6c2161471f657aa1645695ffd56ff434b0c2b426
* | | Merge "Reject bad ResXMLTree::setTo calls"Kenny Root2012-10-121-0/+4
|\ \ \
| * | | Reject bad ResXMLTree::setTo callsKenny Root2012-10-101-0/+4
|/ / / | | | | | | | | | | | | Bug: http://code.google.com/p/android/issues/detail?id=21838 Change-Id: I1092499906f0cafe5a3c42ab2579edf3763cedb7
* | | am 07b4339b: Merge "Change androidfw tests to native test target"Kenny Root2012-10-022-22/+11
|\ \ \ | | | | | | | | | | | | | | | | * commit '07b4339b2a2f39c17194b21dc301c0c026a2f197': Change androidfw tests to native test target
| * \ \ Merge "Change androidfw tests to native test target"Kenny Root2012-10-022-22/+11
| |\ \ \
| | * | | Change androidfw tests to native test targetKenny Root2012-10-022-22/+11
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the androidfw tests to the BUILD_NATIVE_TEST target so they end up in the correct directory. Also remove the module tags and C include paths. The include paths are automatically added when the library is used. Change-Id: Ia47f6c25130c5068b89d6dc067e5d9c714a6d08a
* | | | am 77728b01: Merge "Change installd tests to native test target"Kenny Root2012-10-021-9/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '77728b010e34069a904c9e8a40e03b8829cfb8ae': Change installd tests to native test target
| * | | Merge "Change installd tests to native test target"Kenny Root2012-10-021-9/+2
| |\ \ \
| | * | | Change installd tests to native test targetKenny Root2012-10-021-9/+2
| |/ / / | | | | | | | | | | | | Change-Id: Ifb2ba004e74d55ffbf01557b59ceef3232762d28
* | | | am fb34490f: Merge "Fix writing text version of styleable IDs."Xavier Ducrohet2012-09-261-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'fb34490f4dca7aac623fb9a80fe9a2371107a786': Fix writing text version of styleable IDs.
| * | | Merge "Fix writing text version of styleable IDs."Xavier Ducrohet2012-09-261-1/+1
| |\ \ \
| | * | | Fix writing text version of styleable IDs.Xavier Ducrohet2012-09-261-1/+1
| |/ / / | | | | | | | | | | | | Change-Id: I3f2614689a597de3fd46628c020cf649a808c82f
* | | | am 5e8cbdc0: Merge "Fixing services start order that impacts ICS - JB upgrade"Amith Yamasani2012-09-241-5/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '5e8cbdc0bd6dfc51e6b54db1d5fd61347336d862': Fixing services start order that impacts ICS - JB upgrade
| * | | Merge "Fixing services start order that impacts ICS - JB upgrade"Amith Yamasani2012-09-231-5/+6
| |\ \ \
| | * | | Fixing services start order that impacts ICS - JB upgradeFelipe Ramos2012-09-181-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JB has introduced LockSettingsService. When the phone is upgrading from ICS, that used another way to store lock settings, the LockSettingsService needs to import these settings to store in its database. This happens when the systemReady() method of this class is called by SystemServer. The problem resides in the fact that the DevicePolicyManagerService actually needs to access the LockSettingsService during its systemReady() initialization, causing invalid values to be read by it which propagates and ends up causing a invalid return in the method isActivePasswordSufficient. If user had a Google corporate account that enforces password related policies through Google Apps Device Policy (GADP) app in ICS, when he upgrades to JB, the GADP will throw a notification saying that the password doesn't meet the required policies and needs to be changed, incorrectly, since it wasn't touched during upgrade. This fix initializes the LockSettingsService before the DevicePolicyManagerService, which is the correct way since the latter uses the first in its initialization. This prevents this issue to happen, and probably future issues, depending on the way that LockSettingsService evolves. Change-Id: I3d4334a8b728f0ad9ae744cece430d15af25a0b7
* | | | | am ab12f0f7: Merge "Implement resolving of icon attributes to resIds in ↵Adam Powell2012-09-191-0/+16
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | AlertController" * commit 'ab12f0f72c22143523e2bce7d58d9f1021abde5c': Implement resolving of icon attributes to resIds in AlertController
| * | | | Merge "Implement resolving of icon attributes to resIds in AlertController"Adam Powell2012-09-191-0/+16
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Implement resolving of icon attributes to resIds in AlertControllerblunden2012-09-111-0/+16
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Platform code using AlertController directly currently has no way to set the correct theme-specific dialog icon in a generic way. This adds code to handle such usage. Change-Id: I48beafa1183e4edf6d5378b3985a7f9be5fcda8b
* | | | am 1e86994c: Merge "MtpData bmp format file can\'t recognize when copy bmp ↵Mike Lockwood2012-09-181-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | into DUT" * commit '1e86994cd0e13f9084d3f4bd0060b9e34c935490': MtpData bmp format file can't recognize when copy bmp into DUT
| * | | Merge "MtpData bmp format file can't recognize when copy bmp into DUT"Mike Lockwood2012-09-181-0/+1
| |\ \ \
| | * | | MtpData bmp format file can't recognize when copy bmp into DUTbo huang2012-08-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add support for bmp format. Change-Id: I67d4703b43cd32abad638bae57bbceb65b4be6de Author: bo huang <bo.b.huang@intel.com> Signed-off-by: bo huang <bo.b.huang@intel.com> Signed-off-by: Wu, Hao <hao.wu@intel.com> Singed-off-by: Shuo Gao <shuo.gao@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com> Author-tracking-BZ: 24555
* | | | | am 31820a35: Merge "Add --output-text-symbols option to aapt."Xavier Ducrohet2012-09-173-14/+205
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '31820a35b2cf864a8dcb71d43e6fd21d54f49a2d': Add --output-text-symbols option to aapt.
| * | | | Merge "Add --output-text-symbols option to aapt."Xavier Ducrohet2012-09-173-14/+205
| |\ \ \ \
| | * | | | Add --output-text-symbols option to aapt.Xavier Ducrohet2012-09-113-14/+205
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Library projects in the SDK are built using --non-constant-id to generate a temporary R.java class. When the library is packaged with the application to generate an apk, the R class is recreated with the proper IDs due to all the resources coming from the app and all the libraries. However for large apps with many libraries (each with their own R class in their package), this means a lot of unnecessary IDs: all R classes contains all the IDs including for resources from by projects they don't have access through the dependency graph. For really large apps (X,000 resources), with lots of libraries (10+), this can generate tens of thousands of resources, which can trigger dalvik's limit of 65K fields and methods per dex files. This changes lets aapt generate not only the R class but a simple text file containing the list of all those IDs so that it is easier to parse back. The SDK build system will not ask aapt to generate the R class of the libraries (through the --extra-packages option), instead it will then read this file to know what IDs are needed for each library and generate a much smaller R class for each library (using the same text file output from compiling all the resources to get the final integer value). Change-Id: I4db959fec372cf3ead9950e4b2b82fa1ae7eed2d
* | | | | | am d7252571: Merge "Add --error-on-failed-insert option to aapt."Xavier Ducrohet2012-09-173-19/+60
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'd72525718ea7ef3e1f97cf557365b143c8919a5b': Add --error-on-failed-insert option to aapt.
| * | | | | Merge "Add --error-on-failed-insert option to aapt."Xavier Ducrohet2012-09-173-19/+60
| |\ \ \ \ \ | | |/ / / /
| | * | | | Add --error-on-failed-insert option to aapt.Xavier Ducrohet2012-09-113-19/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new SDK build system give the ability to insert versionCode/Name and min/targetSdkVersion in the manifest but aapt won't replace those if they already exist. The main problem is that aapt doesn't actually fail when it doesn't replace them, making the output not what the developer wanted. This patch set adds an option to aapt to make it return an error if the insert failed because the attribute already existed. Change-Id: I8938ec1238da407a8562c974e9598db39001ffd9
* | | | | | am 297ad257: Merge "Deprecate those parts of DateUtils the documentation ↵Elliott Hughes2012-09-142-19/+50
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | says not to use." * commit '297ad257464d2ea65cabd45ddb19f6da34b39157': Deprecate those parts of DateUtils the documentation says not to use.
| * | | | | Merge "Deprecate those parts of DateUtils the documentation says not to use."Elliott Hughes2012-09-142-19/+50
| |\ \ \ \ \
| | * | | | | Deprecate those parts of DateUtils the documentation says not to use.Elliott Hughes2012-09-142-19/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Applications using these fields and methods are just asking for i18n bugs. Also @deprecate two int[]s that were never meant to be public. Change-Id: I29b3a1c0c663fe344d2567df6ed3bb537270b3b7
* | | | | | | am f4afc401: Merge "framework: fix bug for uninitialized variable"Raph Levien2012-09-141-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'f4afc40101c00800c4dc53f165b93f741327416d': framework: fix bug for uninitialized variable
| * | | | | | Merge "framework: fix bug for uninitialized variable"Raph Levien2012-09-141-1/+1
| |\ \ \ \ \ \
| | * | | | | | framework: fix bug for uninitialized variableZhou Chang2012-08-311-1/+1
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some application display error due to uninitialized varibale. This patch fix the bug Change-Id: I660169e325ffae60d95c7774aaaeaebf693adf3d Author: Chang Zhou <chang.zhou@intel.com> Signed-off-by: Chang Zhou <chang.zhou@intel.com> Signed-off-by: Chong Xing <chong.xing@intel.com> Signed-off-by: Hongyu Zhang <hongyu.zhang@intel.com> Signed-off-by: Shuo Gao <shuo.gao@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com> Author-tracking-BZ: 45356
* | | | | | | am cceed1df: Merge "Include <sys/socket.h> instead of <linux/socket.h>."Elliott Hughes2012-09-123-5/+7
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'cceed1dfe13e99c4ffdc2586bff22d325a57c599': Include <sys/socket.h> instead of <linux/socket.h>.
| * | | | | | Merge "Include <sys/socket.h> instead of <linux/socket.h>."Elliott Hughes2012-09-123-5/+7
| |\ \ \ \ \ \
| | * | | | | | Include <sys/socket.h> instead of <linux/socket.h>.Elliott Hughes2012-09-113-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In newer kernels, <linux/socket.h> no longer contains some of the stuff you're using. Change-Id: I92c6847d73c20fb49d0db15c1cc15aa07fb5d44d
* | | | | | | | am 5c09d605: Merge "Fix CacheBitmap crash issue when using H/W UI rendering"Jean-Baptiste Queru2012-09-111-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '5c09d605678d64e05579bb668b615764a714f1f7': Fix CacheBitmap crash issue when using H/W UI rendering
| * | | | | | | Merge "Fix CacheBitmap crash issue when using H/W UI rendering"Jean-Baptiste Queru2012-09-111-1/+1
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
generated by cgit v1.1 at 2024-09-07 11:30:30 +0000