drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
122,830 Commits 1 Branch 0 Tags
Commit Graph

122830 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
4a4cfbe7d8 Merge "Add "start time" timestamp to battery stats." 2014-01-28 01:00:22 +00:00
John Reck
e742799cae Merge "Native-side proxy" 2014-01-28 00:45:44 +00:00
John Reck
4f02bf4eef Native-side proxy 
Remove RemoteGLRenderer
 Remove reflection-based control

Change-Id: If17c2bbb61c7141986d88c4763def77ed1074985
 2014-01-27 16:40:39 -08:00
Andreas Huber
329eec5349 Fix invocation of notification callback in case the callback is modified 
from a separate thread.

Change-Id: I741c1f2f9c796ec977a742a69cedcca10c5218ad
 2014-01-27 16:30:09 -08:00
Mike J. Chen
1b47f7cc1a BluetoothInputDevice: make REPORT_TYPE values match hal 
So we don't have to do conversion when using getReport/setReport
and can pass the value to the BT HAL directly.

Change-Id: I8d4af72d2e040d43cc9ff8a8cddfbe6cc8cfdb9a
Signed-off-by: Mike J. Chen <mjchen@google.com>
 2014-01-27 16:27:04 -08:00
Jeff Brown
548061e5b6 am df8b604e: Merge "Fix NPE in deleteDatabase()." into klp-modular-dev 
* commit 'df8b604e9bf49bcf9a620e4fe19ccf19c2c49487':
  Fix NPE in deleteDatabase().
 2014-01-28 00:13:27 +00:00
Jeff Brown
d16c409e55 am 065d998a: Merge "Hide an old debug function." into klp-modular-dev 
* commit '065d998a4c3d597e924f42635d1a3699a6fcf34b':
  Hide an old debug function.
 2014-01-28 00:13:12 +00:00
Jeff Brown
df8b604e9b Merge "Fix NPE in deleteDatabase()." into klp-modular-dev 2014-01-28 00:09:42 +00:00
Jeff Brown
065d998a4c Merge "Hide an old debug function." into klp-modular-dev 2014-01-28 00:09:07 +00:00
Mark Salyzyn
3ed8e2e679 jni: Resolve build warnings 
(cherry picked from commit 087f58dd80e3296a53c6e3c74c089e9a0265f3bd)

Change-Id: I3659193f1ba1ba94561e4684cdb6627880ffc2fa
 2014-01-27 15:25:51 -08:00
Mark Salyzyn
7933c2943f jni: Incorporate liblog reading API 
(cherry picked from commit e11cbd441df4a1689c89b2ab91b84523c9f2fd10)

Change-Id: I8b78e4db67b6daabb975ce740fb40478df4ffcef
 2014-01-27 15:25:09 -08:00
Jim Miller
7751ff6cd0 Move majority of security-related logic from KeyguardHostView 
to KeyguardSecurityContainer.

This removes and/or simplifies the interface between modules to
allow easier separation of KeyguardSecurityContainer into a stand-alone
component.

Bug 12135931
 2014-01-27 15:21:39 -08:00
Chris Craik
db7516e3bd Merge "Use path outlines to define shadow shapes" 2014-01-27 22:30:52 +00:00
Chris Craik
3783e70b55 Remove logging of DisplayList staleness 
Change-Id: Ie6b3af3065d4d10ec0bc9b419223d3458d297ea8
 2014-01-27 14:29:37 -08:00
Chris Craik
cd53c257e3 Disable Drawable DisplayLists 
bug:12581401
bug:12758460

DisplayLists of drawables aren't being cleared out correctly, and will
incorrectly store state across configuration changes. Disable them
temporarily until this is fixed.

Change-Id: Ic09f0674d30476127316cfb4ffe45eb34cc15aa0
 2014-01-27 13:58:11 -08:00
Selim Gurun
4306ae1798 Remove defunct flag 
Change-Id: Ib745f225f40a9cd7bf62a93f9546bd31f1507cbf
 2014-01-27 13:39:24 -08:00
Baligh Uddin
2d434c8bdf Merge "Import translations. DO NOT MERGE" 2014-01-27 21:31:36 +00:00
Baligh Uddin
4af3fb8708 Merge "Import translations. DO NOT MERGE" 2014-01-27 21:31:32 +00:00
Christopher Tate
63c92ed41e Merge "Update PackageMonitor to recognize new 'replacing' semantics" 2014-01-27 21:09:47 +00:00
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
Christopher Tate
8b3e3ecc3d Update PackageMonitor to recognize new 'replacing' semantics 
The ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE broadcast now uses the
EXTRA_REPLACING intent extra when it is sent as part of an upgrade operation
on a forward-locked application.  Update PackageMonitor to recognize this
new information and express it appropriately to the observer.

Bug 11988313

Change-Id: I34dfaa965dd322f4fa8945e7b83c9f2e8cf5269a
 2014-01-27 11:38:45 -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