OSDN Git Service

android-x86/frameworks-base.git
8 years agoImport translations. DO NOT MERGE am: 83d65fea01 -s ours am: a6c50551cd -s ours...
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

8 years agoImport translations. DO NOT MERGE am: 83d65fea01 -s ours am: a6c50551cd -s ours...
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

8 years agoMerge "Take out nested synchronisation from LockdownVpn"
Robin Lee [Mon, 16 Nov 2015 14:22:54 +0000 (14:22 +0000)]
Merge "Take out nested synchronisation from LockdownVpn"

8 years agoImport translations. DO NOT MERGE am: 83d65fea01 -s ours am: a6c50551cd -s ours
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

8 years agoImport translations. DO NOT MERGE am: 83d65fea01 -s ours
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

8 years agoImport 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

8 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 16 Nov 2015 13:35:10 +0000 (13:35 +0000)]
Merge "Import translations. DO NOT MERGE"

8 years agoImport 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

8 years agoImport translations. DO NOT MERGE
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

8 years agoImport translations. DO NOT MERGE
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

8 years agoMerge "Start to use MtpDatabase in RootScanner."
Daichi Hirono [Mon, 16 Nov 2015 09:07:51 +0000 (09:07 +0000)]
Merge "Start to use MtpDatabase in RootScanner."

8 years agoStart 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

8 years agoMerge "Prevent NPE in MediaSessionService"
Sungsoo Lim [Mon, 16 Nov 2015 08:10:27 +0000 (08:10 +0000)]
Merge "Prevent NPE in MediaSessionService"

8 years agoMediaBrowser: Handle null results properly in onLoadChildren
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

8 years agoPrevent NPE in MediaSessionService
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

8 years agoImport translations. DO NOT MERGE
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

8 years agoMerge "Fix bug where mExtensions was not initialized."
Christopher Ferris [Sat, 14 Nov 2015 07:14:45 +0000 (07:14 +0000)]
Merge "Fix bug where mExtensions was not initialized."

8 years agoMerge "Mechanical code clean-ups in MSG_UNBIND handler."
Yohei Yukawa [Sat, 14 Nov 2015 06:38:59 +0000 (06:38 +0000)]
Merge "Mechanical code clean-ups in MSG_UNBIND handler."

8 years agoFix bug where mExtensions was not initialized.
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

8 years agoMechanical code clean-ups in MSG_UNBIND handler.
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

8 years agoMerge "Notify client of surface size change if it's changed from last relayout"
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"

8 years agoNotify 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

8 years agoMerge "Add error check for float parsing and fix tests"
Chris Craik [Sat, 14 Nov 2015 00:00:05 +0000 (00:00 +0000)]
Merge "Add error check for float parsing and fix tests"

8 years agoAdd 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

8 years agoMerge "Re-enable wifi firmware debugging"
Vinit Deshpande [Fri, 13 Nov 2015 23:22:40 +0000 (23:22 +0000)]
Merge "Re-enable wifi firmware debugging"

8 years agoEnsuring that fast-alt tab works from Home as well as other apps.
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

8 years agoMerge "Fixed bug where stack crop wasn't applied when it should"
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"

8 years agoMerge "Don't move task if it is already in the destination stack"
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"

8 years agoMerge "Various fixes in setting globals in a script group" am: c011ffd842 am: 7ee861abae
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

8 years agoMerge "Various fixes in setting globals in a script group" am: c011ffd842
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

8 years agoDon't move task if it is already in the destination stack
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

8 years agoMerge "Various fixes in setting globals in a script group"
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

8 years agoMerge "Need to updateSurface if surface size was changed in relayoutWindow"
Chong Zhang [Fri, 13 Nov 2015 21:14:31 +0000 (21:14 +0000)]
Merge "Need to updateSurface if surface size was changed in relayoutWindow"

8 years agoMerge "Various fixes in setting globals in a script group"
Yang Ni [Fri, 13 Nov 2015 21:11:25 +0000 (21:11 +0000)]
Merge "Various fixes in setting globals in a script group"

