80440 Commits

Author SHA1 Message Date
Kenny Root
3a084af2e9 Correct executable bit for source files
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
2012-11-07 10:27:31 -08:00
Romain Guy
9d547d6934 Merge "Clarify ViewStub.setVisibility() documentation to state that it works after inflation." 2012-11-06 10:52:10 -08:00
Marco Nelissen
7a4d856c88 Merge "Removed offensive music genre" 2012-11-05 14:50:09 -08:00
Tim Hutt
f54df840fb Clarify ViewStub.setVisibility() documentation to state that it works after inflation.
Change-Id: I8414b7002af1a51a10db95758e36c471b51e6355
Signed-off-by: Tim Hutt <tdhutt@gmail.com>
2012-11-02 15:13:09 +00:00
Nick Kralevich
7e007ff837 Merge "Sensors could be disabled by any application" 2012-10-24 16:29:06 -07:00
Adam Powell
86e0d95de1 Merge "Reattach header view after DPAD scroll." 2012-10-23 14:04:19 -07:00
Kenny Root
40f2f751ac Merge "Fix mistaken removal of setfilecon" 2012-10-17 09:57:15 -07:00
Kenny Root
57c63d8f9b Fix mistaken removal of setfilecon
Previous commit attempted to move setfilecon above chown, but mistakenly
squashed libdir and pkgdir setfilcon into one incorrect setfilecon.

Change-Id: I1ad00eae8a0e69ae88ce47cd5571558ce1ad2145
2012-10-17 09:50:37 -07:00
Kenny Root
85f9ba9e7f Merge "Remove HAVE_SELINUX guards" 2012-10-17 09:35:35 -07:00
Kenny Root
c9a1aabc49 Remove HAVE_SELINUX guards
Change-Id: I6c2161471f657aa1645695ffd56ff434b0c2b426
2012-10-16 23:32:31 -07:00
Kenny Root
826343138d Merge "Reject bad ResXMLTree::setTo calls" 2012-10-12 23:46:14 -07:00
Kenny Root
32d6aef11a Reject bad ResXMLTree::setTo calls
Bug: http://code.google.com/p/android/issues/detail?id=21838
Change-Id: I1092499906f0cafe5a3c42ab2579edf3763cedb7
2012-10-10 10:25:06 -07:00
Kenny Root
cee1124052 am 07b4339b: Merge "Change androidfw tests to native test target"
* commit '07b4339b2a2f39c17194b21dc301c0c026a2f197':
  Change androidfw tests to native test target
2012-10-02 13:08:45 -07:00
Kenny Root
07b4339b2a Merge "Change androidfw tests to native test target" 2012-10-02 12:06:08 -07:00
Kenny Root
bad71217b7 am 77728b01: Merge "Change installd tests to native test target"
* commit '77728b010e34069a904c9e8a40e03b8829cfb8ae':
  Change installd tests to native test target
2012-10-02 12:03:34 -07:00
Kenny Root
f3f286df4d Change androidfw tests to native test target
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
2012-10-02 11:54:01 -07:00
Kenny Root
77728b010e Merge "Change installd tests to native test target" 2012-10-02 11:22:22 -07:00
Kenny Root
fbc3044190 Change installd tests to native test target
Change-Id: Ifb2ba004e74d55ffbf01557b59ceef3232762d28
2012-10-02 10:51:07 -07:00
Xavier Ducrohet
253f76357d am fb34490f: Merge "Fix writing text version of styleable IDs."
* commit 'fb34490f4dca7aac623fb9a80fe9a2371107a786':
  Fix writing text version of styleable IDs.
2012-09-26 10:44:22 -07:00
Xavier Ducrohet
fb34490f4d Merge "Fix writing text version of styleable IDs." 2012-09-26 10:12:47 -07:00
Xavier Ducrohet
d16047434b Fix writing text version of styleable IDs.
Change-Id: I3f2614689a597de3fd46628c020cf649a808c82f
2012-09-26 10:11:54 -07:00
Amith Yamasani
b079d1f280 am 5e8cbdc0: Merge "Fixing services start order that impacts ICS - JB upgrade"
* commit '5e8cbdc0bd6dfc51e6b54db1d5fd61347336d862':
  Fixing services start order that impacts ICS - JB upgrade
2012-09-24 08:45:14 -07:00
Amith Yamasani
5e8cbdc0bd Merge "Fixing services start order that impacts ICS - JB upgrade" 2012-09-23 16:01:53 -07:00
Adam Powell
56fd88d87f am ab12f0f7: Merge "Implement resolving of icon attributes to resIds in AlertController"
* commit 'ab12f0f72c22143523e2bce7d58d9f1021abde5c':
  Implement resolving of icon attributes to resIds in AlertController
2012-09-19 11:56:40 -07:00
Adam Powell
ab12f0f72c Merge "Implement resolving of icon attributes to resIds in AlertController" 2012-09-19 10:51:41 -07:00
Felipe Ramos
f35df5b509 Fixing services start order that impacts ICS - JB upgrade
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
2012-09-18 18:26:27 -03:00
Mike Lockwood
945080b5b6 am 1e86994c: Merge "MtpData bmp format file can\'t recognize when copy bmp into DUT"
* commit '1e86994cd0e13f9084d3f4bd0060b9e34c935490':
  MtpData bmp format file can't recognize when copy bmp into DUT
