122595 Commits

Author SHA1 Message Date
Zhihai Xu
8a5703c8c8 Merge "bluetoothsocket fd leak, need close the file descriptor after detachFd." 2014-01-27 20:42:18 +00:00
Christopher Tate
ca5766cf26 am 86824cf0: am 3a3def13: am 0e8f02d6: am 76dcacad: am 1ff4293e: Merge "Fixed race condition in Spinner.DialogPopup on null reference."
* commit '86824cf0a994abc38f08ac5692cf6b73cd10526e':
  Fixed race condition in Spinner.DialogPopup on null reference.
2014-01-27 20:00:21 +00:00
Mathieu Chartier
2f4e0c24ab am 698d3673: am 4a750c1f: am 15594557: am 137d74d8: am db525724: Merge "Fix dest == src bugs in Matrix.cpp."
* commit '698d36731700b168e5debf8c3904d1106f4da20a':
  Fix dest == src bugs in Matrix.cpp.
2014-01-27 19:55:35 +00:00
Christopher Tate
86824cf0a9 am 3a3def13: am 0e8f02d6: am 76dcacad: am 1ff4293e: Merge "Fixed race condition in Spinner.DialogPopup on null reference."
* commit '3a3def1304b0fa9ed72003882716ad43e85b13d3':
  Fixed race condition in Spinner.DialogPopup on null reference.
2014-01-27 19:54:30 +00:00
Robert Greenwalt
36ca232441 Merge "Clean up dhcp no-op logging" 2014-01-27 19:50:10 +00:00
Mathieu Chartier
698d367317 am 4a750c1f: am 15594557: am 137d74d8: am db525724: Merge "Fix dest == src bugs in Matrix.cpp."
* commit '4a750c1f4a2760ae564fa56717c04a5f01396090':
  Fix dest == src bugs in Matrix.cpp.
2014-01-27 19:49:35 +00:00
Christopher Tate
3a3def1304 am 0e8f02d6: am 76dcacad: am 1ff4293e: Merge "Fixed race condition in Spinner.DialogPopup on null reference."
* commit '0e8f02d68f8cfe14e14800520a8133bc7efd13b7':
  Fixed race condition in Spinner.DialogPopup on null reference.
2014-01-27 19:48:03 +00:00
Christopher Tate
0e8f02d68f am 76dcacad: am 1ff4293e: Merge "Fixed race condition in Spinner.DialogPopup on null reference."
* commit '76dcacada75f192d74ea83cf6b5ce1747c9437ad':
  Fixed race condition in Spinner.DialogPopup on null reference.
2014-01-27 11:43:23 -08:00
Christopher Tate
76dcacada7 am 1ff4293e: Merge "Fixed race condition in Spinner.DialogPopup on null reference."
* commit '1ff4293e33f98e6dc19e4f154cb497af9bd88c9d':
  Fixed race condition in Spinner.DialogPopup on null reference.
2014-01-27 11:40:51 -08:00
Mathieu Chartier
4a750c1f4a am 15594557: am 137d74d8: am db525724: Merge "Fix dest == src bugs in Matrix.cpp."
* commit '15594557f118f670e8d8523e9aed0df3345d28ca':
  Fix dest == src bugs in Matrix.cpp.
2014-01-27 19:30:35 +00:00
Christopher Tate
1ff4293e33 Merge "Fixed race condition in Spinner.DialogPopup on null reference." 2014-01-27 19:29:56 +00:00
Andreas Huber
084d986c3a Merge "API that allows usage of MediaCodec APIs without polling." 2014-01-27 19:28:05 +00:00
Mathieu Chartier
15594557f1 am 137d74d8: am db525724: Merge "Fix dest == src bugs in Matrix.cpp."
* commit '137d74d89cc57d146af8ca91ad7830a950c7e8b8':
  Fix dest == src bugs in Matrix.cpp.
2014-01-27 11:20:21 -08:00
Mathieu Chartier
137d74d89c am db525724: Merge "Fix dest == src bugs in Matrix.cpp."
* commit 'db5257248637df729ec4f8db58bdfbf0660051b2':
  Fix dest == src bugs in Matrix.cpp.