8 years agoNeed to updateSurface if surface size was changed in relayoutWindow
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

8 years agoMerge "Moved system user apps whitelisting to PM"
Fyodor Kupolov [Fri, 13 Nov 2015 20:00:40 +0000 (20:00 +0000)]
Merge "Moved system user apps whitelisting to PM"

8 years agoFixed bug where stack crop wasn't applied when it should
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

8 years agoMerge "DO NOT MERGE Ensure that the device is provisioned before showing Recents...
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.

8 years agoMerge "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.

8 years agoMerge "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.

8 years agoMerge "Consider stack invisible if it got no running apps."
Chong Zhang [Fri, 13 Nov 2015 18:48:57 +0000 (18:48 +0000)]
Merge "Consider stack invisible if it got no running apps."

8 years agoMerge "DO NOT MERGE Ensure that the device is provisioned before showing Recents...
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.

8 years agoMerge "AAPT2: Add support for overlays when merging resources"
Adam Lesinski [Fri, 13 Nov 2015 18:40:36 +0000 (18:40 +0000)]
Merge "AAPT2: Add support for overlays when merging resources"

8 years agoMerge "Ensure that the device is provisioned before showing Recents."
Winson Chung [Fri, 13 Nov 2015 18:38:12 +0000 (18:38 +0000)]
Merge "Ensure that the device is provisioned before showing Recents."

8 years agoEnsure 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

8 years agoMerge "DO NOT MERGE Ensure that the device is provisioned before showing Recents...
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.

8 years agoMerge "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.

8 years agoMerge "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.

8 years agoMerge "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.

8 years agoMerge "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.

8 years agoMerge "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.

8 years agoMerge "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.

8 years agoMerge "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.

8 years agoMerge "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.

8 years agoMerge "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

8 years agoMerge "DO NOT MERGE Ensure that the device is provisioned before showing Recents...
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

8 years agoVarious fixes in setting globals in a script group
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

8 years agoMerge "Initialize DisplayContent base info when object is constructed" into cw-e...
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

8 years agoMerge "Initialize DisplayContent base info when object is constructed" into cw-e...
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

8 years agoMerge "Initialize DisplayContent base info when object is constructed" into cw-e-dev
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

8 years agoMerge "Initialize DisplayContent base info when object is constructed" into cw-e-dev
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

8 years agoMerge "Trigger WebView relro creation when new provider package installed."
Gustav Sennton [Fri, 13 Nov 2015 17:08:39 +0000 (17:08 +0000)]
Merge "Trigger WebView relro creation when new provider package installed."

8 years agoMerge "Return correct intrinsic dimensions for inset colors"
Alan Viverette [Fri, 13 Nov 2015 15:48:23 +0000 (15:48 +0000)]
Merge "Return correct intrinsic dimensions for inset colors"

8 years agoMerge "jni: is loggable speedup, not within signal" am: 96e780c99c am: 33a0db92aa
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

8 years agoMerge "jni: is loggable speedup, not within signal" am: 96e780c99c
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

8 years agoMerge "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

8 years agoMerge "jni: is loggable speedup, not within signal"
Mark Salyzyn [Fri, 13 Nov 2015 15:16:48 +0000 (15:16 +0000)]
Merge "jni: is loggable speedup, not within signal"

8 years agoMerge "Pass both IPv4 and IPv6 DNS servers as tethering DNS forwarders"
Erik Kline [Fri, 13 Nov 2015 11:54:04 +0000 (11:54 +0000)]
Merge "Pass both IPv4 and IPv6 DNS servers as tethering DNS forwarders"

8 years agoPass both IPv4 and IPv6 DNS servers as tethering DNS forwarders
Erik Kline [Fri, 13 Nov 2015 07:27:24 +0000 (16:27 +0900)]
Pass both IPv4 and IPv6 DNS servers as tethering DNS forwarders

