OSDN Git Service
Sunny Goyal [Tue, 15 Nov 2016 03:33:42 +0000 (03:33 +0000)]
Merge "Preventing widgets from exceeding Bitmap memory limit"
Yifan Hong [Tue, 15 Nov 2016 03:26:51 +0000 (03:26 +0000)]
Merge "Update for removing read/writeEmbeddedFrom/ToParcel methods." am:
8cc1343724 am:
2187dc5ca1 am:
41579ea4d4
am:
8afcb67a89
Change-Id: Ib6657958538c75814f9e5afd17c9446e3a8ff7fe
Yifan Hong [Tue, 15 Nov 2016 03:19:19 +0000 (03:19 +0000)]
Merge "Update for removing read/writeEmbeddedFrom/ToParcel methods." am:
8cc1343724 am:
2187dc5ca1
am:
41579ea4d4
Change-Id: Ia8f41eb4c76c241088a4cce368409bd61deb5d35
Yifan Hong [Tue, 15 Nov 2016 03:12:43 +0000 (03:12 +0000)]
Merge "Update for removing read/writeEmbeddedFrom/ToParcel methods." am:
8cc1343724
am:
2187dc5ca1
Change-Id: If0919864026c78fed76df1554235c2acca9f2750
Yifan Hong [Tue, 15 Nov 2016 03:06:44 +0000 (03:06 +0000)]
Merge "Update for removing read/writeEmbeddedFrom/ToParcel methods."
am:
8cc1343724
Change-Id: If003adc06673d8e6c6db6f8a5d858dcca7aed109
Treehugger Robot [Tue, 15 Nov 2016 02:59:51 +0000 (02:59 +0000)]
Merge "Update for removing read/writeEmbeddedFrom/ToParcel methods."
Selim Cinek [Tue, 15 Nov 2016 01:39:25 +0000 (01:39 +0000)]
Fixed a bug with the emergency affordance in multi user am:
b8a7f78d24 am:
6cc0b517ba am:
96d4aadb4c
am:
23067d83d5
Change-Id: I531d9e49ca42e49ee0f9e31722748501e558e7b1
TreeHugger Robot [Tue, 15 Nov 2016 01:35:41 +0000 (01:35 +0000)]
Merge "osu: remove calls to deprecated APIs"
TreeHugger Robot [Tue, 15 Nov 2016 01:34:55 +0000 (01:34 +0000)]
Merge "Group injected tiles together based on package name."
Selim Cinek [Tue, 15 Nov 2016 01:32:12 +0000 (01:32 +0000)]
Fixed a bug with the emergency affordance in multi user am:
b8a7f78d24 am:
6cc0b517ba
am:
96d4aadb4c
Change-Id: I46d1527df288330d9daea3f7c843a4b80a4ec468
Selim Cinek [Tue, 15 Nov 2016 01:24:32 +0000 (01:24 +0000)]
Fixed a bug with the emergency affordance in multi user am:
b8a7f78d24
am:
6cc0b517ba
Change-Id: If537b10c1838a47e7662ef56ae08b806fe5d669f
Wale Ogunwale [Tue, 15 Nov 2016 01:19:37 +0000 (01:19 +0000)]
Merge "Removed WallpaperController dependency on WindowList."
Sunny Goyal [Thu, 10 Nov 2016 01:05:06 +0000 (17:05 -0800)]
Preventing widgets from exceeding Bitmap memory limit
> Moving the size check to a comman place so that it is executed in
all related code
> Fixing size calculation when views are merged as a result of partial
update
Test: Manually tested with a dummy app
Bug:
31790171
Change-Id: Id0ea776796f156455d2cba31c8392d4875116949
Selim Cinek [Tue, 15 Nov 2016 01:18:35 +0000 (01:18 +0000)]
Fixed a bug with the emergency affordance in multi user
am:
b8a7f78d24
Change-Id: I68fa35dbedb3740eff1c83d03c9c9b5080d3ea81
Peter Qiu [Mon, 14 Nov 2016 23:05:22 +0000 (15:05 -0800)]
osu: remove calls to deprecated APIs
The hidden APIs WifiManager#addPasspointManagmentObject and
WifiManager#addPasspointManagementObject will removed, so remove
all callsites.
The OSU app is still under developement and is not included
in any device builds. However, it is being built by the Treehugger
for generic AOSP builds.
So fix it to allow the API removal CLs to be submitted.
Bug:
32509661
Test: None
Change-Id: Ic405695ee8edfd0c08b831834797f163fe445595
Fan Zhang [Mon, 14 Nov 2016 17:48:06 +0000 (09:48 -0800)]
Group injected tiles together based on package name.
During grouping, tiles are sorted based on package name, and their own
priority value. However if the package is Settings itself, the ordering
is not changed.
Before sort: [pkg1, 100], [pgk2, 120], [pkg1, 130]
After sort: [pkg1, 1], [pkg1, 2], [pkg2,3]
This is necessary to make sure settings app have the overall control of
ordering of all dynamic tiles. When each app define their priority, they
don't have access to the global vision of what other settings are on
screen so it's possible different app define conflicting orderings.
Settings app is the only reasonable place to rank them properly.
Bug:
32827787
Test: RunSettingsLibRoboTests
Change-Id: I38de55530e61da9de7532ef6a7ee97ef89aca9d9
Garfield Tan [Mon, 14 Nov 2016 23:37:06 +0000 (23:37 +0000)]
Merge "Add internal support to convert a file system path to document URI."
Selim Cinek [Thu, 3 Nov 2016 21:55:40 +0000 (14:55 -0700)]
Fixed a bug with the emergency affordance in multi user
The emergency call was not launched in the current user
and therefore was only launching once the user had switched.
Change-Id: If6f3bcf77d88a0658b6e0f91f7e4da5d6264b04f
Fixes:
32424103
Test: manual: switch to secondary user and launch emergency affordance
Sohani Rao [Mon, 14 Nov 2016 21:35:52 +0000 (21:35 +0000)]
Merge "Add WiFi toggle prompts - framework" am:
584b5cee49 -s ours am:
31082a0824 -s ours am:
31264c994c -s ours
am:
b15893c723 -s ours
Change-Id: I0281f56f8f06c69754d0559cc1e72dc248050aad
Sohani Rao [Mon, 14 Nov 2016 21:28:08 +0000 (21:28 +0000)]
Merge "Add WiFi toggle prompts - framework" am:
584b5cee49 -s ours am:
31082a0824 -s ours
am:
31264c994c -s ours
Change-Id: I37fe61c02a960ab5024fca8ab025c8e1933d269b
Sohani Rao [Mon, 14 Nov 2016 21:21:38 +0000 (21:21 +0000)]
Merge "Add WiFi toggle prompts - framework" am:
584b5cee49 -s ours
am:
31082a0824 -s ours
Change-Id: Ib2d485f7c6904fc3890c08f34d52703b92d379b5
TreeHugger Robot [Mon, 14 Nov 2016 21:20:58 +0000 (21:20 +0000)]
Merge "Update usage of ActivityManagerNative."
Sohani Rao [Mon, 14 Nov 2016 21:14:44 +0000 (21:14 +0000)]
Merge "Add WiFi toggle prompts - framework"
am:
584b5cee49 -s ours
Change-Id: I9dd54beb08f771be886c03fa0f8a3335f574c47c
TreeHugger Robot [Mon, 14 Nov 2016 21:08:57 +0000 (21:08 +0000)]
Merge "Uses a notification to request auto-fill."
Sohani Rao [Mon, 14 Nov 2016 20:59:35 +0000 (20:59 +0000)]
Merge "Add WiFi toggle prompts - framework"
Sohani Rao [Mon, 14 Nov 2016 20:07:39 +0000 (20:07 +0000)]
Merge "Permissions check for Wifi Display configuration" am:
f5c32a411c am:
7342bb84cd am:
b4663456d4
am:
ac2191ebb0 -s ours
Change-Id: I5a03c8b0f8859fc4cefcdf795a7282543c74d708
Sohani Rao [Mon, 14 Nov 2016 19:59:22 +0000 (19:59 +0000)]
Merge "Permissions check for Wifi Display configuration" am:
f5c32a411c am:
7342bb84cd
am:
b4663456d4
Change-Id: I9bfd828577029c3ebb6b89b6830a5c8d72833768
Sohani Rao [Mon, 14 Nov 2016 19:44:46 +0000 (19:44 +0000)]
Merge "Permissions check for Wifi Display configuration" am:
f5c32a411c
am:
7342bb84cd
Change-Id: Iac379dace6fd8b01e5bb80a193f79c65ace1f9b9
TreeHugger Robot [Mon, 14 Nov 2016 19:35:05 +0000 (19:35 +0000)]
Merge "2D recents: full screen view and semi-transparent dark background"
Sohani Rao [Mon, 14 Nov 2016 19:33:31 +0000 (19:33 +0000)]
Merge "Permissions check for Wifi Display configuration"
am:
f5c32a411c
Change-Id: I7a1c2d0f48728cd5e056076a2cf1499a7abb2438
Sudheer Shanka [Thu, 10 Nov 2016 23:30:17 +0000 (15:30 -0800)]
Update usage of ActivityManagerNative.
- Remove references to ActivityManagerProxy.
- Add isSystemReady to ActivityManager.
Bug:
30977067
Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test android.server.cts
adb shell am instrument -e class com.android.server.am.ActivityManagerTest,com.android.server.am.TaskStackChangedListenerTest \
-w com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I07390b6124fb1515821f5c0b37baf6ae74adc8fa
TreeHugger Robot [Mon, 14 Nov 2016 19:23:18 +0000 (19:23 +0000)]
Merge "Bind AutoFillService on demand."
Sohani Rao [Mon, 14 Nov 2016 19:21:57 +0000 (19:21 +0000)]
Merge "Permissions check for Wifi Display configuration"
TreeHugger Robot [Mon, 14 Nov 2016 19:17:55 +0000 (19:17 +0000)]
Merge "Add @HalfFloat annotation for fp16 data types stored in shorts"
Narayan Kamath [Mon, 14 Nov 2016 19:10:14 +0000 (19:10 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources. am:
d9a8ee7598 am:
7521a1b465
am:
e824efaa20
Change-Id: I46c105c58fff536ddfa18de39c306135d710b176
Wale Ogunwale [Wed, 9 Nov 2016 21:24:43 +0000 (13:24 -0800)]
Removed WallpaperController dependency on WindowList.
WallpaperController now accesses the container hierarchy directly
to determine the state of the wallpaper windows and targets.
Bug:
30060889
Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test \
android.server.cts.ActivityManagerTransitionSelectionTests
Change-Id: Ib70beaf340f257ad4e1093cc127f81e7adf41636
Narayan Kamath [Mon, 14 Nov 2016 19:03:16 +0000 (19:03 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources. am:
d9a8ee7598
am:
7521a1b465
Change-Id: I8988c6ef182a55bbd361ccc4db8ffde6297742cb
Felipe Leme [Fri, 11 Nov 2016 22:50:31 +0000 (14:50 -0800)]
Uses a notification to request auto-fill.
This is a temporary approach until UX decide the final one.
BUG:
31001899
Test: manually built and ran it
Change-Id: I234ffc9bfffcccae5e5c310f9669c4a2a8e9d65c
Narayan Kamath [Mon, 14 Nov 2016 18:56:09 +0000 (18:56 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources.
am:
d9a8ee7598
Change-Id: Ie7c2ec8ec358ce403a0c8afe6305d3164d3892e8
TreeHugger Robot [Mon, 14 Nov 2016 18:38:13 +0000 (18:38 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Mon, 14 Nov 2016 18:33:30 +0000 (18:33 +0000)]
Merge "Import translations. DO NOT MERGE"
Tyler Gunn [Mon, 14 Nov 2016 18:32:04 +0000 (18:32 +0000)]
Merge "Add CAPABILITY_SUPPORTS_VIDEO_CALLING to PhoneAccount." am:
8223dc1ae9 am:
8b58e73c48 am:
9e976c8565
am:
4a15007915
Change-Id: I40d164a429d05870b2f760e6740d3f27b3e2f224
TreeHugger Robot [Mon, 14 Nov 2016 18:30:06 +0000 (18:30 +0000)]
Merge "Import translations. DO NOT MERGE"
Svetoslav Ganov [Wed, 27 Jul 2016 01:23:01 +0000 (18:23 -0700)]
Add WiFi toggle prompts - framework
If permission review is enabled toggling WiFi on or off
results in a user prompt to collect a consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.
Bug:
28715749
Test: Unit Tests
Change-Id: I020601e208c0736005bcabc7b7b77b96eee45b03
Merged-In: I020601e208c0736005bcabc7b7b77b96eee45b03
Tyler Gunn [Mon, 14 Nov 2016 18:22:14 +0000 (18:22 +0000)]
Merge "Add CAPABILITY_SUPPORTS_VIDEO_CALLING to PhoneAccount." am:
8223dc1ae9 am:
8b58e73c48
am:
9e976c8565
Change-Id: If743a67bff170096f028c7d7f3fc88c8548dfbf1
Sohani Rao [Thu, 29 Sep 2016 23:20:45 +0000 (16:20 -0700)]
Permissions check for Wifi Display configuration
Wifi Display is configured using the AIDL call setMiracastMode()
and using a message over the async channel SET_WFD_INFO.
Enforce permissions on the calling uid before updating the config
Bug:
18668877
Test: Unit tests
Change-Id: I0be2d2af49070aad759f24bd31331f7df39a0422
Merged-In: I0be2d2af49070aad759f24bd31331f7df39a0422
Tyler Gunn [Mon, 14 Nov 2016 18:15:12 +0000 (18:15 +0000)]
Merge "Add CAPABILITY_SUPPORTS_VIDEO_CALLING to PhoneAccount." am:
8223dc1ae9
am:
8b58e73c48
Change-Id: Ifdbfdb2f418297eae83a69196462dc847650e3e2
Sohani Rao [Mon, 14 Nov 2016 18:11:04 +0000 (18:11 +0000)]
Merge "Permissions check for Wifi Display configuration"
Andreas Gampe [Mon, 14 Nov 2016 18:09:29 +0000 (18:09 +0000)]
Merge "resolve merge conflicts of
50c5f04 to master"
Tyler Gunn [Mon, 14 Nov 2016 18:08:11 +0000 (18:08 +0000)]
Merge "Add CAPABILITY_SUPPORTS_VIDEO_CALLING to PhoneAccount."
am:
8223dc1ae9
Change-Id: Id8c6077d099f9ef943c09242acb22173b6628c1a
TreeHugger Robot [Mon, 14 Nov 2016 17:56:54 +0000 (17:56 +0000)]
Merge "Added a callback for AutoFillService."
Manu Cornet [Mon, 14 Nov 2016 17:49:17 +0000 (09:49 -0800)]
2D recents: full screen view and semi-transparent dark background
This matches the newest mocks better than the previous version.
Bug:
32101881
Test: Locally on local Ryu device
Change-Id: I85769215a48b7a4f1e7b52bd7572eb48ca333471
Andreas Gampe [Mon, 14 Nov 2016 17:42:42 +0000 (09:42 -0800)]
resolve merge conflicts of
50c5f04 to master
Change-Id: I2b1154e636258ccce6c4482415752444d2ac1326
Romain Guy [Mon, 14 Nov 2016 17:20:39 +0000 (09:20 -0800)]
Add @HalfFloat annotation for fp16 data types stored in shorts
This CL has a companion CL to add the @HalfFloat annotation to the
support library.
Test: cts-tradefed run singleCommand cts-dev --module CtsUtilTestCases --test android.util.cts.HalfTest
Bug:
29940137
Change-Id: I4e1dc456687c1c026437150e9cc94a54f3264d4e
Narayan Kamath [Mon, 14 Nov 2016 17:25:09 +0000 (17:25 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources.
am:
9087f331a8
Change-Id: I800230fd9a4baf543d53834b00019f81aa07bdc9
Narayan Kamath [Fri, 23 Sep 2016 08:07:11 +0000 (09:07 +0100)]
Zygote: Additional whitelists for runtime overlay / other static resources.
Partially cherry picked from commit
1c15c635785c64a.
These files are safe to reopen for the same reason that files in
/system/framework are. They're regular files and will not change after
the first zygote fork.
Bug:
32618130
Change-Id: I119e0bfcbf397cb331064adf148d92a5cd3ea92f
(cherry picked from commit
25cd01cc69fcad34756b00e52a79c0c54178f2e6)
(cherry picked from commit
9087f331a85790d49d1095e1eaf0305b7863e0ba)
Narayan Kamath [Fri, 23 Sep 2016 08:07:11 +0000 (09:07 +0100)]
Zygote: Additional whitelists for runtime overlay / other static resources.
Partially cherry picked from commit
1c15c635785c64a.
These files are safe to reopen for the same reason that files in
/system/framework are. They're regular files and will not change after
the first zygote fork.
Bug:
32618130
Change-Id: I119e0bfcbf397cb331064adf148d92a5cd3ea92f
(cherry picked from commit
25cd01cc69fcad34756b00e52a79c0c54178f2e6)
TreeHugger Robot [Mon, 14 Nov 2016 16:27:52 +0000 (16:27 +0000)]
Merge "Allow cross profile call between DO and PO"
Tyler Gunn [Mon, 14 Nov 2016 16:23:42 +0000 (16:23 +0000)]
Merge "Add CAPABILITY_SUPPORTS_VIDEO_CALLING to PhoneAccount."
Michal Karpinski [Mon, 14 Nov 2016 16:21:33 +0000 (16:21 +0000)]
Merge "[DPM] Minor code fixes in NetworkLoggingHandler"
TreeHugger Robot [Mon, 14 Nov 2016 15:46:13 +0000 (15:46 +0000)]
Merge "Revert "Add Build.isAtLeastO""
Steven Moreland [Mon, 14 Nov 2016 15:37:14 +0000 (15:37 +0000)]
Merge "hidl: Update for IFoo::descriptor -> const char *." am:
e17e68f139 am:
5f9ac42029 am:
cd0f045eb7
am:
d3a15478a7
Change-Id: If7a15e25ad9c9110c12a114a181a6c4a6bc21b6d
Steven Moreland [Mon, 14 Nov 2016 15:29:39 +0000 (15:29 +0000)]
Merge "hidl: Update for IFoo::descriptor -> const char *." am:
e17e68f139 am:
5f9ac42029
am:
cd0f045eb7
Change-Id: Iecdc2bd4e06fdd8e6b2e2217c8c988dcabceda25
Steven Moreland [Mon, 14 Nov 2016 15:22:35 +0000 (15:22 +0000)]
Merge "hidl: Update for IFoo::descriptor -> const char *." am:
e17e68f139
am:
5f9ac42029
Change-Id: I29e5b04d4737dcc380ac34a0becfe633fc1d51db
Steven Moreland [Mon, 14 Nov 2016 15:15:39 +0000 (15:15 +0000)]
Merge "hidl: Update for IFoo::descriptor -> const char *."
am:
e17e68f139
Change-Id: Iefe4ae60d8e7f0473f1b417ac09c5e37b082d07b
Treehugger Robot [Mon, 14 Nov 2016 15:03:31 +0000 (15:03 +0000)]
Merge "hidl: Update for IFoo::descriptor -> const char *."
Bartosz Fabianowski [Mon, 14 Nov 2016 15:01:24 +0000 (15:01 +0000)]
Merge "Add metrics constant for Enterprise Privacy Settings page"
Andriy Naborskyy [Mon, 14 Nov 2016 14:36:57 +0000 (14:36 +0000)]
Merge "DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous"" into cw-e-dev am:
11da2b5de3 -s ours am:
3f39609cff -s ours am:
fb4beac069 -s ours am:
18305d920e -s ours am:
0a2ac837d1 -s ours am:
415ec85fdb -s ours am:
5c47b5ec06 -s ours
am:
fd9358530a -s ours
Change-Id: I33e0bc9875ab4b078cd79bc6c48b4b098091ace8
Andriy Naborskyy [Mon, 14 Nov 2016 14:35:51 +0000 (14:35 +0000)]
DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous" am:
c5bf8bc74d -s ours am:
f380f53752 -s ours am:
dbbde14239 -s ours am:
f566a1d4bf -s ours am:
e26d15582b -s ours am:
bb1dfdc660 -s ours am:
2480121100 -s ours
am:
9635303d5f -s ours
Change-Id: Icb174103be637ccfd8f4a1fa3cd511c3a074f77c
Brian Carlstrom [Mon, 14 Nov 2016 14:34:39 +0000 (14:34 +0000)]
Merge "Zygote : Block SIGCHLD during fork." into mnc-dr-dev am:
5d0cabf78e am:
3be5dec18a am:
b272d7cb13 am:
f9150bf362 am:
58612638d1 am:
d9ea80d009 am:
46abcdd83f am:
35063cdb3c
am:
081d505073
Change-Id: I6969b463fd780c9cc89e9c03c5da75ae2f17e455
Narayan Kamath [Mon, 14 Nov 2016 14:27:29 +0000 (14:27 +0000)]
Zygote : Block SIGCHLD during fork. am:
b6f3751599 am:
b23e864573 am:
52021073a4 am:
479385b6b3 am:
5f70cb0898 am:
df3e599c7d am:
19ee3109e1 am:
bf3c83eeac
am:
11959bd5fc
Change-Id: I8caf4888a5b7294ef0b7d958057ea4e7ddf971a5
Narayan Kamath [Mon, 14 Nov 2016 14:26:12 +0000 (14:26 +0000)]
Zygote : Block SIGCHLD during fork. am:
b1f1209d9a am:
35b8453338 am:
14bd75fa79 am:
50b0c3be57 -s ours am:
e1e735bcb9 am:
072b70bae3 am:
ba6d5ee377 am:
f3f784853d am:
8ea47824fa am:
2f2611636b am:
86e1929551 am:
8ecbb2b2ae
am:
5db2340ba2
Change-Id: I6ce389eb25162f90dc39a3f023ee7f35eccfcfe4
Narayan Kamath [Mon, 14 Nov 2016 14:24:48 +0000 (14:24 +0000)]
Merge "Zygote: Additional whitelisting for legacy devices." into lmp-dev am:
7bd25ab485 am:
a045aed7a2 am:
846f64c6fc am:
83b46a1590 am:
330d0ebf48 am:
21c1e58090 am:
81fd9e618c am:
2c13554c18 am:
fb207962aa am:
44e645e59a am:
f2a94f71fb am:
48d16243f9
am:
aa9b2b17fd
Change-Id: I6aa9a19451ac9d9c800659d172f54db456fabb21
Andriy Naborskyy [Mon, 14 Nov 2016 14:24:29 +0000 (14:24 +0000)]
Merge "DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous"" into cw-e-dev am:
11da2b5de3 -s ours am:
3f39609cff -s ours am:
fb4beac069 -s ours am:
18305d920e -s ours am:
0a2ac837d1 -s ours am:
415ec85fdb -s ours
am:
5c47b5ec06 -s ours
Change-Id: I3a438d3b5945da3fbcb8e6a655e53813d0094b74
Narayan Kamath [Mon, 14 Nov 2016 14:23:20 +0000 (14:23 +0000)]
Zygote: Additional whitelisting for legacy devices. am:
7d302e018d am:
f369b3ce75 am:
e82866df3f am:
f8335b6a59 am:
2f8ce5f5cb am:
5515b415aa am:
d212aa9d13 am:
3b89a68a08 am:
146a0f86a6 am:
327edfeba2 am:
51930580bf am:
deabe2c324
am:
0bcb75b5e8
Change-Id: I86753028179da82f2ede9da82a2274d25bdf2ec6
Andriy Naborskyy [Mon, 14 Nov 2016 14:23:17 +0000 (14:23 +0000)]
DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous" am:
c5bf8bc74d -s ours am:
f380f53752 -s ours am:
dbbde14239 -s ours am:
f566a1d4bf -s ours am:
e26d15582b -s ours am:
bb1dfdc660 -s ours
am:
2480121100 -s ours
Change-Id: Id4cf19f648862cfb25499f532d68d9bc791b16ba
Brian Carlstrom [Mon, 14 Nov 2016 14:22:02 +0000 (14:22 +0000)]
Merge "Zygote : Block SIGCHLD during fork." into mnc-dr-dev am:
5d0cabf78e am:
3be5dec18a am:
b272d7cb13 am:
f9150bf362 am:
58612638d1 am:
d9ea80d009 am:
46abcdd83f
am:
35063cdb3c
Change-Id: I7c6bae206f08cc4eeeaf7f8b444f5847812600cf
Narayan Kamath [Mon, 14 Nov 2016 14:22:02 +0000 (14:22 +0000)]
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into lmp-dev am:
d60156dfc6 am:
fd23b9d509 am:
b0a7831375 am:
5594cfc2c3 am:
6ca924b884 am:
ae457e03b7 am:
0c8da8aa05 am:
1f9abe310f am:
f45a1a0fe6 am:
58d1705c64 am:
1886232f48 am:
9facd98e75
am:
38481c8a0f
Change-Id: If132e49ca549ac533a4d7adca0fa0d195e0cd0de
Tony Mak [Mon, 14 Nov 2016 12:53:06 +0000 (12:53 +0000)]
Allow cross profile call between DO and PO
Allow DO to bind service of PO in managed profile and vice versa.
DO and PO must be the same package.
Bug:
31895999
Change-Id: I3ce2943aebd1249401d5814757a0ce25b9f85279
Test: cts-tradefed run cts --module DevicePolicyManager --test com.android.cts.devicepolicy.CorpOwnedManagedProfileTest
Jerome Gaillard [Mon, 14 Nov 2016 14:16:25 +0000 (14:16 +0000)]
Merge "Change date on CustomCalendar"
Narayan Kamath [Mon, 14 Nov 2016 14:14:18 +0000 (14:14 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources. am:
0ad0e859f6 am:
1e6a5d11a6 am:
f0cd32619e -s ours am:
4c26a969e9 am:
b7884e5a9f am:
da65c74c54 am:
24b2a54a84 am:
4a204149eb am:
e58ee798c1 am:
83be5fdebb am:
4c5dc7e622 am:
6b7badc832
am:
eda7110973
Change-Id: I2d7917ee12bcab86f313863051b9c27b2a73fa78
Narayan Kamath [Mon, 14 Nov 2016 14:14:16 +0000 (14:14 +0000)]
Zygote : Block SIGCHLD during fork. am:
b6f3751599 am:
b23e864573 am:
52021073a4 am:
479385b6b3 am:
5f70cb0898 am:
df3e599c7d am:
19ee3109e1
am:
bf3c83eeac
Change-Id: I05d77dbca719382340c1df02c2f3c513118e64f9
neo.chae [Mon, 14 Nov 2016 14:13:11 +0000 (14:13 +0000)]
Fix idmap leak in zygote process am:
0244ca8d10 am:
82537abc3b am:
85afb42c16 am:
b4b2203c5e am:
fb74b8773a am:
c58ec27e1c am:
7489336fed am:
0212d4f3fa am:
aaf785c827 am:
4b72904585 am:
7530ea7ec0 am:
fa2e233c30
am:
b1d07e379c
Change-Id: I13c101d6ff3e8f86358972b2d79703be07c3e7d0
Narayan Kamath [Mon, 14 Nov 2016 14:13:00 +0000 (14:13 +0000)]
Zygote : Block SIGCHLD during fork. am:
b1f1209d9a am:
35b8453338 am:
14bd75fa79 am:
50b0c3be57 -s ours am:
e1e735bcb9 am:
072b70bae3 am:
ba6d5ee377 am:
f3f784853d am:
8ea47824fa am:
2f2611636b am:
86e1929551
am:
8ecbb2b2ae
Change-Id: Ifdc128e39b8a34731a972049c398a7e3784f5303
Xin Li [Mon, 14 Nov 2016 14:11:51 +0000 (14:11 +0000)]
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev." into lmp-mr1-dev am:
78f15948fb am:
34de2a2d45 -s ours am:
a5c82e7dd9 am:
ca2abc5b71 am:
ae5db8a6dc am:
db984f917c -s ours am:
ee6b51a05b am:
20def2e75f am:
6e8fef24d9 am:
eb4de1706e am:
9d04aa4f81
am:
8ce3691f79 -s ours
Change-Id: If2967655e9fa921b303568a0855b244c0eef0d20
Narayan Kamath [Mon, 14 Nov 2016 14:11:46 +0000 (14:11 +0000)]
Merge "Zygote: Additional whitelisting for legacy devices." into lmp-dev am:
7bd25ab485 am:
a045aed7a2 am:
846f64c6fc am:
83b46a1590 am:
330d0ebf48 am:
21c1e58090 am:
81fd9e618c am:
2c13554c18 am:
fb207962aa am:
44e645e59a am:
f2a94f71fb
am:
48d16243f9
Change-Id: I70ce50374b406443d58f07409bfa58335e96e8de
Andriy Naborskyy [Mon, 14 Nov 2016 14:11:10 +0000 (14:11 +0000)]
Merge "DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous"" into cw-e-dev am:
11da2b5de3 -s ours am:
3f39609cff -s ours am:
fb4beac069 -s ours am:
18305d920e -s ours am:
0a2ac837d1 -s ours
am:
415ec85fdb -s ours
Change-Id: I3fe6e41b3a2b6119a7d980227756054a2267b797
Narayan Kamath [Mon, 14 Nov 2016 14:10:20 +0000 (14:10 +0000)]
Zygote: Additional whitelisting for legacy devices. am:
7d302e018d am:
f369b3ce75 am:
e82866df3f am:
f8335b6a59 am:
2f8ce5f5cb am:
5515b415aa am:
d212aa9d13 am:
3b89a68a08 am:
146a0f86a6 am:
327edfeba2 am:
51930580bf
am:
deabe2c324
Change-Id: If6bf0b5dac1c7b9141462b9c28c5f0bf76bdceca
Xin Li [Mon, 14 Nov 2016 14:10:19 +0000 (14:10 +0000)]
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev. am:
7e0483fcec -s ours am:
16090c6177 -s ours am:
0a568ae56e am:
9788dd5bd2 am:
6ec8dd10bb am:
921dd6a5fd -s ours am:
05a61276c6 am:
23270f1311 am:
5386c74a44 am:
f3e0e13b54 am:
3a86cff442
am:
2129e3b757 -s ours
Change-Id: Ie712c3d1613b378df3f832019bb25c78aaf7bf38
Andriy Naborskyy [Mon, 14 Nov 2016 14:09:55 +0000 (14:09 +0000)]
DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous" am:
c5bf8bc74d -s ours am:
f380f53752 -s ours am:
dbbde14239 -s ours am:
f566a1d4bf -s ours am:
e26d15582b -s ours
am:
bb1dfdc660 -s ours
Change-Id: I230967ab2be77179282d37ea186906adabfafde5
Narayan Kamath [Mon, 14 Nov 2016 14:09:01 +0000 (14:09 +0000)]
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into lmp-dev am:
d60156dfc6 am:
fd23b9d509 am:
b0a7831375 am:
5594cfc2c3 am:
6ca924b884 am:
ae457e03b7 am:
0c8da8aa05 am:
1f9abe310f am:
f45a1a0fe6 am:
58d1705c64 am:
1886232f48
am:
9facd98e75
Change-Id: I5b57c5a660562defc701ad4db67a4bc60cf3cc90
Narayan Kamath [Mon, 14 Nov 2016 14:08:59 +0000 (14:08 +0000)]
Merge "Zygote: Additional whitelisting for legacy devices." into mnc-dev am:
75c6b8c324 am:
9958eb7180 am:
5e92ece8c2 am:
77decadefe am:
11b3161c41 am:
5cbd448348 am:
a9fae33c11 am:
05f59b1f1d am:
ec69d20c3d
am:
3fca84af72
Change-Id: I0421d05926630b03f75bb6c37884bcae7c5ffa90
Brian Carlstrom [Mon, 14 Nov 2016 14:08:51 +0000 (14:08 +0000)]
Merge "Zygote : Block SIGCHLD during fork." into mnc-dr-dev am:
5d0cabf78e am:
3be5dec18a am:
b272d7cb13 am:
f9150bf362 am:
58612638d1 am:
d9ea80d009
am:
46abcdd83f
Change-Id: Ie195e5ab259ed009a311dc5f17522c2d6599fe32
Narayan Kamath [Mon, 14 Nov 2016 14:03:02 +0000 (14:03 +0000)]
Zygote : Block SIGCHLD during fork. am:
b6f3751599 am:
b23e864573 am:
52021073a4 am:
479385b6b3 am:
5f70cb0898 am:
df3e599c7d
am:
19ee3109e1
Change-Id: Ib1b9d1acfe8a689d50334c2107af66b8f2a54513
Narayan Kamath [Mon, 14 Nov 2016 14:01:54 +0000 (14:01 +0000)]
Zygote : Block SIGCHLD during fork. am:
b1f1209d9a am:
35b8453338 am:
14bd75fa79 am:
50b0c3be57 -s ours am:
e1e735bcb9 am:
072b70bae3 am:
ba6d5ee377 am:
f3f784853d am:
8ea47824fa am:
2f2611636b
am:
86e1929551
Change-Id: Ic1a9c733b811ab04cc0024956998137a39edeee5
Narayan Kamath [Mon, 14 Nov 2016 14:01:40 +0000 (14:01 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources. am:
0ad0e859f6 am:
1e6a5d11a6 am:
f0cd32619e -s ours am:
4c26a969e9 am:
b7884e5a9f am:
da65c74c54 am:
24b2a54a84 am:
4a204149eb am:
e58ee798c1 am:
83be5fdebb am:
4c5dc7e622
am:
6b7badc832
Change-Id: Ib452ae62dc517dea0bff09b5fd993c3c26f0e087
Narayan Kamath [Mon, 14 Nov 2016 14:01:34 +0000 (14:01 +0000)]
Zygote: Additional whitelisting for legacy devices. am:
5e2f7c6229 am:
6bf96c1192 am:
22e45fa247 am:
d98e75feca am:
87dc13f249 am:
c50c43667f am:
a5ff6c84a2 am:
9efaadccc0 am:
6861821082
am:
1907f3b17e
Change-Id: I391c58ac0c7555da50c05f7312bd78849d766a9f
Narayan Kamath [Mon, 14 Nov 2016 14:00:45 +0000 (14:00 +0000)]
Merge "Zygote: Additional whitelisting for legacy devices." into lmp-dev am:
7bd25ab485 am:
a045aed7a2 am:
846f64c6fc am:
83b46a1590 am:
330d0ebf48 am:
21c1e58090 am:
81fd9e618c am:
2c13554c18 am:
fb207962aa am:
44e645e59a
am:
f2a94f71fb
Change-Id: Ie17b51e1d33668cf8a8566a65ec9182c17cace16
neo.chae [Mon, 14 Nov 2016 14:00:33 +0000 (14:00 +0000)]
Fix idmap leak in zygote process am:
0244ca8d10 am:
82537abc3b am:
85afb42c16 am:
b4b2203c5e am:
fb74b8773a am:
c58ec27e1c am:
7489336fed am:
0212d4f3fa am:
aaf785c827 am:
4b72904585 am:
7530ea7ec0
am:
fa2e233c30
Change-Id: I8ab4857b2a24d5ef7141254a7f2aaa789d56c819
Andriy Naborskyy [Mon, 14 Nov 2016 14:00:26 +0000 (14:00 +0000)]
Merge "DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous"" into cw-e-dev am:
11da2b5de3 -s ours am:
3f39609cff -s ours am:
fb4beac069 -s ours am:
18305d920e -s ours
am:
0a2ac837d1 -s ours
Change-Id: I0ba7195818a50a4f5260022370aa3a26e5dbd40d
OSDN Git Service