2014-01-27 11:17:13 -08:00
Andreas Huber
aba671392d API that allows usage of MediaCodec APIs without polling.
Change-Id: Iebccdd3aec74a2cfa9ad0bf16c0c6006a3b72999
related-to-bug: 11990118
2014-01-27 10:52:18 -08:00
Griff Hazen
bca57ee556 am e2bb257c: Merge "Make MANAGE_ACTIVITY_STACKS a signature|system permission." into klp-modular-dev
* commit 'e2bb257c349b21f68e3b9b87eb7cabd205380082':
  Make MANAGE_ACTIVITY_STACKS a signature|system permission.
2014-01-27 18:35:37 +00:00
Griff Hazen
e2bb257c34 Merge "Make MANAGE_ACTIVITY_STACKS a signature|system permission." into klp-modular-dev 2014-01-27 18:31:15 +00:00
Narayan Kamath
a0c6260705 AssetManager cookies should be int32_t and not void*.
Cookies are really indices into vectors and arrays, so
they don't need to be void*. We choose int32_t instead
of size_t to allow their width to be well specified.

Change-Id: I319f271bd4f102dee7cb9f00df4c75ea697456f5
2014-01-27 10:31:11 -08:00
Narayan Kamath
f85e41f29a AssetManager cookies are now int32_t, not void*.
Change-Id: Id383e31922ca81c52dad52d422c5c1ab1a1365ce
2014-01-27 10:31:11 -08:00
Christopher Tate
ca0b0c18e7 Fix MCC/MNC typo
Manual merge of https://android-review.googlesource.com/70831 across
the header refactoring.

Change-Id: I28b6a61e89b68d914124122882976a9d2f81a609
2014-01-27 10:31:11 -08:00
Narayan Kamath
90f58dbf79 Add libutils dependency for libandroidfw host build.
(cherry picked from commit 070274ec0ccb8643c52e41e4119f356f0f51bc36)

Change-Id: I25acff1d36b3adce14b2576485bda93c914d7f5d
2014-01-27 10:31:11 -08:00
Narayan Kamath
560566d291 Reimplement ZipFileRO in terms of libziparchive.
This lets us share zip archive processing code with both
the runtime (Art, dalvik) and critical java code
(StrictJarFile).

This change also moves several utility methods to ZipUtils
and dedups code across several zip inflation methods.

One of the side effects of this change is that several
processing loops are now O(n) instead of O(n^2).

bug: 10193060

(cherry picked from commit afd31e08299008fdc5c2813f21b2573f29dc53df)

Change-Id: Iae67e62f1dc6dfc3f43e29bc38e3ffd1cb14d191
2014-01-27 10:31:11 -08:00
Elliott Hughes
e1aa223657 Re-apply androidfw fixes lost by the directory rearrangement.
Assignment to wrong variable in libs/androidfw/AssetManager.cpp.
https://code.google.com/p/android/issues/detail?id=61560

Missing delete[]s in libs/androidfw/ObbFile.cpp.
https://code.google.com/p/android/issues/detail?id=61549

Change-Id: I24e6867284d70a7793d78e62d1a836cbee310fb0
2014-01-27 10:31:10 -08:00
Adam Lesinski
16c4d154dc Revert "move libandroidfw to frameworks/native"
This reverts commit 84b6292c33d71b5739828d08aa8101d1954577f2.
2014-01-27 10:31:10 -08:00
Bryan Mawhinney
9ab9b93eae Filter unneeded assets from additional resource directories
This change ensures that assets that are not needed for the
preferred density are stripped from additional directories
specified by the -S flag

For simplicity, the logic for deciding which assets are not
needed is still applied per directory, rather than globally,
which may still result in some unneeded assets being included
in the final output.

Bug: 12604267
Change-Id: Ic1378570c2d9cd1c854c507e784233818c19efca
2014-01-27 10:31:10 -08:00
Alan Viverette
ebcef6b896 Update BridgeInflater and delegate to support inheritContext arg
Change-Id: I06673f35cd4625301677f74f3e6d49669df7c271
2014-01-27 10:31:10 -08:00
Narayan Kamath
9a9fa163c3 Don't pseudolocalize untranslatable strings.
bug: https://code.google.com/p/android/issues/detail?id=63004