Bug: 9580643
Change-Id: I5b37b9e7a7a10a624bce79836ef876be9d355e90

8 years agoAdd new ACTION_PROVISION_MANAGED_SHAREABLE_DEVICE intent action.
Alan Treadway [Mon, 9 Nov 2015 13:57:19 +0000 (13:57 +0000)]
Add new ACTION_PROVISION_MANAGED_SHAREABLE_DEVICE intent action.

Bug: 25462877
Change-Id: I14bcabf993436d9936091aa82fab698eced9e4d6

8 years agoSplit MtpDatabase class into three classes.
Daichi Hirono [Fri, 13 Nov 2015 06:19:47 +0000 (15:19 +0900)]
Split MtpDatabase class into three classes.

BUG=25162822

Change-Id: Id64b6d9fa11a3214bb855ea8e1344af45fb415ff

8 years agoAdds new method to update existing documents in MtpDatabase.
Daichi Hirono [Tue, 10 Nov 2015 03:52:59 +0000 (12:52 +0900)]
Adds new method to update existing documents in MtpDatabase.

BUG=25162822

Change-Id: I7aa63fc272aa7b57d6a9672565f842774e898a00

8 years agoInitialize DisplayContent base info when object is constructed
Wale Ogunwale [Wed, 30 Sep 2015 17:09:39 +0000 (10:09 -0700)]
Initialize DisplayContent base info when object is constructed

It is possible for an external process (e.g. sys-ui) to call into
WM to get the bounds of a stack in between the construction of the
DisplayContent object and SystemServer telling WM that the display
is ready. Incorrect bounds would be returned to the caller in this
case since the baseDisplayWidth/Height is only set when the displayReady
call is made.
We now initialize the base display information when the DisplayContent
object is created so any call to get the logical display rect of the
display will always return the right bounds. This should be okay as the
display manager is initialized way before window manager.

Bug: 22961090
Change-Id: Iebd688ad8f4c08556846fcebb543e58bd2c01414

8 years agoMerge "Handle shift+arrow correctly in single select mode."
Steve McKay [Fri, 13 Nov 2015 03:36:19 +0000 (03:36 +0000)]
Merge "Handle shift+arrow correctly in single select mode."

8 years agoSync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3...
Shreyas Basarge [Fri, 13 Nov 2015 03:01:03 +0000 (03:01 +0000)]
Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4 am: bf29f10c1e am: 359ee7f47d am: 64bdb9f06b am: c9eb8b4367 am: c4a9c319e5 am: d80d24f5b1 am: 9752605815
am: 69c1bf1de0

* commit '69c1bf1de03037ac75bf0e21dc83b0d7142a0980':
  Sync extras bundle comparison can throw NPE

8 years agoSync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3...
Shreyas Basarge [Fri, 13 Nov 2015 02:55:08 +0000 (02:55 +0000)]
Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4 am: bf29f10c1e am: 359ee7f47d am: 64bdb9f06b am: c9eb8b4367 am: c4a9c319e5 am: d80d24f5b1
am: 9752605815

* commit '9752605815ee8956e855c468d341e9f18031c53e':
  Sync extras bundle comparison can throw NPE

8 years agoSync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3...
Shreyas Basarge [Fri, 13 Nov 2015 02:48:52 +0000 (02:48 +0000)]
Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4 am: bf29f10c1e am: 359ee7f47d am: 64bdb9f06b am: c9eb8b4367 am: c4a9c319e5
am: d80d24f5b1

* commit 'd80d24f5b13c16ce19369b1debb9137516f59e3f':
  Sync extras bundle comparison can throw NPE

8 years agoSync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3...
Shreyas Basarge [Fri, 13 Nov 2015 02:41:55 +0000 (02:41 +0000)]
Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4 am: bf29f10c1e am: 359ee7f47d am: 64bdb9f06b am: c9eb8b4367
am: c4a9c319e5

* commit 'c4a9c319e594fcc4b6772b6f61d0788e108fcb2c':
  Sync extras bundle comparison can throw NPE

