Michael Kwan
49fa0405b1
Merge "Only modify window layout params when necessary." into cw-f-dev am: 9fbd981f23
...
am: a26e371c9b
2017-02-14 01:00:23 +00:00
Michael Kwan
a26e371c9b
Merge "Only modify window layout params when necessary." into cw-f-dev
...
am: 9fbd981f23
2017-02-14 00:55:32 +00:00
Michael Kwan
9fbd981f23
Merge "Only modify window layout params when necessary." into cw-f-dev
2017-02-14 00:48:12 +00:00
Hakan Seyalioglu
aeb1f1241e
DO NOT MERGE - Check exported status in chooser
...
am: 7bae18232e
2017-02-14 00:41:55 +00:00
Hakan Seyalioglu
7bae18232e
DO NOT MERGE - Check exported status in chooser
...
Relevant change in master is ag/1844170
bug: 34147053
Change-Id: Ic9d9d65c66325904c95ab3966bdcc16e7668278b
(cherry picked from commit e3286c3145
2017-02-13 23:12:28 +00:00
Michael Kwan
134ad6ef3f
Only modify window layout params when necessary.
...
Cancelling swipe-to-dismiss will trigger a check to ensure the window
is reset to its original state. Ensure that the reset is actually
required before setting the new layout attributes.
Bug: 34816397
Change-Id: Idf26ce7c8b63dc44a76effefcb32eb8d8665f605
2017-02-13 13:20:09 -08:00
Michael Kwan
6853de9729
Add tweaks to smooth out swipe to dismiss. am: 5758a9a94c
...
am: 2155f773db
2017-02-13 19:38:32 +00:00
Michael Kwan
2155f773db
Add tweaks to smooth out swipe to dismiss.
...
am: 5758a9a94c
2017-02-13 19:32:35 +00:00
Michael Kwan
5758a9a94c
Add tweaks to smooth out swipe to dismiss.
...
Bug: 34673753
Change-Id: I5a9d420c70d124fc764803d505291e66818b1aa2
(cherry picked from commit 2e11adaac3
2017-02-13 06:17:06 +00:00
Jesse Hall
516274249f
resolve merge conflicts of b3a1417663 to nyc-mr2-dev-plus-aosp
...
Test: mmma frameworks/base
Change-Id: I2e1e04f55d05fd8aa33da304bdb951713b37793c
2017-02-10 17:15:15 -08:00
Jesse Hall
b3a1417663
Zygote: Restore GL preload
...
Preloading GLES drivers in Zygote was removed previously since it is
incompatible with updatable drivers. That caused some app startup
latency and system memory use regressions. This change re-adds GLES
driver preloading, but only on devices that don't support driver
updates.
Bug: 34611670
Bug: 35052548
Test: boot angler, systrace of Calculator app startup
Change-Id: Ibdc6b3c0ba4473574722641d4bfad4b375f908a3
(cherry picked from commit ba0370eef3
2017-02-10 12:59:10 -08:00
Alan Viverette
07a6ff6989
Merge "Don't scroll popup parent in response to parent scrolling" into nyc-mr2-dev
...
am: 41023417e7
2017-02-10 18:43:47 +00:00
TreeHugger Robot
41023417e7
Merge "Don't scroll popup parent in response to parent scrolling" into nyc-mr2-dev
2017-02-10 18:35:37 +00:00
Rubin Xu
6ee5a0c8a5
Merge "Fix uri permission grant on remote bug report uri" into nyc-dev am: 42f2e80293 am: 824c8284ce am: 72074e3ab9 am: f85a20702a
...
am: 060cde9802
2017-02-10 12:32:48 +00:00
Rubin Xu
060cde9802
Merge "Fix uri permission grant on remote bug report uri" into nyc-dev am: 42f2e80293 am: 824c8284ce am: 72074e3ab9
...
am: f85a20702a
2017-02-10 12:28:56 +00:00
Rubin Xu
0f2c853889
Merge "Fix uri permission grant on remote bug report uri" into nyc-dev am: 42f2e80293 am: 824c8284ce am: 72074e3ab9
...
am: f85a20702a
2017-02-10 12:28:47 +00:00
Rubin Xu
f85a20702a
Merge "Fix uri permission grant on remote bug report uri" into nyc-dev am: 42f2e80293 am: 824c8284ce
...
am: 72074e3ab9
2017-02-10 12:24:43 +00:00
Rubin Xu
72074e3ab9
Merge "Fix uri permission grant on remote bug report uri" into nyc-dev am: 42f2e80293
...
am: 824c8284ce
2017-02-10 12:20:18 +00:00
Rubin Xu
824c8284ce
Merge "Fix uri permission grant on remote bug report uri" into nyc-dev
...
am: 42f2e80293
2017-02-10 12:16:19 +00:00
TreeHugger Robot
42f2e80293
Merge "Fix uri permission grant on remote bug report uri" into nyc-dev
2017-02-10 12:11:00 +00:00
Andreas Gampe
c28592da33
Merge "Framework: Clean up RuntimeInit/ZygoteInit/WrapperInit" am: 851afe56b8 am: 0e01cae667
...
am: 74acde1bc5
2017-02-10 01:03:15 +00:00
Andreas Gampe
74acde1bc5
Merge "Framework: Clean up RuntimeInit/ZygoteInit/WrapperInit" am: 851afe56b8
...
am: 0e01cae667
2017-02-10 00:58:42 +00:00
Andreas Gampe
0e01cae667
Merge "Framework: Clean up RuntimeInit/ZygoteInit/WrapperInit"
...
am: 851afe56b8
2017-02-10 00:54:55 +00:00
Treehugger Robot
851afe56b8
Merge "Framework: Clean up RuntimeInit/ZygoteInit/WrapperInit"
2017-02-10 00:45:56 +00:00
Andreas Gampe
4e66db8d0c
Framework: Clean up RuntimeInit/ZygoteInit/WrapperInit
...
Move methods where they belong.
Test: m
Test: Device boots
Merged-In: I805c6493078e960ff5b70d84dd93d2da6c7aa797
Change-Id: I805c6493078e960ff5b70d84dd93d2da6c7aa797
2017-02-09 13:16:17 -08:00
Paul Duffin
8faed45024
Merge "Partial Revert "Replace com.android.internal.util.Predicate with java.util.function.Predicate"" am: 621ebe692f am: a2c92b0b88
...
am: c1a93884dc
2017-02-09 19:37:26 +00:00
Paul Duffin
c1a93884dc
Merge "Partial Revert "Replace com.android.internal.util.Predicate with java.util.function.Predicate"" am: 621ebe692f
...
am: a2c92b0b88
2017-02-09 19:32:58 +00:00
Paul Duffin
a2c92b0b88
Merge "Partial Revert "Replace com.android.internal.util.Predicate with java.util.function.Predicate""
...
am: 621ebe692f
2017-02-09 19:28:25 +00:00
Paul Duffin
621ebe692f
Merge "Partial Revert "Replace com.android.internal.util.Predicate with java.util.function.Predicate""
2017-02-09 19:18:35 +00:00
Jeff Sharkey
78f2e38a12
DO NOT MERGE. Grant MMS Uri permissions as the calling UID.
...
A recent security fix prevents the system UID from handing out Uri
permission grants directly from itself. Instead, services need to
issue grants as the original calling UID to ensure that the caller
actually has access to the Uris.
Test: builds, boots, send/recv MMS works in primary/secondary users
Bug: 33231106
Change-Id: Ia9fe19843b52977c8a94ee5349b907beda1882fc
Merged-In: Ia9fe19843b52977c8a94ee5349b907beda1882fc
(cherry picked from commit 7ff418d9a9
2017-02-09 18:03:18 +00:00
Jeff Sharkey
d94624347f
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 3eddf40675 am: 14b308de91
...
am: 473b52eb62
2017-02-09 17:42:09 +00:00
Jeff Sharkey
19fd8e3f06
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 3eddf40675
...
am: 14b308de91
2017-02-09 17:39:14 +00:00
Jeff Sharkey
473b52eb62
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 3eddf40675
...
am: 14b308de91
2017-02-09 17:37:44 +00:00
Jeff Sharkey
14b308de91
DO NOT MERGE. Grant MMS Uri permissions as the calling UID.
...
am: 3eddf40675
2017-02-09 17:33:43 +00:00
Paul Duffin
57e490cf8c
Partial Revert "Replace com.android.internal.util.Predicate with java.util.function.Predicate"
...
This partially reverts commit 3e5fbca0c5
2017-02-09 14:52:43 +00:00
songjinshi
78a3d9dab4
Merge "[Debug]: Add timeout for dumpNativeBacktraceToFile." am: b6f7a85b85 am: ec69bd0aa3
...
am: 36bcc913f7
2017-02-08 20:28:48 +00:00
songjinshi
36bcc913f7
Merge "[Debug]: Add timeout for dumpNativeBacktraceToFile." am: b6f7a85b85
...
am: ec69bd0aa3
2017-02-08 20:22:26 +00:00
Paul Duffin
c02f6bb64b
Merge "Replace com.android.internal.util.Predicate with java.util.function.Predicate" am: 78a20be77a am: 9e99b9ee45
...
am: 9250814fd2
2017-02-08 20:18:34 +00:00
songjinshi
ec69bd0aa3
Merge "[Debug]: Add timeout for dumpNativeBacktraceToFile."
...
am: b6f7a85b85
2017-02-08 20:18:13 +00:00
Treehugger Robot
b6f7a85b85
Merge "[Debug]: Add timeout for dumpNativeBacktraceToFile."
2017-02-08 20:11:23 +00:00
Paul Duffin
9250814fd2
Merge "Replace com.android.internal.util.Predicate with java.util.function.Predicate" am: 78a20be77a
...
am: 9e99b9ee45
2017-02-08 18:30:17 +00:00
Paul Duffin
9e99b9ee45
Merge "Replace com.android.internal.util.Predicate with java.util.function.Predicate"
...
am: 78a20be77a
2017-02-08 18:14:50 +00:00
Paul Duffin
78a20be77a
Merge "Replace com.android.internal.util.Predicate with java.util.function.Predicate"
2017-02-08 18:06:08 +00:00
Paul Duffin
d0a937e84b
Merge "Fix problem with JavaDoc" am: 8f33fcdc4b am: 4929aafc1d
...
am: 290274df0d
2017-02-08 11:39:15 +00:00
Paul Duffin
290274df0d
Merge "Fix problem with JavaDoc" am: 8f33fcdc4b
...
am: 4929aafc1d
2017-02-08 11:35:19 +00:00
Paul Duffin
4929aafc1d
Merge "Fix problem with JavaDoc"
...
am: 8f33fcdc4b
2017-02-08 11:31:15 +00:00
Rubin Xu
ca53b27c34
Fix uri permission grant on remote bug report uri
...
System server is no longer allowed to grant uri permission directly. As a result
we use grantUriPermissionFromIntent() to grant permission from the shell UID,
who is the owner of the bug report content.
Also fix a security bug where the broadcast to notify user consent of remote
bug report mismatches the <protected-broadcast> definition, causing it to be
sendable by anyone.
Bug: 34159108
Test: manual - Install TestDPC and request bugreport, try accept and decline
once the report is ready (Bullhead).
Merged-In: I66e3f2a16d4547549f09d3c96d52aed2330caedf
Change-Id: I66e3f2a16d4547549f09d3c96d52aed2330caedf
2017-02-08 10:15:48 +00:00
Paul Duffin
b5c09b5487
Fix problem with JavaDoc
...
Test: make checkbuild
Change-Id: Ia321e0a57ff63aa62adee16d611c063a22807176
2017-02-08 09:16:18 +00:00
Shreyas Basarge
faf365dd5e
Fix requiresCharging false value ignored issue
...
am: e33c3c81af
2017-02-08 00:58:47 +00:00
Shreyas Basarge
f47b9cf1c1
Merge "Fix requiresCharging false value ignored issue" into nyc-mr2-dev
2017-02-08 00:49:59 +00:00