(cherry picked from commit 7e1b8ff3e15b35b92978e572ccbfbc47cedce242)

Change-Id: I99ba1a915ae8fc61f70ce570b782108171d0fcaa
2014-01-27 10:31:10 -08:00
Narayan Kamath
9636071bdc Reimplement ZipFileRO in terms of libziparchive.
This lets us share zip archive processing code with both
the runtime (Art, dalvik) and critical java code
(StrictJarFile).

This change also moves several utility methods to ZipUtils
and dedups code across several zip inflation methods.

One of the side effects of this change is that several
processing loops are now O(n) instead of O(n^2).

bug: 10193060

(cherry picked from commit e9d380f9303692950166472b1dfab083e1af8133)

Change-Id: I53e7d0c0af266cb1fe4e293e1177b2590cc44224
2014-01-27 10:31:09 -08:00
Ying Wang
cd28bd37ea Add new aapt flag --error-on-missing-config-entry
It forces aapt to return an error if aapt fails to find an resource
entry for a configuration.

Bug: 11259444
Change-Id: Ie5674a29dff5d4455e7d7c94f6b25560fb1305b7
2014-01-27 10:31:09 -08:00
Craig Mautner
24dffd0b0b Support API change.
From
https://googleplex-android-review.git.corp.google.com/#/c/387811/.

Change-Id: I3958a55c72b095c53b054c11c5653ba581881188
2014-01-27 10:31:09 -08:00
Adam Lesinski
58f1f3617c Dump maxSdk of uses-permission during badging
If the manifest specifies a maxSdkVersion for which to
stop granting a certain permission, output that value
when dumping badging.

bug:11630700
Change-Id: I922a3186340383828e1af3ce0815efb407d9d535
2014-01-27 10:31:09 -08:00
Deepanshu Gupta
d8df6b570f Fix text size in Fake Action Bar
Merge f4800bc from frameworks/base

Issue: 11436018
Change-Id: Id74c11037cb43d01f6cd79126623c84edfc37aaf
2014-01-27 10:31:09 -08:00
Deepanshu Gupta
03a057c1af Manual merge of changes from frameworks/base/tools
Manually merge of following changes:
9cb5f5b5233f2331748d108d71f4b685762f32a7
1cf5df38f4bdafa1beb2674ca548ad6d9650766b
083e3caf66c21f7cc9511db479726c38d90e2d2f
81f74f4bc96ea4266cebe1b785d095558f540800
39e75835399f4d979cf82069dae2bd1ec496fb81
272d1bce798a5fef42cc2ee31f629d00c89f66eb
45f5cd49fa898a59484edfd8e291dbe10df82db2

Change-Id: Ie21ca480ac117e16e28eb554474835b762ccb104
2014-01-27 10:31:09 -08:00
Elliott Hughes
b30296b5fd Re-apply several tools fixes lost by the directory rearrangement.
Leaks on error in tools/aapt/Images.cpp.
https://code.google.com/p/android/issues/detail?id=61552

Two missing fclose calls in tools/aapt/Resource.cpp.
https://code.google.com/p/android/issues/detail?id=61553

Missing fclose in tools/aidl/aidl.cpp.
https://code.google.com/p/android/issues/detail?id=61554

Change-Id: I56ce144958296961b77354815efc1a245564594b
2014-01-27 10:31:08 -08:00
Maurice Chu
2675f76967 Escape strings that are output by aapt dump badging
Also, changed getComponentName() to output a String8 object
instead of a const char * because the const char * is an internal
buffer of a String8 object which gets immediately destroyed
after returning from getComponentName().

Bug: 11329761
Change-Id: Ic459dec0ad3b20162c36de0ee492bcc022863b12
2014-01-27 10:31:08 -08:00
Satoshi Kataoka
6fbaf6cfd8 Update a test corresponding to I11ed9a767588f808
Change-Id: Ic802c075390f11fa4a5c14b8397a045b2dfec75c
2014-01-27 10:31:08 -08:00
Nick Kralevich
24e4f21e78 fix build.
In frameworks/base commit 1125235da15a5655e1fdf3b5f24df48dafccee90,
the IPowerManager interface was updated to add updateWakeLockUids,
but this file was not updated.

