222118 Commits

Author SHA1 Message Date
Mark Salyzyn
9f5de191e8 Merge "Revert "jni: is loggable speedup, not within signal"" 2015-11-16 16:30:42 +00:00
Mark Salyzyn
b761d04824 Revert "jni: is loggable speedup, not within signal"
(cherry pick of commit 421d434818aae0977b5b044dd88555a2261efac1)

This reverts commit c954fde0b6e31ec99509faf0bbc33c4c9e4d012a.

Bug: 25693940
Change-Id: I568051aad39e215d677318cd5758962e562187ef
2015-11-16 08:29:03 -08:00
Alan Viverette
49f3bc3dbf Merge "Obtain cached drawables using the correct Resources object" 2015-11-16 15:22:19 +00:00
Alan Viverette
4d07bc99f0 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
2015-11-16 10:19:12 -05:00
Alan Viverette
477f3d092d 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
2015-11-16 10:12:44 -05:00
Geoff Mendal
3adea47fd9 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
2015-11-16 14:42:00 +00:00
Geoff Mendal
b781c9593f 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
2015-11-16 14:26:51 +00:00
Robin Lee
edbdb31274 Merge "Take out nested synchronisation from LockdownVpn" 2015-11-16 14:22:54 +00:00
Geoff Mendal
fb17593356 Import translations. DO NOT MERGE am: 83d65fea01 -s ours am: a6c50551cd -s ours
am: 4510d17575  -s ours

* commit '4510d175753dc4439411b19963cb4bd8bde2c2f4':
  Import translations. DO NOT MERGE
2015-11-16 14:10:31 +00:00
Geoff Mendal
4510d17575 Import translations. DO NOT MERGE am: 83d65fea01 -s ours
am: a6c50551cd  -s ours

* commit 'a6c50551cdcbb70d5d65dbfe68c23e74eea245d9':
  Import translations. DO NOT MERGE
2015-11-16 13:54:50 +00:00
Geoff Mendal
a6c50551cd Import translations. DO NOT MERGE
am: 83d65fea01  -s ours

* commit '83d65fea01c4233c80161acdd69b64fa559c3749':
  Import translations. DO NOT MERGE
2015-11-16 13:38:58 +00:00
Geoff Mendal
857ff2e93a Merge "Import translations. DO NOT MERGE" 2015-11-16 13:35:10 +00:00
Geoff Mendal
97f8aae2f8 Import translations. DO NOT MERGE
Change-Id: Ifa6072a51df82cd0f473908393b500ff8a0d5ec0
Auto-generated-cl: translation import
2015-11-16 05:34:04 -08:00
Geoff Mendal
f905b16c71 Import translations. DO NOT MERGE
Change-Id: Ib120f1b756f35c5e144e4b35a2eae6445ccdced3
Auto-generated-cl: translation import
2015-11-16 05:31:02 -08:00
Geoff Mendal
83d65fea01 Import translations. DO NOT MERGE
Change-Id: Ia050e5148fdf971a3beb18147fd6350fc0984e04
Auto-generated-cl: translation import
2015-11-16 14:18:40 +01:00
Daichi Hirono
27462ebd4e Merge "Start to use MtpDatabase in RootScanner." 2015-11-16 09:07:51 +00:00
Daichi Hirono
dc47344660 Start to use MtpDatabase in RootScanner.
Change-Id: Id99cb61ad8680529b5ee502ca5bb2b3cdd143235
2015-11-16 17:49:20 +09:00
Sungsoo Lim
bc195a6b27 Merge "Prevent NPE in MediaSessionService" 2015-11-16 08:10:27 +00:00
Sungsoo Lim
2189f58ec5 MediaBrowser: Handle null results properly in onLoadChildren
Bug: 19127753
Change-Id: I7ddad87e5ec6338a74c340485fed583107709acf
2015-11-16 14:46:29 +09:00
Sungsoo Lim
5482d342cd Prevent NPE in MediaSessionService
Guard against null UserRecord when dispatching a media key event.

