OSDN Git Service
Filip Gruszczynski [Fri, 13 Nov 2015 03:08:20 +0000 (19:08 -0800)]
Remove unnecessary DisplayContent.mDisplaySizeLock synchronization.
All operations are performed with WindowManagerService.mWindowMap lock
held, therefore the second lock is not necessary.
Change-Id: I762fb322ddeb8b45191a3d297de0d33a10674f8a
Steve McKay [Mon, 16 Nov 2015 19:47:53 +0000 (19:47 +0000)]
Merge "Add test size annotations to docsui tests."
Jeffrey Vander Stoep [Mon, 16 Nov 2015 19:38:33 +0000 (19:38 +0000)]
Merge "pm: selinux support for AutoPlay apps"
Erik Wolsheimer [Mon, 16 Nov 2015 19:26:12 +0000 (19:26 +0000)]
Log errno when dup fd cannot be allocated BUG:
25165471 am:
211abad3b9 am:
b45defae8e am:
529893f84c am:
7698dd970f
am:
ae4ab3501a
* commit '
ae4ab3501a0400940ace2d0bfdf0d7021c740603':
Log errno when dup fd cannot be allocated BUG:
25165471
Erik Wolsheimer [Mon, 16 Nov 2015 19:20:35 +0000 (19:20 +0000)]
Log errno when dup fd cannot be allocated BUG:
25165471 am:
211abad3b9 am:
b45defae8e am:
529893f84c
am:
7698dd970f
* commit '
7698dd970fbfb81fcdc700827c1620440c6e81a1':
Log errno when dup fd cannot be allocated BUG:
25165471
Erik Wolsheimer [Mon, 16 Nov 2015 19:12:17 +0000 (19:12 +0000)]
Log errno when dup fd cannot be allocated BUG:
25165471 am:
211abad3b9 am:
b45defae8e
am:
529893f84c
* commit '
529893f84cc62893ad6111816954b0bc7c829cee':
Log errno when dup fd cannot be allocated BUG:
25165471
Erik Wolsheimer [Mon, 16 Nov 2015 19:03:52 +0000 (19:03 +0000)]
Log errno when dup fd cannot be allocated BUG:
25165471 am:
211abad3b9
am:
b45defae8e
* commit '
b45defae8e61a4fa3aba9dd08480861d10f5982a':
Log errno when dup fd cannot be allocated BUG:
25165471
Erik Wolsheimer [Mon, 16 Nov 2015 18:55:29 +0000 (18:55 +0000)]
Log errno when dup fd cannot be allocated BUG:
25165471
am:
211abad3b9
* commit '
211abad3b92b70dd094949c79f67e686c940fa0c':
Log errno when dup fd cannot be allocated BUG:
25165471
Selim Cinek [Mon, 16 Nov 2015 18:52:32 +0000 (18:52 +0000)]
Merge "Fixed a crash with the heads up manager"
Selim Cinek [Mon, 16 Nov 2015 18:46:33 +0000 (18:46 +0000)]
Merge "Fixed error in GroupManager"
Selim Cinek [Mon, 16 Nov 2015 18:44:56 +0000 (18:44 +0000)]
Merge "Fixed a bug where a notification could get removed"
Selim Cinek [Mon, 16 Nov 2015 18:43:33 +0000 (18:43 +0000)]
Merge "Allow clicking fullscreen intent notifications now"
Erik Wolsheimer [Fri, 13 Nov 2015 19:54:47 +0000 (11:54 -0800)]
Log errno when dup fd cannot be allocated
BUG:
25165471
Change-Id: I7342e2b4c566325fc2e15643a7c7b6ba989ee8c7
Tony Mantler [Mon, 16 Nov 2015 18:12:51 +0000 (18:12 +0000)]
Merge "Move some methods to DeviceInfoUtils in SettingsLib"
Geoff Mendal [Mon, 16 Nov 2015 17:50:57 +0000 (17:50 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am:
812794f0f5 -s ours
am:
f39bb92f5a -s ours
* commit '
f39bb92f5a90b9d3e2e958535c16eee5a7aacd97':
Import translations. DO NOT MERGE
Alan Viverette [Mon, 16 Nov 2015 17:46:58 +0000 (17:46 +0000)]
Merge "Clean up usage of temporary TypedValue in Resources"
Tony Mantler [Tue, 10 Nov 2015 18:40:14 +0000 (10:40 -0800)]
Move some methods to DeviceInfoUtils in SettingsLib
Change-Id: I646c89c2803e4386a4b24f10ec186871768e7239
Geoff Mendal [Mon, 16 Nov 2015 17:44:03 +0000 (17:44 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am:
812794f0f5 -s ours
* commit '
812794f0f5dfba607bcdd648611317df10ca0d49':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Nov 2015 17:39:29 +0000 (17:39 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
Geoff Mendal [Mon, 16 Nov 2015 17:37:07 +0000 (17:37 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am:
f34cefdc2d -s ours am:
ee144ce3ba -s ours
am:
62f520fc88 -s ours
* commit '
62f520fc8872fed4b5289afdd9ab94141711e73a':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Nov 2015 17:31:23 +0000 (18:31 +0100)]
Import translations. DO NOT MERGE
Change-Id: Ie5a78ca8aadcfd06937b3c917e9d7c99cdc1da0c
Auto-generated-cl: translation import
Geoff Mendal [Mon, 16 Nov 2015 17:29:04 +0000 (17:29 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am:
f34cefdc2d -s ours
am:
ee144ce3ba -s ours
* commit '
ee144ce3baec585e19da454de95d05ed0f1a0bcf':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Nov 2015 17:22:23 +0000 (17:22 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
am:
f34cefdc2d -s ours
* commit '
f34cefdc2d7d2e1b702a5af8f31bdebba455f81d':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Nov 2015 17:17:31 +0000 (17:17 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
Geoff Mendal [Mon, 16 Nov 2015 17:16:28 +0000 (18:16 +0100)]
Import translations. DO NOT MERGE
Change-Id: I1d71c3b6382fb097a4c33f0210138537b48215f0
Auto-generated-cl: translation import
Geoff Mendal [Mon, 16 Nov 2015 17:04:31 +0000 (17:04 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 16 Nov 2015 17:01:32 +0000 (18:01 +0100)]
Import translations. DO NOT MERGE
Change-Id: Ieb29e82bd8fe81930b730e3334f59d496dfd785c
Auto-generated-cl: translation import
Filip Gruszczynski [Mon, 16 Nov 2015 16:58:13 +0000 (16:58 +0000)]
Merge "Split ActivityStack.ensureActivitiesVisibleLocked."
Mark Salyzyn [Mon, 16 Nov 2015 16:30:42 +0000 (16:30 +0000)]
Merge "Revert "jni: is loggable speedup, not within signal""
Mark Salyzyn [Mon, 16 Nov 2015 16:24:52 +0000 (16:24 +0000)]
Revert "jni: is loggable speedup, not within signal"
(cherry pick of commit
421d434818aae0977b5b044dd88555a2261efac1)
This reverts commit
c954fde0b6e31ec99509faf0bbc33c4c9e4d012a.
Bug:
25693940
Change-Id: I568051aad39e215d677318cd5758962e562187ef
Alan Viverette [Mon, 16 Nov 2015 15:22:19 +0000 (15:22 +0000)]
Merge "Obtain cached drawables using the correct Resources object"
Alan Viverette [Mon, 16 Nov 2015 15:19:12 +0000 (10:19 -0500)]
Clean up usage of temporary TypedValue in Resources
Reduces the amount of time that a lock is held and reduces the scope of
the lock to only manage the temporary TypedValue. Also ensures that the
typed value is consistently returned to the (single item) pool.
Additionally, performs some refactoring:
- removes unused variables and constants
- moves the NotFoundException cause into the constructor for consistency
with other Exceptions
- inlines sPreloadedDensity which was not used anywhere
- fixes line wrapping and indentation in nearby code
Aside from improvements to locking, there are no functional changes in
this CL.
Change-Id: I8c3059261e3cc2288a086e6637ab946e0b7d3741
Clean up usage of temporary TypedValue in Resources
Reduces the amount of time that a lock is held and reduces the scope of
the lock to only manage the temporary TypedValue. Also ensures that the
typed value is consistently returned to the (single item) pool.
Additionally, performs some refactoring:
- removes unused variables and constants
- moves the NotFoundException cause into the constructor for consistency
with other Exceptions
- inlines sPreloadedDensity which was not used anywhere
- fixes line wrapping and indentation in nearby code
Aside from improvements to locking, there are no functional changes in
this CL.
Change-Id: I8c3059261e3cc2288a086e6637ab946e0b7d3741
Alan Viverette [Fri, 13 Nov 2015 22:04:43 +0000 (17:04 -0500)]
Obtain cached drawables using the correct Resources object
Previously we were discarding the Resources when forwarding from the
two-arg factory method to the one-arg method. This CL also updates the
documentation for ConstantState to be slightly more comprehensive.
Bug:
25688078
Change-Id: I4fbbf43f95fe792fa6f0bf9db8fd9a7cbfa51d1d
Geoff Mendal [Mon, 16 Nov 2015 14:42:00 +0000 (14:42 +0000)]
Import translations. DO NOT MERGE am:
83d65fea01 -s ours am:
a6c50551cd -s ours am:
4510d17575 -s ours am:
fb17593356 -s ours
am:
b781c9593f -s ours
* commit '
b781c9593f1ccf0dba818a52285c531669d06bf8':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Nov 2015 14:26:51 +0000 (14:26 +0000)]
Import translations. DO NOT MERGE am:
83d65fea01 -s ours am:
a6c50551cd -s ours am:
4510d17575 -s ours
am:
fb17593356 -s ours
* commit '
fb175933566d5869e4d069334abec82f67665083':
Import translations. DO NOT MERGE
Robin Lee [Mon, 16 Nov 2015 14:22:54 +0000 (14:22 +0000)]
Merge "Take out nested synchronisation from LockdownVpn"
Geoff Mendal [Mon, 16 Nov 2015 14:10:31 +0000 (14:10 +0000)]
Import translations. DO NOT MERGE am:
83d65fea01 -s ours am:
a6c50551cd -s ours
am:
4510d17575 -s ours
* commit '
4510d175753dc4439411b19963cb4bd8bde2c2f4':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Nov 2015 13:54:50 +0000 (13:54 +0000)]
Import translations. DO NOT MERGE am:
83d65fea01 -s ours
am:
a6c50551cd -s ours
* commit '
a6c50551cdcbb70d5d65dbfe68c23e74eea245d9':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Nov 2015 13:38:58 +0000 (13:38 +0000)]
Import translations. DO NOT MERGE
am:
83d65fea01 -s ours
* commit '
83d65fea01c4233c80161acdd69b64fa559c3749':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Nov 2015 13:35:10 +0000 (13:35 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 16 Nov 2015 13:34:04 +0000 (05:34 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ifa6072a51df82cd0f473908393b500ff8a0d5ec0
Auto-generated-cl: translation import
Geoff Mendal [Mon, 16 Nov 2015 13:31:02 +0000 (05:31 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ib120f1b756f35c5e144e4b35a2eae6445ccdced3
Auto-generated-cl: translation import
Geoff Mendal [Mon, 16 Nov 2015 13:18:40 +0000 (14:18 +0100)]
Import translations. DO NOT MERGE
Change-Id: Ia050e5148fdf971a3beb18147fd6350fc0984e04
Auto-generated-cl: translation import
Daichi Hirono [Mon, 16 Nov 2015 09:07:51 +0000 (09:07 +0000)]
Merge "Start to use MtpDatabase in RootScanner."
Daichi Hirono [Fri, 13 Nov 2015 06:42:28 +0000 (15:42 +0900)]
Start to use MtpDatabase in RootScanner.
Change-Id: Id99cb61ad8680529b5ee502ca5bb2b3cdd143235
Sungsoo Lim [Mon, 16 Nov 2015 08:10:27 +0000 (08:10 +0000)]
Merge "Prevent NPE in MediaSessionService"
Sungsoo Lim [Tue, 10 Nov 2015 06:19:56 +0000 (15:19 +0900)]
MediaBrowser: Handle null results properly in onLoadChildren
Bug:
19127753
Change-Id: I7ddad87e5ec6338a74c340485fed583107709acf
Sungsoo Lim [Mon, 16 Nov 2015 05:00:52 +0000 (14:00 +0900)]
Prevent NPE in MediaSessionService
Guard against null UserRecord when dispatching a media key event.
Bug:
22966229
Change-Id: I32f4f87e06d8af13b94bb8f28180a66517c23c33
Filip Gruszczynski [Sat, 14 Nov 2015 00:42:05 +0000 (16:42 -0800)]
Split ActivityStack.ensureActivitiesVisibleLocked.
Change-Id: I027b52f76c868bf7b0a04efcca965e812bf3d35c
Geoff Mendal [Sat, 14 Nov 2015 14:08:16 +0000 (06:08 -0800)]
Import translations. DO NOT MERGE
Change-Id: I1378e54201336a2458b2cf4f8f2982922e8e6ac5
Auto-generated-cl: translation import
Christopher Ferris [Sat, 14 Nov 2015 07:14:45 +0000 (07:14 +0000)]
Merge "Fix bug where mExtensions was not initialized."
Yohei Yukawa [Sat, 14 Nov 2015 06:38:59 +0000 (06:38 +0000)]
Merge "Mechanical code clean-ups in MSG_UNBIND handler."
Christopher Ferris [Sat, 14 Nov 2015 02:15:26 +0000 (18:15 -0800)]
Fix bug where mExtensions was not initialized.
Recent changes to mExtensions moved the initialization code from the
constructor to a separate function called load. Make sure to call
this function in the initExtensions function call.
Bug:
25615666
Change-Id: Ic016232c42afefd3b5bc3e4bd5c8428a11c454ad
Yohei Yukawa [Sat, 14 Nov 2015 02:36:21 +0000 (18:36 -0800)]
Mechanical code clean-ups in MSG_UNBIND handler.
As a preparation to fix Bug
25373872, this CL does a mechanical
code clean-ups. Literally there is no behavior change.
Bug:
24504456
Change-Id: I6e3062bda17e748a3c5f1450d6752239dd260520
Chong Zhang [Sat, 14 Nov 2015 00:25:35 +0000 (00:25 +0000)]
Merge "Notify client of surface size change if it's changed from last relayout"
Chong Zhang [Fri, 13 Nov 2015 23:40:36 +0000 (15:40 -0800)]
Notify client of surface size change if it's changed from last relayout
Not just when it's changed during this relayout.
bug:
25596610
Also add the delayed surface to removal list regardless of the show
result, it won't be destroyed until window is ready to show but we
need to add it to the list first.
bug:
25666160
Change-Id: I6fceada1bdc1de0a5b5a4d6dc261957164817330
Chris Craik [Sat, 14 Nov 2015 00:00:05 +0000 (00:00 +0000)]
Merge "Add error check for float parsing and fix tests"
Doris Liu [Thu, 12 Nov 2015 23:57:45 +0000 (15:57 -0800)]
Add error check for float parsing and fix tests
Change-Id: Ia4f4863d415536b3796edbcdb83c951b6cff02cf
Vinit Deshpande [Fri, 13 Nov 2015 23:22:40 +0000 (23:22 +0000)]
Merge "Re-enable wifi firmware debugging"
Winson [Thu, 12 Nov 2015 17:32:10 +0000 (09:32 -0800)]
Ensuring that fast-alt tab works from Home as well as other apps.
Change-Id: Ie4a6e95e790483c283d4257b15cf1b7dd315db28
Wale Ogunwale [Fri, 13 Nov 2015 22:45:42 +0000 (22:45 +0000)]
Merge "Fixed bug where stack crop wasn't applied when it should"
Wale Ogunwale [Fri, 13 Nov 2015 22:29:58 +0000 (22:29 +0000)]
Merge "Don't move task if it is already in the destination stack"
Yang Ni [Fri, 13 Nov 2015 21:34:15 +0000 (21:34 +0000)]
Merge "Various fixes in setting globals in a script group" am:
c011ffd842 am:
7ee861abae
am:
89baba188e
* commit '
89baba188eab42c424cc96eb62114d660ab6c992':
Various fixes in setting globals in a script group
Yang Ni [Fri, 13 Nov 2015 21:26:15 +0000 (21:26 +0000)]
Merge "Various fixes in setting globals in a script group" am:
c011ffd842
am:
7ee861abae
* commit '
7ee861abaeac214a889d8f4113db41970599793b':
Various fixes in setting globals in a script group
Wale Ogunwale [Fri, 13 Nov 2015 21:25:16 +0000 (13:25 -0800)]
Don't move task if it is already in the destination stack
When moving a task from one stack to another we detach the source
stack from the display if the stack is empty after the task move.
If the source and destination stack are the same we detach the
stack from the display when the task is removed, but it isn't
re-attached to the display when the task is add back since we
only attach stacks to displays when they are created.
We no longer try to move the task if it is already in the destination
stack.
Bug:
25671469
Change-Id: Idde54d362a35716223bc5f1143000111af380239
Yang Ni [Fri, 13 Nov 2015 21:17:33 +0000 (21:17 +0000)]
Merge "Various fixes in setting globals in a script group"
am:
c011ffd842
* commit '
c011ffd84296700df4c28b9fc9fa84da9081de41':
Various fixes in setting globals in a script group
Chong Zhang [Fri, 13 Nov 2015 21:14:31 +0000 (21:14 +0000)]
Merge "Need to updateSurface if surface size was changed in relayoutWindow"
Yang Ni [Fri, 13 Nov 2015 21:11:25 +0000 (21:11 +0000)]
Merge "Various fixes in setting globals in a script group"
Chong Zhang [Fri, 13 Nov 2015 07:40:58 +0000 (23:40 -0800)]
Need to updateSurface if surface size was changed in relayoutWindow
On some chips, SurfaceControl.setSize will not take effect for several
frames. We have to also do a updateSurface/invalidate (which destroys
and creates the EGLSurface) to get the size right.
Keep track of SurfaceControl size changes in window manager, and pass
that to ViewRootImpl, so that a updateSurface is done either the surface
itself or its size is changed.
Note that we don't use frame size change to trigger updateSurface, because
frame size could be different from the surface size that window manager set.
For example during drag resizing, the surface size is fullscreen although
frame size changes constantly. Doing updateSurface upon frame size change
could cause us to do many unnecessary updateSurface.
bug:
25583942
Change-Id: I1989613a187bb6ef1c179bd2800c6a7b01fcdb3a
Fyodor Kupolov [Fri, 13 Nov 2015 20:00:40 +0000 (20:00 +0000)]
Merge "Moved system user apps whitelisting to PM"
Wale Ogunwale [Fri, 13 Nov 2015 19:08:36 +0000 (11:08 -0800)]
Fixed bug where stack crop wasn't applied when it should
- Apply stack crop if window isn't animating when replacing window.
We were previously not applying the crop if replacing window regardless
of the animation state.
- Apply stack crop if the current docked window isn't animating.
We were previously not applying if any window in the system is animating.
- Also created setter/getter methods for WindowAnimator.mAnimating
to make debugging easier.
Bug:
25645069
Change-Id: I671549626e218358a7dea9e78bd0b2a1f1b3a51e
Winson Chung [Fri, 13 Nov 2015 19:02:45 +0000 (19:02 +0000)]
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am:
bb4da4efc3 am:
b133b984a0 am:
32265b9ea0 -s ours am:
d45a18c8ec am:
ef15ca85d7 am:
28fc76ecef am:
20ba5c919b
am:
d2b3d8bff1 -s ours
* commit '
d2b3d8bff1deb5a699a97dd9b3377ff02211e6c6':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
Winson Chung [Fri, 13 Nov 2015 19:01:25 +0000 (19:01 +0000)]
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into mnc-dev am:
dce0f8040d am:
3e9f2b7894 am:
1b29fd87a2 am:
3bab0fd4f7
am:
ef5feb290a -s ours
* commit '
ef5feb290a325a4943d2dea74f5a1f4844567bef':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
Winson Chung [Fri, 13 Nov 2015 18:51:18 +0000 (18:51 +0000)]
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am:
bb4da4efc3 am:
b133b984a0 am:
32265b9ea0 -s ours am:
d45a18c8ec am:
ef15ca85d7 am:
28fc76ecef
am:
20ba5c919b
* commit '
20ba5c919bb97bb922919a34b3a081ea26b25000':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
Chong Zhang [Fri, 13 Nov 2015 18:48:57 +0000 (18:48 +0000)]
Merge "Consider stack invisible if it got no running apps."
Winson Chung [Fri, 13 Nov 2015 18:44:29 +0000 (18:44 +0000)]
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am:
bb4da4efc3 am:
b133b984a0 am:
32265b9ea0 -s ours am:
d45a18c8ec am:
ef15ca85d7
am:
28fc76ecef
* commit '
28fc76ecef04061bfdbad2f5dc52bc1d5daf0e0d':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
Adam Lesinski [Fri, 13 Nov 2015 18:40:36 +0000 (18:40 +0000)]
Merge "AAPT2: Add support for overlays when merging resources"
Winson Chung [Fri, 13 Nov 2015 18:38:12 +0000 (18:38 +0000)]
Merge "Ensure that the device is provisioned before showing Recents."
Winson [Wed, 11 Nov 2015 00:07:13 +0000 (16:07 -0800)]
Ensure that the device is provisioned before showing Recents.
Bug:
25476219
Change-Id: I87b78d4c3ca1e4d71280f057f3e076cc456bbf8f
Winson Chung [Fri, 13 Nov 2015 18:37:15 +0000 (18:37 +0000)]
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am:
bb4da4efc3 am:
b133b984a0 am:
32265b9ea0 -s ours am:
d45a18c8ec
am:
ef15ca85d7
* commit '
ef15ca85d7f847884e391e3283daabb019e44e10':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
Winson Chung [Fri, 13 Nov 2015 18:29:35 +0000 (18:29 +0000)]
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into mnc-dev am:
dce0f8040d am:
3e9f2b7894 am:
1b29fd87a2
am:
3bab0fd4f7
* commit '
3bab0fd4f7b848d45ce94b96abbdc537d1e47a5a':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
Winson Chung [Fri, 13 Nov 2015 18:29:33 +0000 (18:29 +0000)]
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am:
bb4da4efc3 am:
b133b984a0 am:
32265b9ea0 -s ours
am:
d45a18c8ec
* commit '
d45a18c8eca074f8c83a64ed465021a61becb49a':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
Winson Chung [Fri, 13 Nov 2015 18:21:55 +0000 (18:21 +0000)]
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am:
bb4da4efc3 am:
b133b984a0
am:
32265b9ea0 -s ours
* commit '
32265b9ea000b04ac62f3c114edb063246260401':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
Winson Chung [Fri, 13 Nov 2015 18:21:53 +0000 (18:21 +0000)]
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into mnc-dev am:
dce0f8040d am:
3e9f2b7894
am:
1b29fd87a2
* commit '
1b29fd87a26d6230c55c701d1411b34342614af0':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
Winson Chung [Fri, 13 Nov 2015 18:15:30 +0000 (18:15 +0000)]
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am:
bb4da4efc3
am:
b133b984a0
* commit '
b133b984a0644a78270d51007123e75ded24eb14':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
Winson Chung [Fri, 13 Nov 2015 18:15:29 +0000 (18:15 +0000)]
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into mnc-dev am:
dce0f8040d
am:
3e9f2b7894
* commit '
3e9f2b789414f34b5530107c362295c5a637bac1':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
Winson Chung [Fri, 13 Nov 2015 18:08:38 +0000 (18:08 +0000)]
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev
am:
bb4da4efc3
* commit '
bb4da4efc320caee77f11bb316145b8e5f264e07':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
Winson Chung [Fri, 13 Nov 2015 18:08:35 +0000 (18:08 +0000)]
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into mnc-dev
am:
dce0f8040d
* commit '
dce0f8040dcce494166832eb6c1e8a2d9638ddd4':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
Winson Chung [Fri, 13 Nov 2015 18:02:47 +0000 (18:02 +0000)]
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into mnc-dev
Winson Chung [Fri, 13 Nov 2015 18:02:38 +0000 (18:02 +0000)]
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev
Yang Ni [Tue, 10 Nov 2015 21:27:04 +0000 (13:27 -0800)]
Various fixes in setting globals in a script group
Bug:
25602504
1) Passing floating point values into a script group was broken,
since they were casted to long values. Fixed that in the frameworks
implementation by taking the raw bits instead.
2) Passing 64-bit values into a script group was broken on 32-bit
platforms, since they were casted to pointer-sized integers
(uintptr_t) in the JNI code. Fixed that by casting to int64_t
instead.
3) Setting global variables of Allocation type in a script group was
broken. The special size value -1 was used to indicate the value is an
Allocation. However, size was casted to size_t in the JNI code.
Fixed that by using signed integers.
Change-Id: Ifff099a76be7707df7b67c388395f5a00f9cae66
Filip Gruszczynski [Fri, 13 Nov 2015 17:47:32 +0000 (17:47 +0000)]
Merge "Initialize DisplayContent base info when object is constructed" into cw-e-dev am:
fe482e0bca am:
0e6007d229
am:
f9661eafa0 -s ours
* commit '
f9661eafa0de1e9fe0bdf12d8c23ad087ece8729':
Initialize DisplayContent base info when object is constructed
Filip Gruszczynski [Fri, 13 Nov 2015 17:26:47 +0000 (17:26 +0000)]
Merge "Initialize DisplayContent base info when object is constructed" into cw-e-dev am:
fe482e0bca
am:
0e6007d229
* commit '
0e6007d22928da4c529a5fa773fbeeb441421804':
Initialize DisplayContent base info when object is constructed
Filip Gruszczynski [Fri, 13 Nov 2015 17:20:05 +0000 (17:20 +0000)]
Merge "Initialize DisplayContent base info when object is constructed" into cw-e-dev
am:
fe482e0bca
* commit '
fe482e0bcabb98d983ecb4080b35490b9814c809':
Initialize DisplayContent base info when object is constructed
Filip Gruszczynski [Fri, 13 Nov 2015 17:15:14 +0000 (17:15 +0000)]
Merge "Initialize DisplayContent base info when object is constructed" into cw-e-dev
Gustav Sennton [Fri, 13 Nov 2015 17:08:39 +0000 (17:08 +0000)]
Merge "Trigger WebView relro creation when new provider package installed."
Alan Viverette [Fri, 13 Nov 2015 15:48:23 +0000 (15:48 +0000)]
Merge "Return correct intrinsic dimensions for inset colors"
Mark Salyzyn [Fri, 13 Nov 2015 15:36:07 +0000 (15:36 +0000)]
Merge "jni: is loggable speedup, not within signal" am:
96e780c99c am:
33a0db92aa
am:
5f6b645985
* commit '
5f6b6459853700c85d71906eb7b758a17ffb32ba':
jni: is loggable speedup, not within signal
Mark Salyzyn [Fri, 13 Nov 2015 15:29:35 +0000 (15:29 +0000)]
Merge "jni: is loggable speedup, not within signal" am:
96e780c99c
am:
33a0db92aa
* commit '
33a0db92aaf1f50cefaab0215b59e7e513f55d32':
jni: is loggable speedup, not within signal
Mark Salyzyn [Fri, 13 Nov 2015 15:22:05 +0000 (15:22 +0000)]
Merge "jni: is loggable speedup, not within signal"
am:
96e780c99c
* commit '
96e780c99c46e805989b7f1d6486cef96c7d2c27':
jni: is loggable speedup, not within signal
OSDN Git Service
