Android Build Merger (Role)
afe748cd46
Merge "Merge "Merge "Change activity dismiss animation to move left to right." into cw-f-dev am: d950da334e am: 7efd37e953" into nyc-mr2-dev-plus-aosp am: e1faff1601"
2016-11-30 23:07:27 +00:00
Android Build Merger (Role)
5b848f6f98
Merge "Merge "Change activity dismiss animation to move left to right." into cw-f-dev am: d950da334e am: 7efd37e953 am: 2d245d646d"
2016-11-30 23:07:11 +00:00
Jeff Sharkey
23ec811266
Retain DownloadManager Uri grants when clearing.
...
As part of fixing a recent security issue, DownloadManager now needs
to issue Uri permission grants for all downloads. However, if an app
that requested a download is upgraded or otherwise force-stopped,
the required permission grants are removed.
We could tell DownloadManager about the app being stopped, but that
would be racy (due to background broadcast), and waking it up would
degrade system health. Instead, as a special case we now only
consider clearing DownloadManager permission grants when app data
is being cleared.
Bug: 32172542, 30537115
Test: builds, boots, app upgrade doesn't clear grants
Change-Id: I7e3d4546fd12bfe5f81b9fb9857ece58d574a6b9
2016-11-30 16:07:00 -07:00
Michael Kwan
19d0342d39
Merge "Merge "Change activity dismiss animation to move left to right." into cw-f-dev am: d950da334e am: 7efd37e953" into nyc-mr2-dev-plus-aosp
...
am: e1faff1601
2016-11-30 23:06:31 +00:00
Michael Kwan
77f5f4da2a
Merge "Change activity dismiss animation to move left to right." into cw-f-dev am: d950da334e am: 7efd37e953
...
am: 2d245d646d
2016-11-30 23:06:25 +00:00
Android Build Merger (Role)
dbabce91f3
Merge "Merge "Merge "Change activity dismiss animation to move left to right." into cw-f-dev am: d950da334e am: 1ff7a68fe8" into nyc-mr2-dev-plus-aosp am: 90c94579c3"
2016-11-30 23:06:02 +00:00
Android Build Merger (Role)
dd7127de6f
Merge "Merge "Change activity dismiss animation to move left to right." into cw-f-dev am: d950da334e am: 1ff7a68fe8 am: 5a9a557fad"
2016-11-30 23:05:43 +00:00
Chet Haase
a8ba43d288
Merge "Add layout_marginHorizontal|Vertical attributes"
2016-11-30 23:05:31 +00:00
Michael Kwan
0dca01c94e
Merge "Merge "Change activity dismiss animation to move left to right." into cw-f-dev am: d950da334e am: 1ff7a68fe8" into nyc-mr2-dev-plus-aosp
...
am: 90c94579c3
2016-11-30 23:05:00 +00:00
Michael Kwan
18c977da41
Merge "Change activity dismiss animation to move left to right." into cw-f-dev am: d950da334e am: 1ff7a68fe8
...
am: 5a9a557fad
2016-11-30 23:04:52 +00:00
Android Build Merger (Role)
2f893f7db3
Merge "Merge "Change activity dismiss animation to move left to right. am: 6d969ea4d8 am: 24a3616e37" into nyc-mr2-dev-plus-aosp am: b1031e8ebd"
2016-11-30 23:04:28 +00:00
Jeff Sharkey
42bb160818
Merge "Grant MMS Uri permissions as the calling UID."
2016-11-30 23:04:17 +00:00
Michael Kwan
847119635e
Merge "Change activity dismiss animation to move left to right. am: 6d969ea4d8 am: 24a3616e37" into nyc-mr2-dev-plus-aosp
...
am: b1031e8ebd
2016-11-30 23:03:26 +00:00
Michael Kwan
c9641df767
Change activity dismiss animation to move left to right. am: 6d969ea4d8 am: 24a3616e37
...
am: 290b709392
2016-11-30 23:03:20 +00:00
Michael Kwan
098650b83a
Change activity dismiss animation to move left to right. am: 6d969ea4d8 am: d305b037da
...
am: a35a5a95ba
2016-11-30 23:02:16 +00:00
Android Build Merger (Role)
e1faff1601
Merge "Merge "Change activity dismiss animation to move left to right." into cw-f-dev am: d950da334e am: 7efd37e953" into nyc-mr2-dev-plus-aosp
2016-11-30 22:58:29 +00:00
Android Build Merger (Role)
90c94579c3
Merge "Merge "Change activity dismiss animation to move left to right." into cw-f-dev am: d950da334e am: 1ff7a68fe8" into nyc-mr2-dev-plus-aosp
2016-11-30 22:58:08 +00:00
Michael Kwan
2d245d646d
Merge "Change activity dismiss animation to move left to right." into cw-f-dev am: d950da334e
...
am: 7efd37e953
2016-11-30 22:57:43 +00:00
Michael Kwan
5a9a557fad
Merge "Change activity dismiss animation to move left to right." into cw-f-dev am: d950da334e
...
am: 1ff7a68fe8
2016-11-30 22:57:33 +00:00
Android Build Merger (Role)
b1031e8ebd
Merge "Change activity dismiss animation to move left to right. am: 6d969ea4d8 am: 24a3616e37" into nyc-mr2-dev-plus-aosp
2016-11-30 22:57:22 +00:00
Michael Kwan
290b709392
Change activity dismiss animation to move left to right. am: 6d969ea4d8
...
am: 24a3616e37
2016-11-30 22:56:42 +00:00
Michael Kwan
a35a5a95ba
Change activity dismiss animation to move left to right. am: 6d969ea4d8
...
am: d305b037da
2016-11-30 22:56:39 +00:00
Michael Kwan
1ff7a68fe8
Merge "Change activity dismiss animation to move left to right." into cw-f-dev
...
am: d950da334e
2016-11-30 22:46:51 +00:00
Michael Kwan
d305b037da
Change activity dismiss animation to move left to right.
...
am: 6d969ea4d8
2016-11-30 22:46:44 +00:00
Michael Kwan
7efd37e953
Merge "Change activity dismiss animation to move left to right." into cw-f-dev
...
am: d950da334e
2016-11-30 22:46:39 +00:00
Michael Kwan
24a3616e37
Change activity dismiss animation to move left to right.
...
am: 6d969ea4d8
2016-11-30 22:46:36 +00:00
TreeHugger Robot
d950da334e
Merge "Change activity dismiss animation to move left to right." into cw-f-dev
2016-11-30 22:39:06 +00:00
Selim Cinek
1f8c21c116
Fixed a bug with the maximum number of notifications
...
The shelf size was accounted for twice.
Test: add notifications, observe overflow behavior on lockscreen
Bug: 32437839
Change-Id: I2c372243cbc4fcd9223715f398f3ec233b87f9db
2016-11-30 14:37:31 -08:00
vinodkrishnan
cac1d6a00b
Merge "Revert "DO NOT MERGE Wear Fwk: Disable Animations for A11y"" into cw-f-dev am: a0d9383f71 am: ff6ff81345
...
am: 5825b9f05b
2016-11-30 22:15:34 +00:00
vinodkrishnan
6aeab143b2
Merge "Revert "DO NOT MERGE Wear Fwk: Disable Animations for A11y"" into cw-f-dev am: a0d9383f71 am: a546c12311
...
am: b3c735b82d
2016-11-30 22:14:25 +00:00
vinodkrishnan
07351b6843
Merge "Revert "DO NOT MERGE Wear Fwk: Disable Animations for A11y" am: 7b62df8556 am: afd52a7ad4" into nyc-mr2-dev-plus-aosp
...
am: bd040ec4f9
2016-11-30 22:13:08 +00:00
vinodkrishnan
4801a81559
Revert "DO NOT MERGE Wear Fwk: Disable Animations for A11y" am: 7b62df8556 am: afd52a7ad4
...
am: bf5a4eb151
2016-11-30 22:10:01 +00:00
vinodkrishnan
5825b9f05b
Merge "Revert "DO NOT MERGE Wear Fwk: Disable Animations for A11y"" into cw-f-dev am: a0d9383f71
...
am: ff6ff81345
2016-11-30 22:07:42 +00:00
vinodkrishnan
4f8a7a5582
Revert "DO NOT MERGE Wear Fwk: Disable Animations for A11y" am: 7b62df8556 am: 60d4248fdc
...
am: 7e88808cd5
2016-11-30 22:06:52 +00:00
vinodkrishnan
b3c735b82d
Merge "Revert "DO NOT MERGE Wear Fwk: Disable Animations for A11y"" into cw-f-dev am: a0d9383f71
...
am: a546c12311
2016-11-30 22:05:15 +00:00
Android Build Merger (Role)
bd040ec4f9
Merge "Revert "DO NOT MERGE Wear Fwk: Disable Animations for A11y" am: 7b62df8556 am: afd52a7ad4" into nyc-mr2-dev-plus-aosp
2016-11-30 22:03:26 +00:00
vinodkrishnan
bf5a4eb151
Revert "DO NOT MERGE Wear Fwk: Disable Animations for A11y" am: 7b62df8556
...
am: afd52a7ad4
2016-11-30 22:02:11 +00:00
vinodkrishnan
7e88808cd5
Revert "DO NOT MERGE Wear Fwk: Disable Animations for A11y" am: 7b62df8556
...
am: 60d4248fdc
2016-11-30 22:01:52 +00:00
vinodkrishnan
a546c12311
Merge "Revert "DO NOT MERGE Wear Fwk: Disable Animations for A11y"" into cw-f-dev
...
am: a0d9383f71
2016-11-30 21:55:30 +00:00
vinodkrishnan
ff6ff81345
Merge "Revert "DO NOT MERGE Wear Fwk: Disable Animations for A11y"" into cw-f-dev
...
am: a0d9383f71
2016-11-30 21:55:23 +00:00
Amin Shaikh
aa09aa0210
Refactor NetworkScoreAppManager for testing.
...
Test: runtest frameworks-services && runtest frameworks-core
Change-Id: Ie2172009e9ba0438050488fe0aea6408f852c2c2
2016-11-30 13:52:43 -08:00
vinodkrishnan
afd52a7ad4
Revert "DO NOT MERGE Wear Fwk: Disable Animations for A11y"
...
am: 7b62df8556
2016-11-30 21:52:13 +00:00
vinodkrishnan
60d4248fdc
Revert "DO NOT MERGE Wear Fwk: Disable Animations for A11y"
...
am: 7b62df8556
2016-11-30 21:52:05 +00:00
TreeHugger Robot
a0d9383f71
Merge "Revert "DO NOT MERGE Wear Fwk: Disable Animations for A11y"" into cw-f-dev
2016-11-30 21:43:38 +00:00
sergeyv
71c4477bee
Add hwui test for correct refcounting of SkColorTable in Bitmap
...
Test: BitmapTests.colorTableRefCounting
bug:32561595
Change-Id: I505c735feffbac18d406b6b2f9dff51d81700cd8
2016-11-30 13:42:52 -08:00
Jeff Sharkey
7ff418d9a9
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
2016-11-30 14:30:02 -07:00
TreeHugger Robot
91507e09ec
Merge "Deprecate eglCreatePixmapSurface"
2016-11-30 21:27:40 +00:00
Amith Yamasani
0d1fd8d091
Secure MATCH_UNINSTALLED_PACKAGES across users
...
Introduce a new internal flag MATCH_ANY_USER for genuine uses
of searching through all apps on the device.
Some temporary accommodations for Launchers that reach across
to the work profile until we have a new LauncherApps API to do
that officially.
Bug: 31000380
Test: CTS tests added
Change-Id: I2e43dc49d6c2e11814a8f8d1eb07ef557f31af34
2016-11-30 13:24:53 -08:00
Mark Renouf
d28e907183
Allow power button to close an input method
...
BUG: 33038203
Change-Id: I5c44dc49db6b960b4e3e42545bfbbab62f357f08
2016-11-30 16:01:42 -05:00
Treehugger Robot
273adb5257
Merge "App_process: Clean up sanitized binaries"
2016-11-30 21:00:56 +00:00
