OSDN Git Service
TreeHugger Robot [Thu, 19 Jan 2017 16:40:43 +0000 (16:40 +0000)]
Merge "Check for REQUEST_NETWORK_SCORES instead of BROADCAST_NETWORK_PRIVILEGED."
Jeff Sharkey [Thu, 19 Jan 2017 16:35:27 +0000 (16:35 +0000)]
Merge "Follow installd API changes." am:
915f279556 am:
6b662722f0 am:
5e17fe3e8c
am:
f52972ad8b
Change-Id: Ib22fb4e87944824a64faf93667181a8bc56098ef
Jeff Sharkey [Thu, 19 Jan 2017 16:30:42 +0000 (16:30 +0000)]
Merge "Follow installd API changes." am:
915f279556 am:
6b662722f0
am:
5e17fe3e8c
Change-Id: I4b812be109896a3574b1034033c163d8f2872e59
Jeff Sharkey [Thu, 19 Jan 2017 16:26:23 +0000 (16:26 +0000)]
Merge "Follow installd API changes." am:
915f279556
am:
6b662722f0
Change-Id: Ia9406884d17226b10cae21fd2d98eecb9e5e7253
TreeHugger Robot [Thu, 19 Jan 2017 16:22:42 +0000 (16:22 +0000)]
Merge "Fix transferring of starting windows"
Jeff Sharkey [Thu, 19 Jan 2017 16:21:54 +0000 (16:21 +0000)]
Merge "Follow installd API changes."
am:
915f279556
Change-Id: Ib362db25a0393e859909e06a00dbb0c655fd4b47
Jeff Sharkey [Thu, 19 Jan 2017 16:16:02 +0000 (16:16 +0000)]
Merge "Follow installd API changes."
TreeHugger Robot [Thu, 19 Jan 2017 15:29:39 +0000 (15:29 +0000)]
Merge "Pass more data through the recommendation request."
Jorim Jaggi [Thu, 19 Jan 2017 14:33:36 +0000 (15:33 +0100)]
Fix transferring of starting windows
Since we may transfer starting data we can not store
AppWindowToken in that class.
Additionally, remove starting window directly if it was
transferred. The normal removing path doesn't really work as
the fields aren't set.
Also fixes a monkey crash in the same code region.
Test: Open a notification that creates multiple activities with
using TaskStackBuilder, verify no windows leaking.
Test: (For monkey crash) Boot device, pray to the monkey god
Change-Id: I64fb176b579535adea1916d1623ad03ab06ca67e
Fixes:
34364463
Fixes:
34361417
Fixes:
34349533
Przemyslaw Szczepaniak [Thu, 19 Jan 2017 14:35:52 +0000 (14:35 +0000)]
Merge "Track libcore java.util.logging update to ojdk8u60" am:
76edc3b8a5 am:
0823ed394b am:
b72c17afdc
am:
baa1aea5e1
Change-Id: Id00a02599847b902878eb501d687645f66e15420
Przemyslaw Szczepaniak [Thu, 19 Jan 2017 14:29:13 +0000 (14:29 +0000)]
Merge "Track libcore java.util.logging update to ojdk8u60" am:
76edc3b8a5 am:
0823ed394b
am:
b72c17afdc
Change-Id: I84dc0804b1f9db5359d9c9d8caf0356398eab2d5
Przemyslaw Szczepaniak [Thu, 19 Jan 2017 14:22:48 +0000 (14:22 +0000)]
Merge "Track libcore java.util.logging update to ojdk8u60" am:
76edc3b8a5
am:
0823ed394b
Change-Id: Iee0a79ac5f1770b218e6ff9e4a9f0d14c3c90378
Przemyslaw Szczepaniak [Thu, 19 Jan 2017 14:16:56 +0000 (14:16 +0000)]
Merge "Track libcore java.util.logging update to ojdk8u60"
am:
76edc3b8a5
Change-Id: I0598b566f4d02a6d14c6be86f917bcef48bbf748
Przemyslaw Szczepaniak [Thu, 19 Jan 2017 14:11:12 +0000 (14:11 +0000)]
Merge "Track libcore java.util.logging update to ojdk8u60"
Orion Hodson [Thu, 19 Jan 2017 13:56:37 +0000 (13:56 +0000)]
Merge "API: Unhide dalvik.system.InMemoryDexClassLoader" am:
e5c3aed8dc am:
a08d67495c am:
da4cfdfbdf
am:
c61c0baeee
Change-Id: I0252e8a7684b05e567f7563e7a82376bcef4b03c
Orion Hodson [Thu, 19 Jan 2017 13:52:05 +0000 (13:52 +0000)]
Merge "API: Unhide dalvik.system.InMemoryDexClassLoader" am:
e5c3aed8dc am:
a08d67495c
am:
da4cfdfbdf
Change-Id: I5bf99527268cb26f3b1cab4a24080b9598ee03d2
TreeHugger Robot [Thu, 19 Jan 2017 13:50:22 +0000 (13:50 +0000)]
Merge "Unhide public methods for API Council review. Test: Existing unit tests still pass. Change-Id: I49b81f99e4e8d8300fbc6b3d74f336d4f291d171"
Orion Hodson [Thu, 19 Jan 2017 13:47:37 +0000 (13:47 +0000)]
Merge "API: Unhide dalvik.system.InMemoryDexClassLoader" am:
e5c3aed8dc
am:
a08d67495c
Change-Id: I4ea03fd453e58737b795c9f856db6a8312fdd1a0
Orion Hodson [Thu, 19 Jan 2017 13:43:05 +0000 (13:43 +0000)]
Merge "API: Unhide dalvik.system.InMemoryDexClassLoader"
am:
e5c3aed8dc
Change-Id: I90cd3d3b09000bd3e1961a63d95eede19f0bd12e
Orion Hodson [Thu, 19 Jan 2017 13:35:50 +0000 (13:35 +0000)]
Merge "API: Unhide dalvik.system.InMemoryDexClassLoader"
Paul Duffin [Thu, 19 Jan 2017 11:54:00 +0000 (11:54 +0000)]
Merge "Prepare for removal of legacy-test from default targets" am:
c74ccf1588 am:
ab62fd67d8 am:
56a2ae1056
am:
43267b4b9e -s ours
Change-Id: I6d18e3a061a446865d367a3cd2053285ca702ded
Paul Duffin [Thu, 19 Jan 2017 11:49:28 +0000 (11:49 +0000)]
Merge "Prepare for removal of legacy-test from default targets" am:
c74ccf1588 am:
ab62fd67d8
am:
56a2ae1056
Change-Id: I0ede6895eb25f72a74af3ac4431a21960500bec5
Paul Duffin [Thu, 19 Jan 2017 11:44:56 +0000 (11:44 +0000)]
Merge "Prepare for removal of legacy-test from default targets" am:
c74ccf1588
am:
ab62fd67d8
Change-Id: I923de1762a15fca7dc255f9dfe0ecce6f54d333c
Paul Duffin [Thu, 19 Jan 2017 11:40:22 +0000 (11:40 +0000)]
Merge "Prepare for removal of legacy-test from default targets"
am:
c74ccf1588
Change-Id: Id4876a2597171ac78062acf8194fce1af6d50b77
Treehugger Robot [Thu, 19 Jan 2017 11:32:10 +0000 (11:32 +0000)]
Merge "Prepare for removal of legacy-test from default targets"
Erik Kline [Thu, 19 Jan 2017 11:31:56 +0000 (11:31 +0000)]
Merge "Try to deduplicate observer iteration code" am:
c8223d0874 am:
c822d054a3 am:
f8afe45d89
am:
e344c6732b
Change-Id: Id8c1766a5e1321ce8cc4327aae5677094aa61fb0
Erik Kline [Thu, 19 Jan 2017 11:27:20 +0000 (11:27 +0000)]
Merge "Try to deduplicate observer iteration code" am:
c8223d0874 am:
c822d054a3
am:
f8afe45d89
Change-Id: I63d06a3d30ec19fcc0dbe90669248b150c8e99a5
Erik Kline [Thu, 19 Jan 2017 11:22:55 +0000 (11:22 +0000)]
Merge "Try to deduplicate observer iteration code" am:
c8223d0874
am:
c822d054a3
Change-Id: Icfa3b57630a6d8d31f68f7d11d09e7ee0b97cc73
Erik Kline [Thu, 19 Jan 2017 11:18:47 +0000 (11:18 +0000)]
Merge "Try to deduplicate observer iteration code"
am:
c8223d0874
Change-Id: I89c4fe6c7c669b7e84c67d0bed9cc97da09cffd0
Treehugger Robot [Thu, 19 Jan 2017 11:10:21 +0000 (11:10 +0000)]
Merge "Try to deduplicate observer iteration code"
Pavel Grafov [Thu, 19 Jan 2017 11:09:29 +0000 (11:09 +0000)]
Merge "Store pending OTA state and make it accessible via polling api."
Ben Murdoch [Thu, 19 Jan 2017 10:42:08 +0000 (10:42 +0000)]
Merge "When dragging text, take style data too."
Erik Kline [Thu, 19 Jan 2017 09:58:52 +0000 (09:58 +0000)]
Merge "Eschew unspecified IP addresses for DNS servers" am:
0ac7232b7c am:
9b986734e4 am:
d484df91bf
am:
91e97fe703
Change-Id: I5cc53c49f8fff4fd7afea9571b8a63a768092abb
Erik Kline [Thu, 19 Jan 2017 09:54:21 +0000 (09:54 +0000)]
Merge "Eschew unspecified IP addresses for DNS servers" am:
0ac7232b7c am:
9b986734e4
am:
d484df91bf
Change-Id: I6fc5fd9ef1b35afa8513c2450cd625e376610236
Erik Kline [Thu, 19 Jan 2017 09:49:43 +0000 (09:49 +0000)]
Merge "Eschew unspecified IP addresses for DNS servers" am:
0ac7232b7c
am:
9b986734e4
Change-Id: I2a3817e030adeef54012177380e886771502308c
Erik Kline [Thu, 19 Jan 2017 09:46:09 +0000 (09:46 +0000)]
Merge "Eschew unspecified IP addresses for DNS servers"
am:
0ac7232b7c
Change-Id: Id82777e6760c36e8f8dd59b447fa5862c295d59b
Paul Duffin [Tue, 10 Jan 2017 12:08:23 +0000 (12:08 +0000)]
Prepare for removal of legacy-test from default targets
In preparation for removing junit classes from the Android API
the legacy-test target will be removed from the
TARGET_DEFAULT_JAVA_LIBRARIES. This change adds explicit
dependencies on junit and/or legacy-android-test to ensure that
modules will compile properly once it is removed.
(cherry picked from
6387604f9e672ece85e07c4bcbd7be396867f06f)
Bug:
30188076
Test: make checkbuild
Merged-In: I13e88297731253420e4e5f5291d503f13a39a156
Change-Id: I58446eb8c45d8ac2bcdbc9fa40d1321e811bdd4b
Treehugger Robot [Thu, 19 Jan 2017 09:38:26 +0000 (09:38 +0000)]
Merge "Eschew unspecified IP addresses for DNS servers"
Paul Duffin [Thu, 19 Jan 2017 09:34:15 +0000 (09:34 +0000)]
Merge "Prepare for removal of legacy-test from default targets"
Erik Kline [Wed, 18 Jan 2017 11:54:14 +0000 (20:54 +0900)]
Try to deduplicate observer iteration code
Later on, registerObserver() can take a handler argument and
invokeForAllObservers() can be updated to post to it when
provided.
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest frameworks-net passes
Bug:
32163131
Change-Id: Ibc32079e1084e2e43f7826fe6b2bdbb83c482e26
Erik Kline [Thu, 19 Jan 2017 08:08:08 +0000 (08:08 +0000)]
Merge "Eschew unspecified IP addresses for DNS servers" into nyc-mr2-dev am:
18f1a35d46
am:
88d7f34aa6
Change-Id: Ieca1c4e1ec2d33c25cf1e5aab90b8b99f27bfbce
Erik Kline [Thu, 19 Jan 2017 08:07:13 +0000 (08:07 +0000)]
Eschew unspecified IP addresses for DNS servers am:
a19f9f281a
am:
b2331e9c34
Change-Id: I22641f3cd329fd332aa7e717cbfedce0fe6b83e4
Erik Kline [Thu, 19 Jan 2017 08:02:17 +0000 (08:02 +0000)]
Merge "Eschew unspecified IP addresses for DNS servers" into nyc-mr2-dev
am:
18f1a35d46
Change-Id: I5ce2d847aed00ee026b096e4e2c570ec0780f4f5
Erik Kline [Thu, 19 Jan 2017 08:02:11 +0000 (08:02 +0000)]
Eschew unspecified IP addresses for DNS servers
am:
a19f9f281a
Change-Id: I3ff187ffc0c3bab4b51a1176c26647637c6224cf
Erik Kline [Thu, 19 Jan 2017 05:24:26 +0000 (14:24 +0900)]
Eschew unspecified IP addresses for DNS servers
Test: as follows
- built
- flashed
- booted
- runtest frameworks-wifi passes (though no test covers this code yet)
Bug:
34210527
Change-Id: I2d44445982dfb3221f7b6394daf0479c1fa8a6e1
TreeHugger Robot [Thu, 19 Jan 2017 07:57:11 +0000 (07:57 +0000)]
Merge "Eschew unspecified IP addresses for DNS servers" into nyc-mr2-dev
TreeHugger Robot [Thu, 19 Jan 2017 06:54:02 +0000 (06:54 +0000)]
Merge "Use public version of AppFuse in MtpDocumentsProvider."
Lorenzo Colitti [Thu, 19 Jan 2017 06:38:29 +0000 (06:38 +0000)]
Merge "VPN reconnection fails after manually disabling VPN" into nyc-mr2-dev am:
bb08c408a8
am:
8580fda424
Change-Id: I6e6db06f61956ea1cee9d792bb4b3d812404a9d0
Hisanobu Watanabe [Thu, 19 Jan 2017 06:37:32 +0000 (06:37 +0000)]
VPN reconnection fails after manually disabling VPN am:
2b465d889c
am:
e4a8c10029
Change-Id: Iaebc1bf836a010bf8cced6b448de4248fd326409
Lorenzo Colitti [Thu, 19 Jan 2017 06:33:07 +0000 (06:33 +0000)]
Merge "VPN reconnection fails after manually disabling VPN" into nyc-mr2-dev
am:
bb08c408a8
Change-Id: I5fbec805a089d660f4b34dc2d2f232e12f248d01
Hisanobu Watanabe [Thu, 19 Jan 2017 06:33:00 +0000 (06:33 +0000)]
VPN reconnection fails after manually disabling VPN
am:
2b465d889c
Change-Id: I9978148c6070cf9a0c4e7965054694fcd29cdecb
Lorenzo Colitti [Thu, 19 Jan 2017 06:27:20 +0000 (06:27 +0000)]
Merge "VPN reconnection fails after manually disabling VPN" into nyc-mr2-dev
Erik Kline [Thu, 19 Jan 2017 05:24:26 +0000 (14:24 +0900)]
Eschew unspecified IP addresses for DNS servers
Test: as follows
- built
- flashed
- booted
- runtest frameworks-wifi passes (though no test covers this code yet)
Bug:
34210527
Change-Id: I2d44445982dfb3221f7b6394daf0479c1fa8a6e1
TreeHugger Robot [Thu, 19 Jan 2017 06:22:23 +0000 (06:22 +0000)]
Merge "create a metrics log reader for tests"
TreeHugger Robot [Thu, 19 Jan 2017 05:42:07 +0000 (05:42 +0000)]
Merge "Notify task about display change when moved to new stack"
Tomasz Mikolajewski [Thu, 19 Jan 2017 05:26:07 +0000 (05:26 +0000)]
Merge "Add Web Links API to framework."
Daichi Hirono [Tue, 15 Nov 2016 04:07:01 +0000 (13:07 +0900)]
Use public version of AppFuse in MtpDocumentsProvider.
AppFuse is now a public API. The CL removes the private version from
MtpDocuemntsProvider package and switches to the public version.
Bug:
32891253
Test: MtpDocumentsProviderTest
Change-Id: Ibdf67309bc0678e2f70ac2dddb920125d9e0760e
TreeHugger Robot [Thu, 19 Jan 2017 05:02:10 +0000 (05:02 +0000)]
Merge "consumerir HAL uses "default" service name"
Bill Yi [Thu, 19 Jan 2017 04:57:09 +0000 (04:57 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
7c0a5220cb -s ours
am:
aad64fe869 -s ours
Change-Id: I463f778419c18f51b91e141cc426315b078e496e
Bill Yi [Thu, 19 Jan 2017 04:56:16 +0000 (04:56 +0000)]
Import translations. DO NOT MERGE am:
c2eddc99cd -s ours
am:
15f7c3fdf8 -s ours
Change-Id: I70c30df7cea8782764b6af56f1605bb13cbc15d4
Bill Yi [Thu, 19 Jan 2017 04:55:19 +0000 (04:55 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
9ba372781e -s ours
am:
46db3c47d1 -s ours
Change-Id: I6422087b0877df9eacf85a6f777f590871968db2
Bill Yi [Thu, 19 Jan 2017 04:54:23 +0000 (04:54 +0000)]
Import translations. DO NOT MERGE am:
61385acb7a -s ours
am:
e85770348a -s ours
Change-Id: Idd60afa73247a4e9aabf62b68b157e7ccb89c580
Bill Yi [Thu, 19 Jan 2017 04:49:54 +0000 (04:49 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
7c0a5220cb -s ours
Change-Id: Ib2a61f321ebecc23b892745232f2dfd22b96e6de
Bill Yi [Thu, 19 Jan 2017 04:49:49 +0000 (04:49 +0000)]
Import translations. DO NOT MERGE
am:
c2eddc99cd -s ours
Change-Id: I266b3575318dc829b6b9a2f9ded5a268f81db89b
Bill Yi [Thu, 19 Jan 2017 04:48:27 +0000 (04:48 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
9ba372781e -s ours
Change-Id: Ief80cc50b3ccd1879d8dfd8844a8c9ec2d3c5f31
Bill Yi [Thu, 19 Jan 2017 04:48:22 +0000 (04:48 +0000)]
Import translations. DO NOT MERGE
am:
61385acb7a -s ours
Change-Id: I010af0e35746aaa80b902ed0342d3aa8d66c6a2d
Hongming Jin [Thu, 19 Jan 2017 04:47:30 +0000 (04:47 +0000)]
Merge "Test: AccountManagerService APCT test."
TreeHugger Robot [Thu, 19 Jan 2017 04:45:03 +0000 (04:45 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 19 Jan 2017 04:44:37 +0000 (04:44 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 19 Jan 2017 04:44:12 +0000 (04:44 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 19 Jan 2017 04:43:46 +0000 (04:43 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Thu, 19 Jan 2017 04:43:03 +0000 (04:43 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Thu, 19 Jan 2017 04:40:47 +0000 (04:40 +0000)]
Merge "Import translations. DO NOT MERGE"
Chris Wren [Tue, 29 Nov 2016 15:43:28 +0000 (10:43 -0500)]
create a metrics log reader for tests
Add parallel logs using the new format for the old MetricsLogger
calls. Deduplicate these after the new reader implementation is
complete.
Test: ./vendor/google/tools/systemui/systemui_test_cookbook.sh
Change-Id: If12e1b66b0ec5ac23bd65e44df4f3c6d6931e722
TreeHugger Robot [Thu, 19 Jan 2017 04:37:31 +0000 (04:37 +0000)]
Merge "Add <autofill-service> that declares AutoFillService metadata."
Mark Rathjen [Thu, 19 Jan 2017 04:21:43 +0000 (04:21 +0000)]
Merge "Roll forward SSAID Migration to be Per App/User Unique Values."
TreeHugger Robot [Thu, 19 Jan 2017 04:18:02 +0000 (04:18 +0000)]
Merge "Fixed enhanced for loop."
TreeHugger Robot [Thu, 19 Jan 2017 04:17:15 +0000 (04:17 +0000)]
Merge "Add AUTO_FILL_MANAGE metrics action."
Mark Rathjen [Thu, 19 Jan 2017 04:10:37 +0000 (04:10 +0000)]
Roll forward SSAID Migration to be Per App/User Unique Values.
SSAID is currently shared across all applications for each
user on the device, giving developers the ability to track
users across multiple applications. Using SSAID for tracking
is an abuse of the original intention of the SSAID and has
inherent privacy concerns.
This change will make the SSAID unique per application, per
user on a device. To not affect applications installed prior
to this change they will retain the legacy SSAID value until
uninstalled and reinstalled again.
Across subsequent installations the application will receive
the same SSAID as long as the package name and signature remain
consistent.
Tested manually the following cases:
- App retains the legacy sssaid after OTA.
- App gets a new ssaid upon post-OTA installation.
- App retrieves same ssaid across post-OTA unistall/reinstalls.
- Different Apps receive different ssaids.
- Factory reset removes ssaid data and generates a different
ssaid after App install.
- System retains legacy ssaid.
Bug:
34395671
Test: CTS tests passed, Manual testing passed
This reverts commit
be43257005d086ff7d93c15dae22ac40bc0d545e.
Change-Id: Ibf20e7949304c30d65bb8aa24cdbbe6e104b1002
gomo [Mon, 16 Jan 2017 04:26:48 +0000 (20:26 -0800)]
Unhide public methods for API Council review.
Test: Existing unit tests still pass.
Change-Id: I49b81f99e4e8d8300fbc6b3d74f336d4f291d171
Hisanobu Watanabe [Tue, 7 Jun 2016 10:55:41 +0000 (19:55 +0900)]
VPN reconnection fails after manually disabling VPN
When disabling VPN manually, there was no trigger for ipsec-tools to
send “delete message” to VPN server. Therefore, connection information
is left in VPN server and next connection fails.
Fix this issue as below:
- Add “delete message” sending via flush in ipsec-tools when racoon
daemon stops
- Keep daemon alive when VPN.java exit() to let it finish sending to
VPN server
- Move close(socket) and stop(daemon) in VPN.java execute()
and monitorDaemons() to run() to gather cleaning block.
(cherry picked from commit
047454c759b46bbadb87ee3b64bf3e29afda48d6)
Change-Id: Ibfbd389b17de5b5a5d23cba59c8d1e05fbe12c15
Bug:
28279646
Bug:
33467086
Jason Long [Wed, 18 Jan 2017 11:16:04 +0000 (03:16 -0800)]
Add <autofill-service> that declares AutoFillService metadata.
The initial version of <autofill-service> may contain a settingsActivity
attribute.
Test: Manual verification
Change-Id: I63a67aa4b7110fbf21d0b01ee53add712bfb0364
TreeHugger Robot [Thu, 19 Jan 2017 03:03:37 +0000 (03:03 +0000)]
Merge "TYPE_DYNAMIC_SENSOR_META type should be wake up sensor"
TreeHugger Robot [Thu, 19 Jan 2017 03:01:31 +0000 (03:01 +0000)]
Merge "AudioService: modify logic for independent a11y volume"
Tomasz Mikolajewski [Mon, 24 Oct 2016 06:17:01 +0000 (15:17 +0900)]
Add Web Links API to framework.
Test: CTS in a separate CL.
Bug:
30152711
Change-Id: Ia256422d50110d6adcd1984f6481ab825dbf30b1
Felipe Leme [Thu, 19 Jan 2017 02:38:46 +0000 (18:38 -0800)]
Fixed enhanced for loop.
It was trying to interact through null, which could throw an exception. Example:
01-18 18:28:12.609 862 2038 W Binder : Binder call failed.
01-18 18:28:12.609 862 2038 W Binder : java.lang.NullPointerException: Attempt to get length of null array
01-18 18:28:12.609 862 2038 W Binder : at android.app.Notification$Action$Builder.build(Notification.java:1289)
Test: manual verification
Change-Id: I84fda80ebd12df7d90730b17fa77d4b9ce5f58d2
Jason Long [Wed, 18 Jan 2017 11:15:21 +0000 (03:15 -0800)]
Add AUTO_FILL_MANAGE metrics action.
Test: Trivial change; adding enum.
Change-Id: Ic2c98385ea445b9ec68c66868f157cfd3dd92861
Bill Yi [Thu, 19 Jan 2017 02:34:42 +0000 (18:34 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ifbcbdefc12b2c4f70102775ee3134c8337849721
Auto-generated-cl: translation import
Michael Wright [Thu, 19 Jan 2017 02:30:47 +0000 (02:30 +0000)]
Merge "Validate custom pointer icons aren't null." into cw-f-dev am:
05b2d3eb0d am:
b1ccd81fba
am:
a9389bf593
Change-Id: If9f4402b7dba2efa386f4c008b9e1477b753a282
Michael Wright [Thu, 19 Jan 2017 02:27:17 +0000 (02:27 +0000)]
Merge "Merge "Validate custom pointer icons aren't null." into cw-f-dev am:
05b2d3eb0d am:
24a1667145" into nyc-mr2-dev-plus-aosp
am:
6497bf0e58
Change-Id: I92deab86f5a1a41008c7e18de77c0ae5ff169bfc
Michael Wright [Thu, 19 Jan 2017 02:27:07 +0000 (02:27 +0000)]
Merge "Validate custom pointer icons aren't null." into cw-f-dev am:
05b2d3eb0d am:
24a1667145
am:
dae7631fdb
Change-Id: I64177384df476df99bc745914c1f61b26620880d
Michael Wright [Thu, 19 Jan 2017 02:25:49 +0000 (02:25 +0000)]
Merge "Validate custom pointer icons aren't null. am:
35068079c8 am:
92f7fab9f6" into nyc-mr2-dev-plus-aosp
am:
e97ec8ca9d
Change-Id: Ib199cbf80ca2f8711f8968989f2cffe9dbffec7e
Michael Wright [Thu, 19 Jan 2017 02:25:42 +0000 (02:25 +0000)]
Validate custom pointer icons aren't null. am:
35068079c8 am:
92f7fab9f6
am:
94fc026afa
Change-Id: I169e6fe508fe4674c378f324edfd5298e1aaa412
Michael Wright [Thu, 19 Jan 2017 02:24:42 +0000 (02:24 +0000)]
Validate custom pointer icons aren't null. am:
35068079c8 am:
4bb5848a93
am:
9b8e9a1ee9
Change-Id: I4cb3203cd3f5566e2577896781069fe2a27709e6
Michael Wright [Thu, 19 Jan 2017 02:24:41 +0000 (02:24 +0000)]
Merge "Validate custom pointer icons aren't null." into cw-f-dev am:
05b2d3eb0d
am:
b1ccd81fba
Change-Id: I6dc28541e6c52de28bf22b6bb111a0f9f5dcb235
Android Build Merger (Role) [Thu, 19 Jan 2017 02:22:37 +0000 (02:22 +0000)]
Merge "Merge "Validate custom pointer icons aren't null." into cw-f-dev am:
05b2d3eb0d am:
24a1667145" into nyc-mr2-dev-plus-aosp
Michael Wright [Thu, 19 Jan 2017 02:22:00 +0000 (02:22 +0000)]
Merge "Validate custom pointer icons aren't null." into cw-f-dev am:
05b2d3eb0d
am:
24a1667145
Change-Id: I0cff9d5dbdc4228ad8d02cd73259f60055fdb9bc
Android Build Merger (Role) [Thu, 19 Jan 2017 02:21:57 +0000 (02:21 +0000)]
Merge "Validate custom pointer icons aren't null. am:
35068079c8 am:
92f7fab9f6" into nyc-mr2-dev-plus-aosp
Andrii Kulian [Wed, 18 Jan 2017 20:14:37 +0000 (12:14 -0800)]
Notify task about display change when moved to new stack
Bug:
34176283
Test: android.server.cts.ActivityManagerDisplayTests
Test: #testMoveTaskBetweenDisplays
Test: bit FrameworksServicesTests:com.android.server.wm.TaskWindowContainerControllerTests
Test: bit FrameworksServicesTests:com.android.server.wm.TaskStackContainersTests
Change-Id: If085246926790089e014a94093d788805e812489
Michael Wright [Thu, 19 Jan 2017 02:21:14 +0000 (02:21 +0000)]
Validate custom pointer icons aren't null. am:
35068079c8
am:
92f7fab9f6
Change-Id: I996d08fd61f3c64936088251e851cdf30899b3e8