Fixed.

Change-Id: I8d5def02b7cadf5a154634bdff18cacb84b718f4
2014-01-27 10:31:08 -08:00
Adam Lesinski
8cf6184518 Prune unneeded density resources from APK
When a preferred density is specified, prune all but the
closest matching density when the exact density resource does not
exist.

If a preferred density resource does not exist and a higher density
resource exists, prune all but the resource with the next highest
density relative to the preferred density.

If a preferred density resource does not exist and there is no
higher density resource, prune all but the resource with the next
lowest density relative to the preferred density.

Manual merge of I99b3950fe3d8116a5625968ed383442315ae8526 from
frameworks/base/tools to frameworks/tools

bug:11224465
Change-Id: Idddf55dad27f114ffc429b61317c3a5b1435d808
2014-01-27 10:31:08 -08:00
Maurice Chu
76327314d2 Fix aapt when outputting meta-data tag values
This fixes outputting string as well as not crashing when the
<meta-data> element has an "android:resource" attribute instead
of an "android:value" attribute.

Bug: 11255844
Change-Id: Iadb62b5dcb18ea3db8dbd2ba3241f489606d535d
2014-01-27 10:31:07 -08:00
Satoshi Kataoka
f314dc0121 Update tests corresponding to I0e920ee79c526c3ae
Bug: 11035379
Bug: 5137498

Change-Id: Ief2a151bd83b75bf5b07d53b190a61f341541a21
2014-01-27 10:31:07 -08:00
Alan Viverette
47dcb469db Manual merge of e4ccb864 from frameworks/base/tools to frameworks/tools
Change-Id: I4893e72caf3dfd68bd503fd8daeabc8550d770a2
2014-01-27 10:31:07 -08:00
Adam Lesinski
8ff15b4cad AAPT emits error for res with no 'default' product
Rather than ignoring resources that do not match the specified
product, we keep track of the ignored ones and make sure that
some variant of the resource that matches the product was processed.

bug:10860838
Change-Id: I7a35f37fda2c9561634f75323bd4cb2b9047e29b
2014-01-27 10:31:07 -08:00
John Reck
492d16434a Update layoutlib
Change-Id: Ifafe5a47fbef7ff0894e679d04d71942eb8d1237
2014-01-27 10:31:07 -08:00
Marco Nelissen
c363be85de Update fake powermanager to new interface
Change-Id: I6f14498d7002b4720293a1c77f4fbb66869c36fb
2014-01-27 10:31:07 -08:00
Jim Miller
29e7462118 resolved conflicts for merge of fb2e3c8d to master
Change-Id: I159b529adae04a33a965ec0d43fc9a47e82b6417
2014-01-27 10:31:06 -08:00
Adam Lesinski
94fc9124f5 resolved conflicts for merge of 0c923b7c to master
Change-Id: I4f314b48c7714706329509d931d2c53079f5e248
2014-01-27 10:31:06 -08:00
Adam Lesinski
a5018c900f resolved conflicts for merge of 5223a5ff to master
Change-Id: I6523e4b7df88f21fbe0ecd3ab8f493e5a9867305
2014-01-27 10:31:06 -08:00
Deepanshu Gupta
e98d2cb65c Fix ClassCastException when rendering ListView
Bug: b.android.com/59300
Change-Id: I1e73910cf42de1b02f11cc77f575af9492320a19
2014-01-27 10:31:06 -08:00
Kenny Root
8732bd893a Add new getOpPackageName for BridgeContext
Change-Id: Ib39b0bd2d1eb794ae4565e54251e4355fa139a14
2014-01-27 10:31:06 -08:00
Jonathan Dixon
6ee095ba7a Merge 'Preparation for deleting WebViewClassic'
Originally from I4d6773a88ea2932982278127a3c96d38be54ddf5

- file has move to a different git project in master, so manually
  re-applied the diff that landed in klp-dev

Change-Id: I813210bd6160ab71c7a4dff9c221db31d8cc305c
2014-01-27 10:31:05 -08:00