OSDN Git Service
Chong Zhang [Wed, 29 Jan 2014 20:52:15 +0000 (12:52 -0800)]
change Surface constructor arg to 64bit
Bug:
12799017
Bug:
12799384
Change-Id: Ic16b4fa5394df38cee0378b6e00d1808b9c8cb94
Jim Miller [Tue, 28 Jan 2014 23:25:47 +0000 (23:25 +0000)]
Merge "Clean up KeyguardSecurityCallback documentation and add copyright header."
Jim Miller [Wed, 15 Jan 2014 02:57:03 +0000 (18:57 -0800)]
Clean up KeyguardSecurityCallback documentation and add copyright header.
Bug
12135931
Change-Id: I9f2e20fb4c1a2cb6a9fb49f4b6939fd7687ef262
Chris Craik [Tue, 28 Jan 2014 23:18:05 +0000 (23:18 +0000)]
Merge "Remove logging of DisplayList staleness"
Fabrice Di Meglio [Tue, 28 Jan 2014 23:16:08 +0000 (23:16 +0000)]
Merge "Fix bug #
12467741 Java crash in com.android.settings: java.lang.IllegalStateException: The content of the adapter has changed but ListView did not receive a notification."
Fabrice Di Meglio [Tue, 28 Jan 2014 23:15:24 +0000 (23:15 +0000)]
Merge "Fix bug #
12422326 Unable to change text direction programmatically using setTextDirection Android SDK API"
Fabrice Di Meglio [Tue, 28 Jan 2014 23:14:49 +0000 (23:14 +0000)]
Merge "Fix new TimePicker accessibility"
Jim Miller [Tue, 28 Jan 2014 23:13:31 +0000 (23:13 +0000)]
Merge "Move majority of security-related logic from KeyguardHostView to KeyguardSecurityContainer."
Svetoslav Ganov [Tue, 21 Jan 2014 23:22:26 +0000 (15:22 -0800)]
Adding the print and accessibility pacelables to framework.aidl
1. There are a few parcelable classes related to printing and accessibility
which are public but not added in the framework.aidl list so third parties
cannot write aidl interfaces that pass these classes. As these classes
are public it is resonable for devepers to be able to pass them between
processes.
Change-Id: I85da1de5198902b74f19d23e3fe16b45b4a11051
Fabrice Di Meglio [Tue, 28 Jan 2014 22:55:17 +0000 (14:55 -0800)]
Fix bug #
12467741 Java crash in com.android.settings: java.lang.IllegalStateException: The content of the adapter has changed but ListView did not receive a notification.
- add missing notifyDataSetChanged() call
Change-Id: I633b78be3805bc8610b4aaeb70b1988768f764b7
Mike J. Chen [Tue, 28 Jan 2014 20:44:25 +0000 (20:44 +0000)]
am
1ece04f3: Merge "BluetoothInputJava: Add broadcast action REPORT" into klp-modular-dev
* commit '
1ece04f37fc93983ee058916e9913b6341e6de83':
BluetoothInputJava: Add broadcast action REPORT
Mike J. Chen [Tue, 28 Jan 2014 20:41:22 +0000 (20:41 +0000)]
Merge "BluetoothInputJava: Add broadcast action REPORT" into klp-modular-dev
Narayan Kamath [Tue, 28 Jan 2014 20:09:22 +0000 (20:09 +0000)]
resolved conflicts for merge of
e9febcc0 to master
Resolved with "-s ours" because this change has already
been cherry-picked to master.
Narayan Kamath [Tue, 28 Jan 2014 20:01:44 +0000 (20:01 +0000)]
am
fa970bb1: am
8773d51e: resolved conflicts for merge of
b82b2f98 to klp-dev-plus-aosp
* commit '
fa970bb1e8ab3cd734f1719ac8590b43d1e40962':
Track 64bit changes to android/graphics.
Narayan Kamath [Tue, 28 Jan 2014 19:58:27 +0000 (19:58 +0000)]
am
8773d51e: resolved conflicts for merge of
b82b2f98 to klp-dev-plus-aosp
* commit '
8773d51eae2a40d95adfe517476e9098eec14166':
Track 64bit changes to android/graphics.
Narayan Kamath [Tue, 28 Jan 2014 19:47:58 +0000 (19:47 +0000)]
resolved conflicts for merge of
b82b2f98 to klp-dev-plus-aosp
Change-Id: Ia110056e5fdd2387c207748b17c5c17d1a18ac5b
Narayan Kamath [Tue, 28 Jan 2014 19:40:08 +0000 (19:40 +0000)]
am
a35ca0ad: am
8697dc67: am
be674bf6: am
23abbfbb: am
154614ab: Merge "AArch64: Use long for pointers in graphics/Camera"
* commit '
a35ca0ada33757164003cd7aee635e6066d83893':
AArch64: Use long for pointers in graphics/Camera
Narayan Kamath [Tue, 28 Jan 2014 19:37:23 +0000 (19:37 +0000)]
resolved conflicts for merge of
583b7b16 to master
merged with "-s ours" since this change has already
been cherry-picked to master.
Narayan Kamath [Tue, 28 Jan 2014 19:26:36 +0000 (19:26 +0000)]
am
8697dc67: am
be674bf6: am
23abbfbb: am
154614ab: Merge "AArch64: Use long for pointers in graphics/Camera"
* commit '
8697dc674c7c5f33201d037e1c3ae59d9893a22d':
AArch64: Use long for pointers in graphics/Camera
Narayan Kamath [Tue, 28 Jan 2014 19:26:29 +0000 (19:26 +0000)]
am
39a789bf: am
7ae1726d: am
aa9ba887: am
6e09eb4c: Merge "AArch64: Make graphics classes 64-bit compatible"
* commit '
39a789bf6efd5c3478a442e60e896cae371fd04c':
AArch64: Make graphics classes 64-bit compatible
Narayan Kamath [Tue, 28 Jan 2014 19:22:12 +0000 (19:22 +0000)]
am
be674bf6: am
23abbfbb: am
154614ab: Merge "AArch64: Use long for pointers in graphics/Camera"
* commit '
be674bf688fec9ce4ec04e77c93644be8253d273':
AArch64: Use long for pointers in graphics/Camera
Narayan Kamath [Tue, 28 Jan 2014 19:22:07 +0000 (19:22 +0000)]
am
7ae1726d: am
aa9ba887: am
6e09eb4c: Merge "AArch64: Make graphics classes 64-bit compatible"
* commit '
7ae1726d0b962878cce4c1fe6c814a315f253293':
AArch64: Make graphics classes 64-bit compatible
Narayan Kamath [Tue, 28 Jan 2014 19:18:45 +0000 (19:18 +0000)]
am
23abbfbb: am
154614ab: Merge "AArch64: Use long for pointers in graphics/Camera"
* commit '
23abbfbb814501b825edc056027270f03f39506b':
AArch64: Use long for pointers in graphics/Camera
Narayan Kamath [Tue, 28 Jan 2014 19:18:40 +0000 (19:18 +0000)]
am
aa9ba887: am
6e09eb4c: Merge "AArch64: Make graphics classes 64-bit compatible"
* commit '
aa9ba887371e875ffbde49f43fa12bb5f123425b':
AArch64: Make graphics classes 64-bit compatible
Narayan Kamath [Tue, 28 Jan 2014 19:16:00 +0000 (11:16 -0800)]
am
9b0f4be0: Merge "Track 64bit changes to android/graphics."
* commit '
9b0f4be0a20ee48a3ddf56438e846231955bd557':
Track 64bit changes to android/graphics.
Narayan Kamath [Tue, 28 Jan 2014 19:15:57 +0000 (11:15 -0800)]
am
154614ab: Merge "AArch64: Use long for pointers in graphics/Camera"
* commit '
154614abbcc819c265bfb79b2626fcee66333ac2':
AArch64: Use long for pointers in graphics/Camera
Narayan Kamath [Tue, 28 Jan 2014 19:15:47 +0000 (11:15 -0800)]
am
6e09eb4c: Merge "AArch64: Make graphics classes 64-bit compatible"
* commit '
6e09eb4c6753f8e5cbd04f9b0c7b65046d27afdb':
AArch64: Make graphics classes 64-bit compatible
Narayan Kamath [Tue, 28 Jan 2014 19:12:33 +0000 (19:12 +0000)]
Merge "Track 64bit changes to android/graphics."
Narayan Kamath [Tue, 28 Jan 2014 19:12:29 +0000 (19:12 +0000)]
Merge "AArch64: Use long for pointers in graphics/Camera"
Narayan Kamath [Tue, 28 Jan 2014 19:12:16 +0000 (19:12 +0000)]
Merge "AArch64: Make graphics classes 64-bit compatible"
Craig Mautner [Tue, 28 Jan 2014 18:19:50 +0000 (18:19 +0000)]
am
af17925f: am
45b68ac3: am
09325627: am
245b58d6: am
baf2c7a4: Merge "[ActivityManager]: Fix the activity visibility state not sync between ActivityManager and WindowManager"
* commit '
af17925f94c3a293022a4c41fc284a0a9312dcb6':
[ActivityManager]: Fix the activity visibility state not sync between ActivityManager and WindowManager
Craig Mautner [Tue, 28 Jan 2014 18:17:31 +0000 (18:17 +0000)]
am
45b68ac3: am
09325627: am
245b58d6: am
baf2c7a4: Merge "[ActivityManager]: Fix the activity visibility state not sync between ActivityManager and WindowManager"
* commit '
45b68ac3a7acb7af95fdfc5c0e31560b3c28c9f8':
[ActivityManager]: Fix the activity visibility state not sync between ActivityManager and WindowManager
Craig Mautner [Tue, 28 Jan 2014 18:13:55 +0000 (18:13 +0000)]
am
09325627: am
245b58d6: am
baf2c7a4: Merge "[ActivityManager]: Fix the activity visibility state not sync between ActivityManager and WindowManager"
* commit '
093256279c308fd3cad290a1b01c5d313bace8af':
[ActivityManager]: Fix the activity visibility state not sync between ActivityManager and WindowManager
Craig Mautner [Tue, 28 Jan 2014 18:11:13 +0000 (18:11 +0000)]
am
245b58d6: am
baf2c7a4: Merge "[ActivityManager]: Fix the activity visibility state not sync between ActivityManager and WindowManager"
* commit '
245b58d6f47740c09ebd47b75e6021c7cfb691af':
[ActivityManager]: Fix the activity visibility state not sync between ActivityManager and WindowManager
Craig Mautner [Tue, 28 Jan 2014 18:08:18 +0000 (10:08 -0800)]
am
baf2c7a4: Merge "[ActivityManager]: Fix the activity visibility state not sync between ActivityManager and WindowManager"
* commit '
baf2c7a400ef27b1f33999498a80e2fb3e05a22f':
[ActivityManager]: Fix the activity visibility state not sync between ActivityManager and WindowManager
Craig Mautner [Tue, 28 Jan 2014 18:05:30 +0000 (18:05 +0000)]
Merge "[ActivityManager]: Fix the activity visibility state not sync between ActivityManager and WindowManager"
Narayan Kamath [Mon, 27 Jan 2014 14:24:16 +0000 (14:24 +0000)]
Track 64bit changes to android/graphics.
All pointers are now 64bits wide, so should be
represented as java longs and not ints.
Also changed DelegateManager and SparseWeakArray to
reflect the new world order.
(cherry picked from commit
88a8364c386c694f7ad56662ef89713dbf7c9d63)
Change-Id: Ic2f55dd6235751169c5014f9d2ccf3f544259a87
Ashok Bhat [Mon, 13 Jan 2014 20:44:05 +0000 (20:44 +0000)]
AArch64: Use long for pointers in graphics/Camera
For storing pointers, long is used in
android/graphics/Camera class, as native
pointers can be 64-bit.
In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use of
jint instead of int in JNI function prototypes)
Change-Id: Ic05ebf2051a225a1638a43f476bab6176c0b5c38
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Ashok Bhat [Mon, 20 Jan 2014 20:08:01 +0000 (20:08 +0000)]
AArch64: Make graphics classes 64-bit compatible
Changes in this patch include
[x] Long is used to store native pointers as they can
be 64-bit.
[x] Some minor changes have been done to conform with
standard JNI practice (e.g. use of jint instead of int
in JNI function prototypes)
[x] AssetAtlasManager is not completely 64-bit compatible
yet. Specifically mAtlasMap member has to be converted
to hold native pointer using long. Added a TODO to
AssetAtlasManager.java to indicate the change required.
Change-Id: I940433f601c6db998c1a8ffff338f5361200d5ed
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Craig Barber <craig.barber@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Andreas Huber [Tue, 28 Jan 2014 17:22:54 +0000 (17:22 +0000)]
Merge "Fix invocation of notification callback in case the callback is modified"
louis_chang [Tue, 28 Jan 2014 10:38:06 +0000 (18:38 +0800)]
[ActivityManager]: Fix the activity visibility state not sync between ActivityManager and WindowManager
Symptom:
When press Home key to home screen, user is able to see the activity's window shown on top of wallpaper and below launcher(widgets).
Root Cause:
The ensureActivitiesVisibleLocked() is called pretty often (for example when a new process bound).
If the top activity "B" was finishing, then the previous activity "A" should be visible.
Therefore, the activity "A" window will be set to visible and then launched activity "A", but it does not updates the visible state in ActivityRecord for "A".
There has a timing issue that if a new activity "C" is started, "C" becomes the new top activity and be resumed.
In that case, Activity "A" window will remain visible even if it is behind a full screen activity "C" because the ActivityRecord.visble of "A" is still false, so the window visibility won't be update.
So when user press home key and back to launcher, the surface of activity "A" will be composed on top of wallpaper.
Solution:
Updates ActivityRecord.visible to true for "A". After "C" is started, the "A" will be called WindowManagerService.setAppVisibility() to set invisible, then called onStop() when execute ensureActivitiesVisibleLocked() again.
Change-Id: I536ba04b95d8d274fea6d679a6493e620bc981e2
Narayan Kamath [Mon, 27 Jan 2014 14:24:16 +0000 (14:24 +0000)]
Track 64bit changes to android/graphics.
All pointers are now 64bits wide, so should be
represented as java longs and not ints.
Also changed DelegateManager and SparseWeakArray to
reflect the new world order.
Change-Id: Ic32b6b53818dbae9b949f03004c4fb6dae26cdbe
Ashok Bhat [Mon, 20 Jan 2014 20:08:01 +0000 (20:08 +0000)]
AArch64: Make graphics classes 64-bit compatible
This a merger of two commits submitted to AOSP by
the following authors:
ashok.bhat@arm.com, david.butcher@arm.coma
craig.barber@arm.com, kevin.petit@arm.com and
marcus.oakland@arm.com
Due to the very large number of internal conflicts, I
have chosen to cherry-pick this change instead
of letting it merge through AOSP because the merge
conflict resolution would be very hard to review.
Commit messages below:
================================================
AArch64: Make graphics classes 64-bit compatible
Changes in this patch include
[x] Long is used to store native pointers as they can
be 64-bit.
[x] Some minor changes have been done to conform with
standard JNI practice (e.g. use of jint instead of int
in JNI function prototypes)
[x] AssetAtlasManager is not completely 64-bit compatible
yet. Specifically mAtlasMap member has to be converted
to hold native pointer using long. Added a TODO to
AssetAtlasManager.java to indicate the change required.
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Craig Barber <craig.barber@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
==================================================================
AArch64: Use long for pointers in graphics/Camera
For storing pointers, long is used in
android/graphics/Camera class, as native
pointers can be 64-bit.
In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use of
jint instead of int in JNI function prototypes)
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
===================================================================
Change-Id: Id5793fa0ebc17ee8b1eecf4b3f327977fdccff71
Mike J. Chen [Tue, 28 Jan 2014 01:55:40 +0000 (17:55 -0800)]
BluetoothInputJava: Add broadcast action REPORT
It's returned by getReport() when callback data is ready.
Change-Id: I751c9e31de3d82a454a62cb8485a230e722b740d
Signed-off-by: Mike J. Chen <mjchen@google.com>
Mike J. Chen [Tue, 28 Jan 2014 01:32:53 +0000 (01:32 +0000)]
am
bfa3f4fd: Merge "BluetoothInputDevice: make REPORT_TYPE values match hal" into klp-modular-dev
* commit '
bfa3f4fd5c30b0d53addc071ecf8e099529f2c77':
BluetoothInputDevice: make REPORT_TYPE values match hal
Mike J. Chen [Tue, 28 Jan 2014 01:28:36 +0000 (01:28 +0000)]
Merge "BluetoothInputDevice: make REPORT_TYPE values match hal" into klp-modular-dev
Selim Gurun [Tue, 28 Jan 2014 01:06:44 +0000 (01:06 +0000)]
Merge "Remove defunct flag"
Dianne Hackborn [Tue, 28 Jan 2014 01:00:21 +0000 (01:00 +0000)]
Merge "Add "start time" timestamp to battery stats."
John Reck [Tue, 28 Jan 2014 00:45:44 +0000 (00:45 +0000)]
Merge "Native-side proxy"
John Reck [Sat, 4 Jan 2014 02:09:17 +0000 (18:09 -0800)]
Native-side proxy
Remove RemoteGLRenderer
Remove reflection-based control
Change-Id: If17c2bbb61c7141986d88c4763def77ed1074985
Andreas Huber [Tue, 28 Jan 2014 00:30:09 +0000 (16:30 -0800)]
Fix invocation of notification callback in case the callback is modified
from a separate thread.
Change-Id: I741c1f2f9c796ec977a742a69cedcca10c5218ad
Mike J. Chen [Tue, 28 Jan 2014 00:27:04 +0000 (16:27 -0800)]
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>
Jeff Brown [Tue, 28 Jan 2014 00:13:27 +0000 (00:13 +0000)]
am
df8b604e: Merge "Fix NPE in deleteDatabase()." into klp-modular-dev
* commit '
df8b604e9bf49bcf9a620e4fe19ccf19c2c49487':
Fix NPE in deleteDatabase().
Jeff Brown [Tue, 28 Jan 2014 00:13:12 +0000 (00:13 +0000)]
am
065d998a: Merge "Hide an old debug function." into klp-modular-dev
* commit '
065d998a4c3d597e924f42635d1a3699a6fcf34b':
Hide an old debug function.
Jeff Brown [Tue, 28 Jan 2014 00:09:42 +0000 (00:09 +0000)]
Merge "Fix NPE in deleteDatabase()." into klp-modular-dev
Jeff Brown [Tue, 28 Jan 2014 00:09:06 +0000 (00:09 +0000)]
Merge "Hide an old debug function." into klp-modular-dev
Jim Miller [Wed, 15 Jan 2014 02:57:03 +0000 (18:57 -0800)]
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
Chris Craik [Mon, 27 Jan 2014 22:30:52 +0000 (22:30 +0000)]
Merge "Use path outlines to define shadow shapes"
Chris Craik [Mon, 27 Jan 2014 22:26:14 +0000 (14:26 -0800)]
Remove logging of DisplayList staleness
Change-Id: Ie6b3af3065d4d10ec0bc9b419223d3458d297ea8
Chris Craik [Mon, 27 Jan 2014 21:58:11 +0000 (13:58 -0800)]
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
Selim Gurun [Mon, 27 Jan 2014 21:39:24 +0000 (13:39 -0800)]
Remove defunct flag
Change-Id: Ib745f225f40a9cd7bf62a93f9546bd31f1507cbf
Baligh Uddin [Mon, 27 Jan 2014 21:31:36 +0000 (21:31 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Mon, 27 Jan 2014 21:31:32 +0000 (21:31 +0000)]
Merge "Import translations. DO NOT MERGE"
Christopher Tate [Mon, 27 Jan 2014 21:09:47 +0000 (21:09 +0000)]
Merge "Update PackageMonitor to recognize new 'replacing' semantics"
Zhihai Xu [Mon, 27 Jan 2014 20:42:18 +0000 (20:42 +0000)]
Merge "bluetoothsocket fd leak, need close the file descriptor after detachFd."
Christopher Tate [Mon, 27 Jan 2014 20:00:21 +0000 (20:00 +0000)]
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.
Mathieu Chartier [Mon, 27 Jan 2014 19:55:35 +0000 (19:55 +0000)]
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.
Christopher Tate [Mon, 27 Jan 2014 19:54:30 +0000 (19:54 +0000)]
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.
Robert Greenwalt [Mon, 27 Jan 2014 19:50:10 +0000 (19:50 +0000)]
Merge "Clean up dhcp no-op logging"
Mathieu Chartier [Mon, 27 Jan 2014 19:49:35 +0000 (19:49 +0000)]
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.
Christopher Tate [Mon, 27 Jan 2014 19:48:03 +0000 (19:48 +0000)]
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.
Christopher Tate [Mon, 27 Jan 2014 19:43:23 +0000 (11:43 -0800)]
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.
Christopher Tate [Mon, 27 Jan 2014 19:40:51 +0000 (11:40 -0800)]
am
1ff4293e: Merge "Fixed race condition in Spinner.DialogPopup on null reference."
* commit '
1ff4293e33f98e6dc19e4f154cb497af9bd88c9d':
Fixed race condition in Spinner.DialogPopup on null reference.
Christopher Tate [Thu, 9 Jan 2014 00:54:25 +0000 (16:54 -0800)]
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
Mathieu Chartier [Mon, 27 Jan 2014 19:30:35 +0000 (19:30 +0000)]
am
15594557: am
137d74d8: am
db525724: Merge "Fix dest == src bugs in Matrix.cpp."
* commit '
15594557f118f670e8d8523e9aed0df3345d28ca':
Fix dest == src bugs in Matrix.cpp.
Christopher Tate [Mon, 27 Jan 2014 19:29:56 +0000 (19:29 +0000)]
Merge "Fixed race condition in Spinner.DialogPopup on null reference."
Andreas Huber [Mon, 27 Jan 2014 19:28:05 +0000 (19:28 +0000)]
Merge "API that allows usage of MediaCodec APIs without polling."
Mathieu Chartier [Mon, 27 Jan 2014 19:20:21 +0000 (11:20 -0800)]
am
137d74d8: am
db525724: Merge "Fix dest == src bugs in Matrix.cpp."
* commit '
137d74d89cc57d146af8ca91ad7830a950c7e8b8':
Fix dest == src bugs in Matrix.cpp.
Mathieu Chartier [Mon, 27 Jan 2014 19:17:13 +0000 (11:17 -0800)]
am
db525724: Merge "Fix dest == src bugs in Matrix.cpp."
* commit '
db5257248637df729ec4f8db58bdfbf0660051b2':
Fix dest == src bugs in Matrix.cpp.
Andreas Huber [Tue, 22 Oct 2013 19:40:01 +0000 (12:40 -0700)]
API that allows usage of MediaCodec APIs without polling.
Change-Id: Iebccdd3aec74a2cfa9ad0bf16c0c6006a3b72999
related-to-bug:
11990118
Griff Hazen [Mon, 27 Jan 2014 18:35:37 +0000 (18:35 +0000)]
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.
Griff Hazen [Mon, 27 Jan 2014 18:31:14 +0000 (18:31 +0000)]
Merge "Make MANAGE_ACTIVITY_STACKS a signature|system permission." into klp-modular-dev
Narayan Kamath [Fri, 24 Jan 2014 13:51:51 +0000 (13:51 +0000)]
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
Narayan Kamath [Fri, 24 Jan 2014 14:14:30 +0000 (14:14 +0000)]
AssetManager cookies are now int32_t, not void*.
Change-Id: Id383e31922ca81c52dad52d422c5c1ab1a1365ce
Christopher Tate [Mon, 16 Dec 2013 23:04:10 +0000 (15:04 -0800)]
Fix MCC/MNC typo
Manual merge of https://android-review.googlesource.com/70831 across
the header refactoring.
Change-Id: I28b6a61e89b68d914124122882976a9d2f81a609
Narayan Kamath [Wed, 11 Dec 2013 16:48:07 +0000 (16:48 +0000)]
Add libutils dependency for libandroidfw host build.
(cherry picked from commit
070274ec0ccb8643c52e41e4119f356f0f51bc36)
Change-Id: I25acff1d36b3adce14b2576485bda93c914d7f5d
Narayan Kamath [Tue, 3 Dec 2013 13:16:03 +0000 (13:16 +0000)]
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
Elliott Hughes [Tue, 29 Oct 2013 22:28:08 +0000 (15:28 -0700)]
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
Adam Lesinski [Fri, 24 Jan 2014 21:27:13 +0000 (13:27 -0800)]
Revert "move libandroidfw to frameworks/native"
This reverts commit
84b6292c33d71b5739828d08aa8101d1954577f2.
Bryan Mawhinney [Fri, 24 Jan 2014 16:18:13 +0000 (16:18 +0000)]
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
Alan Viverette [Wed, 8 Jan 2014 23:15:01 +0000 (15:15 -0800)]
Update BridgeInflater and delegate to support inheritContext arg
Change-Id: I06673f35cd4625301677f74f3e6d49669df7c271
Narayan Kamath [Wed, 18 Dec 2013 13:27:30 +0000 (13:27 +0000)]
Don't pseudolocalize untranslatable strings.
bug: https://code.google.com/p/android/issues/detail?id=63004
(cherry picked from commit
7e1b8ff3e15b35b92978e572ccbfbc47cedce242)
Change-Id: I99ba1a915ae8fc61f70ce570b782108171d0fcaa
Narayan Kamath [Tue, 3 Dec 2013 13:16:03 +0000 (13:16 +0000)]
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
Ying Wang [Fri, 15 Nov 2013 01:12:10 +0000 (17:12 -0800)]
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
Craig Mautner [Wed, 13 Nov 2013 03:24:14 +0000 (19:24 -0800)]
Support API change.
From
https://googleplex-android-review.git.corp.google.com/#/c/387811/.
Change-Id: I3958a55c72b095c53b054c11c5653ba581881188
Adam Lesinski [Tue, 12 Nov 2013 20:59:08 +0000 (12:59 -0800)]
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
Deepanshu Gupta [Mon, 11 Nov 2013 07:17:56 +0000 (12:47 +0530)]
Fix text size in Fake Action Bar
Merge
f4800bc from frameworks/base
Issue:
11436018
Change-Id: Id74c11037cb43d01f6cd79126623c84edfc37aaf
Deepanshu Gupta [Wed, 6 Nov 2013 09:45:32 +0000 (15:15 +0530)]
Elliott Hughes [Tue, 29 Oct 2013 22:25:52 +0000 (15:25 -0700)]
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
Maurice Chu [Wed, 23 Oct 2013 00:33:11 +0000 (17:33 -0700)]
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