Bug: 22966229
Change-Id: I32f4f87e06d8af13b94bb8f28180a66517c23c33
2015-11-16 14:06:01 +09:00
Filip Gruszczynski
9104aeab59 Split ActivityStack.ensureActivitiesVisibleLocked.
Change-Id: I027b52f76c868bf7b0a04efcca965e812bf3d35c
2015-11-15 16:44:12 -08:00
Geoff Mendal
0477e97830 Import translations. DO NOT MERGE
Change-Id: I1378e54201336a2458b2cf4f8f2982922e8e6ac5
Auto-generated-cl: translation import
2015-11-14 06:08:16 -08:00
Christopher Ferris
676a67bd4e Merge "Fix bug where mExtensions was not initialized." 2015-11-14 07:14:45 +00:00
Yohei Yukawa
1163d085c6 Merge "Mechanical code clean-ups in MSG_UNBIND handler." 2015-11-14 06:38:59 +00:00
Christopher Ferris
be4d8ddf1d 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
2015-11-13 20:10:17 -08:00
Yohei Yukawa
678e38e214 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
2015-11-13 18:36:21 -08:00
Paul Stewart
ae64b185fc WifiEnterpriseConfiguration: Do not print credentials in toString
BUG:25624963
Change-Id: I939a12a27d6b915d8a9cc8b142f645fba0ee42ec
2015-11-13 16:43:53 -08:00
Chong Zhang
55608e7acb Merge "Notify client of surface size change if it's changed from last relayout" 2015-11-14 00:25:35 +00:00
Chong Zhang
5b2f199c85 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
2015-11-14 00:20:49 +00:00
Chris Craik
4bc507851c Merge "Add error check for float parsing and fix tests" 2015-11-14 00:00:05 +00:00
Doris Liu
1e67f08963 Add error check for float parsing and fix tests
Change-Id: Ia4f4863d415536b3796edbcdb83c951b6cff02cf
2015-11-13 15:58:49 -08:00
Eino-Ville Talvala
0b6e1bfae8 Camera: Minor documentation update
- Further clarify hardware.camera feature being only for the back camera

Bug: 24540625
Change-Id: I7a698740475aa4932648c8f62aab81d5f9341030
2015-11-13 15:25:45 -08:00
Vinit Deshpande
0430f187af Merge "Re-enable wifi firmware debugging" 2015-11-13 23:22:40 +00:00
Fyodor Kupolov
e80085d61a Reduce excessive locking in UserManager
Bug: 24979571
Change-Id: I1cfbe48712ae26ec134354d109d2538d566b92d7
2015-11-13 15:22:26 -08:00
Winson
e86deb8adb Ensuring that fast-alt tab works from Home as well as other apps.
Change-Id: Ie4a6e95e790483c283d4257b15cf1b7dd315db28
2015-11-13 22:53:28 +00:00
Wale Ogunwale
16b83907d1 Merge "Fixed bug where stack crop wasn't applied when it should" 2015-11-13 22:45:42 +00:00
Wale Ogunwale
83e3563ee3 Merge "Don't move task if it is already in the destination stack" 2015-11-13 22:29:58 +00:00
Michael Wright
333db2e122 DO NOT MERGE. Prevent recents from coming up when in SUW
Bug: 25229538
Change-Id: Ib19f368e9ef383ba5e60ea0b88193178d5769469
2015-11-13 21:53:14 +00:00
Yang Ni
746955c0d1 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
2015-11-13 21:34:15 +00:00
Yang Ni
89baba188e 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
2015-11-13 21:26:15 +00:00
Wale Ogunwale
70c65c8e47 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
2015-11-13 13:25:16 -08:00
Yang Ni
7ee861abae Merge "Various fixes in setting globals in a script group"
am: c011ffd842

* commit 'c011ffd84296700df4c28b9fc9fa84da9081de41':
  Various fixes in setting globals in a script group
2015-11-13 21:17:33 +00:00
Chong Zhang
dd148eafbe Merge "Need to updateSurface if surface size was changed in relayoutWindow" 2015-11-13 21:14:31 +00:00
Yang Ni
c011ffd842 Merge "Various fixes in setting globals in a script group" 2015-11-13 21:11:25 +00:00
Chong Zhang
f4abc2b701 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
2015-11-13 13:03:48 -08:00
Fyodor Kupolov
9fdc67f900 Merge "Moved system user apps whitelisting to PM" 2015-11-13 20:00:40 +00:00
Wale Ogunwale
69cf50f759 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
2015-11-13 11:22:17 -08:00
Winson Chung
a1ace2219a 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.
2015-11-13 19:02:45 +00:00
Winson Chung
d7532bf4fc 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.
2015-11-13 19:01:25 +00:00
Winson Chung
d2b3d8bff1 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.
2015-11-13 18:51:18 +00:00