OSDN Git Service
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
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
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"
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
Mark Salyzyn [Fri, 13 Nov 2015 15:16:48 +0000 (15:16 +0000)]
Merge "jni: is loggable speedup, not within signal"
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"
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
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
Daichi Hirono [Fri, 13 Nov 2015 06:19:47 +0000 (15:19 +0900)]
Split MtpDatabase class into three classes.
BUG=
25162822
Change-Id: Id64b6d9fa11a3214bb855ea8e1344af45fb415ff
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
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
Steve McKay [Fri, 13 Nov 2015 03:36:19 +0000 (03:36 +0000)]
Merge "Handle shift+arrow correctly in single select mode."
Shreyas Basarge [Fri, 13 Nov 2015 03:01:03 +0000 (03:01 +0000)]
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Jae Seo [Fri, 13 Nov 2015 01:27:40 +0000 (01:27 +0000)]
Merge "AudioService: add a missing call to setSystemAudioMute"
Chris Tate [Fri, 13 Nov 2015 01:04:15 +0000 (01:04 +0000)]
Merge "Drop binder identity before setting widget provider refresh alarm"
Filip Gruszczynski [Fri, 13 Nov 2015 00:35:57 +0000 (00:35 +0000)]
Merge "Fix wrong dock stack bounds after rotation."
Sanket Padawe [Fri, 13 Nov 2015 00:26:54 +0000 (00:26 +0000)]
Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dr-dev am:
5b6ad87630 am:
4f822bbf2a am:
761af3d27d
am:
c9d033a71a
* commit '
c9d033a71afc263c0e493d33e555c3134f665bfb':
Don't allow contact sharing by default for device not recognized as carkit.
Christopher Tate [Fri, 13 Nov 2015 00:21:05 +0000 (16:21 -0800)]
Drop binder identity before setting widget provider refresh alarm
Bug
25607336
Change-Id: I645b79c01206baa548d1d58cf9712ac1768e3b5b
Sanket Padawe [Fri, 13 Nov 2015 00:17:13 +0000 (00:17 +0000)]
Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dr-dev am:
5b6ad87630 am:
4f822bbf2a
am:
761af3d27d
* commit '
761af3d27d40488d46a35a0c0c421a81fdd46cc4':
Don't allow contact sharing by default for device not recognized as carkit.
Casey Dahlin [Fri, 13 Nov 2015 00:17:12 +0000 (00:17 +0000)]
Merge "Add hidden support for arrays of raw file descriptors" am:
376d5f350c am:
7a38be6112
am:
2c19dbeff5
* commit '
2c19dbeff5ef15aaa6e4bfb23dc1fb44631e5036':
Add hidden support for arrays of raw file descriptors
Makoto Onuki [Fri, 13 Nov 2015 00:13:26 +0000 (00:13 +0000)]
Merge "Disallow DA to reset password, also fix all DO checks"
Makoto Onuki [Wed, 11 Nov 2015 20:40:15 +0000 (12:40 -0800)]
Disallow DA to reset password, also fix all DO checks
Now pure DA (not PO, not DO) aren't allowed to change the password
if one is already set.
Also update "isDeviceOwner" check and make sure we always take
user-id into account. If one really wishes to check the package name
only, then use getgetDeviceOwner() instead.
Also change the enforceNotManagedProfile() check to what's more
generic in the FBE world.
Bug
25645900
Bug
25547523
Bug
25643916
Change-Id: I588ecf9452fe3acc1fb0b4ca0457ad662382fcd2
Casey Dahlin [Fri, 13 Nov 2015 00:07:48 +0000 (00:07 +0000)]
Merge "Add hidden support for arrays of raw file descriptors" am:
376d5f350c
am:
7a38be6112
* commit '
7a38be61124fb1d75ed73cdd4050ba25047d2b03':
Add hidden support for arrays of raw file descriptors
Sanket Padawe [Fri, 13 Nov 2015 00:07:47 +0000 (00:07 +0000)]
Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dr-dev am:
5b6ad87630
am:
4f822bbf2a
* commit '
4f822bbf2a1c44c9dc5668857aa8cf7f0e5969cc':
Don't allow contact sharing by default for device not recognized as carkit.
Filip Gruszczynski [Fri, 13 Nov 2015 00:05:24 +0000 (00:05 +0000)]
Merge "Refactoring: deduplicate surface bounds calculation."
Sanket Padawe [Thu, 12 Nov 2015 23:58:48 +0000 (23:58 +0000)]
Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dr-dev
am:
5b6ad87630
* commit '
5b6ad87630756751471f7224672328d955c8f2fb':
Don't allow contact sharing by default for device not recognized as carkit.
Casey Dahlin [Thu, 12 Nov 2015 23:57:58 +0000 (23:57 +0000)]
Merge "Add hidden support for arrays of raw file descriptors"
am:
376d5f350c
* commit '
376d5f350c6618d915338a9927b5d0f5fb61eba8':
Add hidden support for arrays of raw file descriptors
Chong Zhang [Thu, 12 Nov 2015 23:54:33 +0000 (23:54 +0000)]
Merge "Fix lost window warning"
John Reck [Thu, 12 Nov 2015 23:53:46 +0000 (23:53 +0000)]
Merge "Fix flickering issue"
Sanket Padawe [Thu, 12 Nov 2015 23:53:25 +0000 (23:53 +0000)]
Merge "Don't allow contact sharing by default for device not recognized as carkit." into mnc-dr-dev
John Reck [Thu, 12 Nov 2015 23:50:56 +0000 (15:50 -0800)]
Fix flickering issue
Bug:
25411780
Partial-revert for now, reopened b/
22565656 to
deal with the memory use in a followup
Change-Id: I1ec636bc811a85eb2dc4f8c91562dc81b6261355
Casey Dahlin [Thu, 12 Nov 2015 23:50:05 +0000 (23:50 +0000)]
Merge "Add hidden support for arrays of raw file descriptors"
Chong Zhang [Thu, 12 Nov 2015 22:56:28 +0000 (14:56 -0800)]
Fix lost window warning
Mark activity window as invisible with window manager when it's
destroyed normally, to differentiate with the case where the app
crashed while visible.
bug:
25671369
Change-Id: I26d8df6b7e08fc5b65cd2c7aa432a3c5c8c5c7b3
Siyamed Sinir [Thu, 12 Nov 2015 23:42:39 +0000 (23:42 +0000)]
Merge "TextView.append() honors autoLink attribute"
Mark Salyzyn [Tue, 10 Nov 2015 01:56:42 +0000 (17:56 -0800)]
jni: is loggable speedup, not within signal
Speedup by telling __android_is_loggable interface it will not
be called within a signal handler. This saves two system calls.
Bug:
25563384
Change-Id: Ib8188641c8c76e5aa848476da98596be6b8e5040
Joe LaPenna [Thu, 12 Nov 2015 23:29:47 +0000 (23:29 +0000)]
Merge "DO NOT MERGE ANYWHERE Use correct lock for reading/writing usage stats files" into cw-e-dev am:
516ac154e1 -s ours am:
4d93d122bd -s ours
am:
76e30f26af -s ours
* commit '
76e30f26afe9b5971028ce10353da5f760f6738a':
DO NOT MERGE ANYWHERE Use correct lock for reading/writing usage stats files
Joe LaPenna [Thu, 12 Nov 2015 23:27:43 +0000 (23:27 +0000)]
Merge "DO NOT MERGE ANYWHERE Fix system watchdog timeout when reading too many usage events." into cw-e-dev am:
6915d809e8 -s ours am:
2d43dd3c0e -s ours
am:
ddf77e14e5 -s ours
* commit '
ddf77e14e5d6a5b8aa61c0a9f82c099468129df7':
DO NOT MERGE ANYWHERE Fix system watchdog timeout when reading too many usage events.
Siyamed Sinir [Tue, 10 Nov 2015 23:34:29 +0000 (15:34 -0800)]
TextView.append() honors autoLink attribute
The append() method now checks if autoLink is set and adds the
URLSpans to given text before appending to the existing text.
Fixes https://code.google.com/p/android/issues/detail?id=1244
Fixes https://code.google.com/p/android/issues/detail?id=191353
Bug:
1404366
Bug:
25222125
Change-Id: I47a8beec9799e4f92ce266ceed41a634b7f7cc96
Joe LaPenna [Thu, 12 Nov 2015 23:22:32 +0000 (23:22 +0000)]
Merge "DO NOT MERGE ANYWHERE Use correct lock for reading/writing usage stats files" into cw-e-dev am:
516ac154e1 -s ours
am:
4d93d122bd -s ours
* commit '
4d93d122bd8c9988cb4239d5aec7401f6ee3c54b':
DO NOT MERGE ANYWHERE Use correct lock for reading/writing usage stats files
Joe LaPenna [Thu, 12 Nov 2015 23:21:09 +0000 (23:21 +0000)]
Merge "DO NOT MERGE ANYWHERE Fix system watchdog timeout when reading too many usage events." into cw-e-dev am:
6915d809e8 -s ours
am:
2d43dd3c0e -s ours
* commit '
2d43dd3c0e49776589cb21bfbf9b3860623d0bfc':
DO NOT MERGE ANYWHERE Fix system watchdog timeout when reading too many usage events.
Joe LaPenna [Thu, 12 Nov 2015 23:14:29 +0000 (23:14 +0000)]
Merge "DO NOT MERGE ANYWHERE Use correct lock for reading/writing usage stats files" into cw-e-dev
am:
516ac154e1 -s ours
* commit '
516ac154e16324d178fc1343293c4b1d5447ef2c':
DO NOT MERGE ANYWHERE Use correct lock for reading/writing usage stats files
Joe LaPenna [Thu, 12 Nov 2015 23:13:01 +0000 (23:13 +0000)]
Merge "DO NOT MERGE ANYWHERE Fix system watchdog timeout when reading too many usage events." into cw-e-dev
am:
6915d809e8 -s ours
* commit '
6915d809e895d29411c0a687bff7fdd391509dc7':
DO NOT MERGE ANYWHERE Fix system watchdog timeout when reading too many usage events.
Deepanshu Gupta [Thu, 12 Nov 2015 23:12:59 +0000 (23:12 +0000)]
Improve error reporting on Exceptions in fw views. am:
d30c141a2d
am:
e0c9dd1b4f
* commit '
e0c9dd1b4fbeb2667a58686ab8a71e5cfd070e49':
Improve error reporting on Exceptions in fw views.
Chad Brubaker [Thu, 12 Nov 2015 23:11:26 +0000 (23:11 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
OSDN Git Service