2012-09-18 10:53:11 -07:00
Mike Lockwood
1e86994cd0 Merge "MtpData bmp format file can't recognize when copy bmp into DUT" 2012-09-18 10:25:42 -07:00
Xavier Ducrohet
5de9603529 am 31820a35: Merge "Add --output-text-symbols option to aapt."
* commit '31820a35b2cf864a8dcb71d43e6fd21d54f49a2d':
  Add --output-text-symbols option to aapt.
2012-09-17 12:03:19 -07:00
Xavier Ducrohet
cc9747ed45 am d7252571: Merge "Add --error-on-failed-insert option to aapt."
* commit 'd72525718ea7ef3e1f97cf557365b143c8919a5b':
  Add --error-on-failed-insert option to aapt.
2012-09-17 12:03:12 -07:00
Xavier Ducrohet
31820a35b2 Merge "Add --output-text-symbols option to aapt." 2012-09-17 10:59:22 -07:00
Xavier Ducrohet
d72525718e Merge "Add --error-on-failed-insert option to aapt." 2012-09-17 10:57:58 -07:00
Elliott Hughes
f5437ee86a am 297ad257: Merge "Deprecate those parts of DateUtils the documentation says not to use."
* commit '297ad257464d2ea65cabd45ddb19f6da34b39157':
  Deprecate those parts of DateUtils the documentation says not to use.
2012-09-14 16:34:41 -07:00
Elliott Hughes
297ad25746 Merge "Deprecate those parts of DateUtils the documentation says not to use." 2012-09-14 16:12:36 -07:00
Elliott Hughes
d3c01012d8 Deprecate those parts of DateUtils the documentation says not to use.
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
2012-09-14 16:06:50 -07:00
Raph Levien
eceb317116 am f4afc401: Merge "framework: fix bug for uninitialized variable"
* commit 'f4afc40101c00800c4dc53f165b93f741327416d':
  framework: fix bug for uninitialized variable
2012-09-14 12:15:03 -07:00
Raph Levien
f4afc40101 Merge "framework: fix bug for uninitialized variable" 2012-09-14 11:52:11 -07:00
Elliott Hughes
4c686dad83 am cceed1df: Merge "Include <sys/socket.h> instead of <linux/socket.h>."
* commit 'cceed1dfe13e99c4ffdc2586bff22d325a57c599':
  Include <sys/socket.h> instead of <linux/socket.h>.
2012-09-12 11:04:45 -07:00
Elliott Hughes
cceed1dfe1 Merge "Include <sys/socket.h> instead of <linux/socket.h>." 2012-09-12 10:13:28 -07:00
Elliott Hughes
778c859bfd Include <sys/socket.h> instead of <linux/socket.h>.
In newer kernels, <linux/socket.h> no longer contains some of the stuff you're
using.

Change-Id: I92c6847d73c20fb49d0db15c1cc15aa07fb5d44d
2012-09-11 18:50:25 -07:00
Xavier Ducrohet
f5de650ff1 Add --output-text-symbols option to aapt.
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
2012-09-11 18:19:00 -07:00
Xavier Ducrohet
7714a2429b Add --error-on-failed-insert option to aapt.
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
2012-09-11 18:17:22 -07:00
Jean-Baptiste Queru
70a5967e0b am 5c09d605: Merge "Fix CacheBitmap crash issue when using H/W UI rendering"
* commit '5c09d605678d64e05579bb668b615764a714f1f7':
  Fix CacheBitmap crash issue when using H/W UI rendering
2012-09-11 17:57:19 -07:00
Jean-Baptiste Queru
5c09d60567 Merge "Fix CacheBitmap crash issue when using H/W UI rendering" 2012-09-11 17:48:09 -07:00
Robert Greenwalt
65208857d3 am 2415841c: Merge "EthernetDataTracker: indicate link up based on flags"
* commit '2415841c370d855d7f3a3e6a537e641c69a57097':
  EthernetDataTracker: indicate link up based on flags
2012-09-11 15:04:50 -07:00
Robert Greenwalt
2415841c37 Merge "EthernetDataTracker: indicate link up based on flags" 2012-09-11 15:02:24 -07:00
Vishal Mahaveer
b6b72f5411 EthernetDataTracker: indicate link up based on flags
Indicate link up state based on flags/interface up, and not on IP address.
This is for ethernet interfaces that already exists.

Change-Id: Ib342d519c483bbb2dfa08cfac2c0c1a288cee7c0
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
2012-09-11 16:41:16 -05:00
Wink Saville
0c99f7e36d am ba3cf72a: Merge "Telephony: Clarify IccCardConstants.State enum"
* commit 'ba3cf72a08368ab40556b07b4518536bb59eb2f6':
  Telephony: Clarify IccCardConstants.State enum
2012-09-11 13:17:17 -07:00
Wink Saville
ba3cf72a08 Merge "Telephony: Clarify IccCardConstants.State enum" 2012-09-11 12:24:15 -07:00
Mattias Niklewski
158d6b70ac Reattach header view after DPAD scroll.
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
2012-09-11 14:18:23 +02:00