8 years agoSync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db...
Matthew Williams [Fri, 13 Nov 2015 02:41:51 +0000 (02:41 +0000)]
Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db02f am: 6d13650c74 am: c455148edc am: af5c9f809c am: 69ee300c90 am: ffffcf14c5 am: 7336557937
am: 0d9b625236

* commit '0d9b62523697f1f97e7d16ee82b59ad3b48c1eb9':
  Sync extras bundle comparison can throw NPE

8 years agoSync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db...
Matthew Williams [Fri, 13 Nov 2015 02:35:52 +0000 (02:35 +0000)]
Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db02f am: 6d13650c74 am: c455148edc am: af5c9f809c am: 69ee300c90 am: ffffcf14c5
am: 7336557937

* commit '73365579374d1460aca6abd05dbbc2e1417dee6f':
  Sync extras bundle comparison can throw NPE

8 years agoSync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3...
Shreyas Basarge [Fri, 13 Nov 2015 02:35:51 +0000 (02:35 +0000)]
Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4 am: bf29f10c1e am: 359ee7f47d am: 64bdb9f06b
am: c9eb8b4367

* commit 'c9eb8b436715ba9b59382759cf0dcf991ed33594':
  Sync extras bundle comparison can throw NPE

8 years agoSync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db...
Matthew Williams [Fri, 13 Nov 2015 02:29:50 +0000 (02:29 +0000)]
Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db02f am: 6d13650c74 am: c455148edc am: af5c9f809c am: 69ee300c90
am: ffffcf14c5

* commit 'ffffcf14c58f9795bda802d75308332d0bb49dfe':
  Sync extras bundle comparison can throw NPE

8 years agoSync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3...
Shreyas Basarge [Fri, 13 Nov 2015 02:29:47 +0000 (02:29 +0000)]
Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4 am: bf29f10c1e am: 359ee7f47d
am: 64bdb9f06b

* commit '64bdb9f06b7fc3e497088243a966dec95d1936e1':
  Sync extras bundle comparison can throw NPE

8 years agoSync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3...
Shreyas Basarge [Fri, 13 Nov 2015 02:23:40 +0000 (02:23 +0000)]
Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4 am: bf29f10c1e
am: 359ee7f47d

* commit '359ee7f47de2eee82951abed294e4db44405973c':
  Sync extras bundle comparison can throw NPE

8 years agoSync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db...
Matthew Williams [Fri, 13 Nov 2015 02:23:37 +0000 (02:23 +0000)]
Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db02f am: 6d13650c74 am: c455148edc am: af5c9f809c
am: 69ee300c90

* commit '69ee300c90288fba6c3f81a37fd347892009e42e':
  Sync extras bundle comparison can throw NPE

8 years agoSync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3...
Shreyas Basarge [Fri, 13 Nov 2015 02:16:24 +0000 (02:16 +0000)]
Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4
am: bf29f10c1e

* commit 'bf29f10c1e7dd37c3020bc7a792bb7bda451a149':
  Sync extras bundle comparison can throw NPE

8 years agoSync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db...
Matthew Williams [Fri, 13 Nov 2015 02:16:19 +0000 (02:16 +0000)]
Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db02f am: 6d13650c74 am: c455148edc
am: af5c9f809c

* commit 'af5c9f809cf7bbb890036a6411504a92e0d507ca':
  Sync extras bundle comparison can throw NPE

8 years agoSync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3...
Shreyas Basarge [Fri, 13 Nov 2015 02:09:36 +0000 (02:09 +0000)]
Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af
am: 44368e6dd4

* commit '44368e6dd4ec56e9eca47b1e81d307f672bb3006':
  Sync extras bundle comparison can throw NPE

8 years agoSync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db...
Matthew Williams [Fri, 13 Nov 2015 02:09:35 +0000 (02:09 +0000)]
Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db02f am: 6d13650c74
am: c455148edc

* commit 'c455148edce05b4862df8853a78276fb5f28151a':
  Sync extras bundle comparison can throw NPE

8 years agoSync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db02f
Matthew Williams [Fri, 13 Nov 2015 02:03:01 +0000 (02:03 +0000)]
Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db02f
am: 6d13650c74

* commit '6d13650c74b7cab047e43a4a3a0b880a832dd2db':
  Sync extras bundle comparison can throw NPE

8 years agoSync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812
Shreyas Basarge [Fri, 13 Nov 2015 02:03:01 +0000 (02:03 +0000)]
Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812
am: f5f03a19af

* commit 'f5f03a19affc6775ac3e44a3540351e132fffc0e':
  Sync extras bundle comparison can throw NPE

8 years agoSync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8
Shreyas Basarge [Fri, 13 Nov 2015 01:56:34 +0000 (01:56 +0000)]
Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8
am: cc7c1d3812

* commit 'cc7c1d381249edfd906cb57afbd8589e6c345141':
  Sync extras bundle comparison can throw NPE

8 years agoSync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2
Matthew Williams [Fri, 13 Nov 2015 01:56:30 +0000 (01:56 +0000)]
Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2
am: a0d20db02f

* commit 'a0d20db02f0e6cfc06ec37cfc68ce626dd35858a':
  Sync extras bundle comparison can throw NPE

8 years agoSync extras bundle comparison can throw NPE am: c0f39c1ece
Matthew Williams [Fri, 13 Nov 2015 01:50:11 +0000 (01:50 +0000)]
Sync extras bundle comparison can throw NPE am: c0f39c1ece
am: 34b700a7c2

* commit '34b700a7c2355f1dbea4b8d796619033bdd87a0c':
  Sync extras bundle comparison can throw NPE

8 years agoSync extras bundle comparison can throw NPE am: 2f137b7705
Shreyas Basarge [Fri, 13 Nov 2015 01:50:02 +0000 (01:50 +0000)]
Sync extras bundle comparison can throw NPE am: 2f137b7705
am: 294611faa8

* commit '294611faa8bd1bdbf75adc3cee835b69d348df86':
  Sync extras bundle comparison can throw NPE

8 years agoSync extras bundle comparison can throw NPE
Matthew Williams [Fri, 13 Nov 2015 01:41:59 +0000 (01:41 +0000)]
Sync extras bundle comparison can throw NPE
am: c0f39c1ece

* commit 'c0f39c1ece72a05c796f7ba30b7a2b5b580d5025':
  Sync extras bundle comparison can throw NPE

8 years agoSync extras bundle comparison can throw NPE
Shreyas Basarge [Fri, 13 Nov 2015 01:41:59 +0000 (01:41 +0000)]
Sync extras bundle comparison can throw NPE
am: 2f137b7705

* commit '2f137b7705875ee026319abb8e512d918c118222':
  Sync extras bundle comparison can throw NPE

8 years agoConsider stack invisible if it got no running apps.
Chong Zhang [Fri, 13 Nov 2015 01:22:40 +0000 (17:22 -0800)]
Consider stack invisible if it got no running apps.

When we close an freeform app by X button while an app is docked on
the other side, ActivityStack.ensureActivitiesVisibleLocked() failed
to make home stack visible, because it's under the freeform stack
which only contains one finishing activity.

We usually will not do another round of ensureActivitiesVisibleLocked
when the activity is destroyed. Need to make sure visibility is adjusted
to the stack below when we start finishing the last app in a stack.

bug: 25668050
Change-Id: Id2a23cb9480221a4e55ba3be9eab51f6efd8a700

8 years agoMerge "AudioService: add a missing call to setSystemAudioMute"
Jae Seo [Fri, 13 Nov 2015 01:27:40 +0000 (01:27 +0000)]
Merge "AudioService: add a missing call to setSystemAudioMute"

8 years agoMerge "Drop binder identity before setting widget provider refresh alarm"
Chris Tate [Fri, 13 Nov 2015 01:04:15 +0000 (01:04 +0000)]
Merge "Drop binder identity before setting widget provider refresh alarm"