OSDN Git Service
TreeHugger Robot [Fri, 20 Jan 2017 09:43:15 +0000 (09:43 +0000)]
Merge "ConnectivityServiceTest: some fixes in CallbackInfo"
Lorenzo Colitti [Fri, 20 Jan 2017 09:06:55 +0000 (09:06 +0000)]
Merge "Don't loop forever on zero-length ICMPv6 ND options." am:
e7128b10a8 am:
113d5f8f40 am:
6bcbb16630
am:
f73df6370a
Change-Id: I4ca872c2e38f9513d0f5cb883a535f96a77afc76
Lorenzo Colitti [Fri, 20 Jan 2017 09:02:50 +0000 (09:02 +0000)]
Merge "Don't loop forever on zero-length ICMPv6 ND options." am:
e7128b10a8 am:
113d5f8f40
am:
6bcbb16630
Change-Id: I38ba45068c00c0948f561a788a7015ed250d62b6
Lorenzo Colitti [Fri, 20 Jan 2017 08:58:47 +0000 (08:58 +0000)]
Merge "Don't loop forever on zero-length ICMPv6 ND options." am:
e7128b10a8
am:
113d5f8f40
Change-Id: Ic2d6596d14f6176a823fd66b400af8515617c66d
Lorenzo Colitti [Fri, 20 Jan 2017 08:54:42 +0000 (08:54 +0000)]
Merge "Don't loop forever on zero-length ICMPv6 ND options."
am:
e7128b10a8
Change-Id: If2260dd2b1bdaf2619cee668f8c2ef81e9dcfdce
Treehugger Robot [Fri, 20 Jan 2017 08:47:17 +0000 (08:47 +0000)]
Merge "Don't loop forever on zero-length ICMPv6 ND options."
TreeHugger Robot [Fri, 20 Jan 2017 08:40:14 +0000 (08:40 +0000)]
Merge "Properly check per UID app ops and dump user restrictions."
Hugo Benichi [Fri, 20 Jan 2017 08:31:57 +0000 (08:31 +0000)]
Merge "DO NOT MERGE Unit tests for NetworkNotificationManager" am:
216a4e7655 -s ours am:
feca77b884 -s ours am:
4c2371db6b
am:
3d50fd1118 -s ours
Change-Id: I65b787f2752eb7b17ec175336a7f25ba23529781
Hugo Benichi [Fri, 20 Jan 2017 07:59:43 +0000 (07:59 +0000)]
Merge "DO NOT MERGE Unit tests for NetworkNotificationManager" am:
216a4e7655 -s ours am:
feca77b884 -s ours
am:
4c2371db6b
Change-Id: I78a3f6ffb4e1906906bf218dd11c8f65c5d3c96b
Hugo Benichi [Tue, 20 Dec 2016 08:05:06 +0000 (17:05 +0900)]
ConnectivityServiceTest: some fixes in CallbackInfo
- CallbackInfo becomes a static class so that it can be instantiated
and looked at more easily than before.
- CallbackInfo gains hashCode() because it has equals().
- effectively final field are qualified final
- fixes bug when polling the next callback: poll() on a LinkedBlockingQueue
returns null when timing out, which was not failing the test cleanly.
Test: ConnectivityServiceTest passes
Bug:
32561414
(cherry picked from commit
4e1619f034b256984ea85b4d89aa2e16ac6f795c)
Change-Id: Ica5f1609975e4b256f4e2f3dc2ac84362e762da2
Hugo Benichi [Fri, 20 Jan 2017 07:55:35 +0000 (07:55 +0000)]
Merge "DO NOT MERGE Unit tests for NetworkNotificationManager" am:
216a4e7655 -s ours
am:
feca77b884 -s ours
Change-Id: I847fe5f04ebf8b5634c3ae0974e69d50cef9df76
Hugo Benichi [Fri, 20 Jan 2017 07:51:31 +0000 (07:51 +0000)]
Merge "DO NOT MERGE Unit tests for NetworkNotificationManager"
am:
216a4e7655 -s ours
Change-Id: I05fe9095395df00b96df3cbe3a6e4f31a160e0b5
Hugo Benichi [Fri, 20 Jan 2017 07:44:29 +0000 (07:44 +0000)]
Merge "DO NOT MERGE Unit tests for NetworkNotificationManager"
Erik Kline [Fri, 20 Jan 2017 07:13:49 +0000 (07:13 +0000)]
Merge "BroadcastReceiver refactoring" am:
73a57bb9da am:
bcdd7475e5 am:
2d49de42b8
am:
75de0b6421
Change-Id: I98b9a0c46a0e3b69a74e2a8c2320090edcb1ad5b
Jiaquan He [Fri, 20 Jan 2017 07:12:43 +0000 (07:12 +0000)]
Merge "2D Recents: round task thumbnails properly." into nyc-mr2-dev am:
fb764b7035
am:
c0793c3d4d
Change-Id: I66425ff7677e651f9979e98cc7da0d3000f86771
Jiaquan He [Fri, 20 Jan 2017 07:11:42 +0000 (07:11 +0000)]
2D Recents: round task thumbnails properly. am:
90f4f5290b
am:
0dd94210ee -s ours
Change-Id: If78ce5adf7540d6585a95fe5c2e0c68c384e4876
Svet Ganov [Fri, 20 Jan 2017 02:04:38 +0000 (18:04 -0800)]
Properly check per UID app ops and dump user restrictions.
Test: Permission CTS tests pass and shell dump correct
Change-Id: I7cf4c85781172319891756034b5bade62f76803f
Lorenzo Colitti [Fri, 23 Dec 2016 04:54:50 +0000 (13:54 +0900)]
Don't loop forever on zero-length ICMPv6 ND options.
Bug:
33828433
(cherry picked from commit
2f157c421a9fa15660b8f1bc0c64b1ebb45fa64a)
Change-Id: Icc03f0fcbf40d87e0b9c69e1172802ffcc85531b
Chen Xu [Fri, 20 Jan 2017 06:46:23 +0000 (06:46 +0000)]
Merge "Initial change on carrier signal filtering" am:
bfdce89f36 am:
1507930691 am:
923046251b
am:
038bea5dd1 -s ours
Change-Id: If8647a5437784018aeb8d1704899496cec542dab
Erik Kline [Fri, 20 Jan 2017 06:37:37 +0000 (06:37 +0000)]
Merge "BroadcastReceiver refactoring" am:
73a57bb9da am:
bcdd7475e5
am:
2d49de42b8
Change-Id: I7c1c3ff3a278c536f2483ce5bd58360ab3bbe2cf
Erik Kline [Fri, 20 Jan 2017 06:33:39 +0000 (06:33 +0000)]
Merge "BroadcastReceiver refactoring" am:
73a57bb9da
am:
bcdd7475e5
Change-Id: I213f5af2393d3fc353114f30205b3378d3f169a5
Erik Kline [Fri, 20 Jan 2017 06:29:36 +0000 (06:29 +0000)]
Merge "BroadcastReceiver refactoring"
am:
73a57bb9da
Change-Id: Iafb0aa75c564aeb4c0181ef0dbacc6de4527480a
Erik Kline [Fri, 20 Jan 2017 06:23:35 +0000 (06:23 +0000)]
Merge "BroadcastReceiver refactoring"
Hugo Benichi [Wed, 7 Dec 2016 05:49:55 +0000 (14:49 +0900)]
DO NOT MERGE Unit tests for NetworkNotificationManager
Test: new unit test, no functional changes.
Bug:
32198726
(cherry picked from commit
74264329da5c52fbbafc1d20457056fdeabe19dc)
Change-Id: I123de68de9ae353b95edce89eb570cfbb5f8d9a3
TreeHugger Robot [Fri, 20 Jan 2017 05:11:27 +0000 (05:11 +0000)]
Merge "Disable kernel UID updates until update lands."
Jiaquan He [Fri, 20 Jan 2017 04:26:48 +0000 (04:26 +0000)]
Merge "2D Recents: round task thumbnails properly." into nyc-mr2-dev
am:
fb764b7035
Change-Id: Idd44a0786190fa84e4c7020a7deb76fb28c333b6
Jiaquan He [Fri, 20 Jan 2017 04:26:40 +0000 (04:26 +0000)]
2D Recents: round task thumbnails properly.
am:
90f4f5290b
Change-Id: Ice4ac5f7e32e9d209af2bec53530d8f425609ca2
Chen Xu [Fri, 20 Jan 2017 04:13:03 +0000 (04:13 +0000)]
Merge "Initial change on carrier signal filtering" am:
bfdce89f36 am:
1507930691
am:
923046251b
Change-Id: I0762a7787c4136de027f8ee5def592bc85be25b6
TreeHugger Robot [Fri, 20 Jan 2017 04:09:59 +0000 (04:09 +0000)]
Merge "Add wide color gamut and HDR resource qualifiers"
Erik Kline [Wed, 18 Jan 2017 02:57:45 +0000 (11:57 +0900)]
BroadcastReceiver refactoring
All registerReceiver() calls now specify to be run on the tethering
master state machine's handler. Eventually, some of the locking might
be removed (requires careful review, later).
Also: slightly refactor StateReceiver for readability
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest frameworks-net passes
- vanilla tethering from WiFi to mobile works
Bug:
32163131
Change-Id: I39844f6e1608179ebeb41668a6db8a4e44d30ecf
TreeHugger Robot [Fri, 20 Jan 2017 04:05:27 +0000 (04:05 +0000)]
Merge "2D Recents: round task thumbnails properly." into nyc-mr2-dev
Colin Cross [Fri, 20 Jan 2017 04:04:27 +0000 (04:04 +0000)]
Merge "Revert "Update layoutlib following Change Id10ca97f on FontFamily""
Chen Xu [Fri, 20 Jan 2017 03:54:22 +0000 (03:54 +0000)]
Merge "Initial change on carrier signal filtering" am:
bfdce89f36
am:
1507930691
Change-Id: I2edbdbd65fd90215b39e1b5f4a888c9df119b841
Chen Xu [Fri, 20 Jan 2017 03:39:15 +0000 (03:39 +0000)]
Merge "Initial change on carrier signal filtering"
am:
bfdce89f36
Change-Id: I8746998d2554d6161766ca29779dc7efabc5b802
Jeff Sharkey [Fri, 20 Jan 2017 03:25:03 +0000 (20:25 -0700)]
Disable kernel UID updates until update lands.
Current prebuilt kernel can result in the framework banging its head
against the wall writing the first duplicate update; it does this by
returning 0 for write().
We can revert this or flip the flag once an updated kernel lands.
Test: builds, boots
Bug:
33755020
Change-Id: Idb3e5ad40e2e6681848b47ce2b29dff9db3d4f6f
Chen Xu [Fri, 20 Jan 2017 03:16:51 +0000 (03:16 +0000)]
Merge "Initial change on carrier signal filtering"
TreeHugger Robot [Fri, 20 Jan 2017 02:55:25 +0000 (02:55 +0000)]
Merge "Enable background restrictions"
Siyamed Sinir [Fri, 20 Jan 2017 02:51:36 +0000 (02:51 +0000)]
Revert "Update layoutlib following Change Id10ca97f on FontFamily"
Reason: The changes that this CL depends on, had to be reverted.
This reverts commit
7a1cab2c9606ca5aab0f030c0022b864d5c05888.
Bug:
34378805
Change-Id: I6bd05082060199c1907743b9f72d4c2438371aa6
Romain Guy [Thu, 19 Jan 2017 00:34:42 +0000 (16:34 -0800)]
Add wide color gamut and HDR resource qualifiers
Bug:
32984164
Test: Config_test, AaptConfig_test and aapt2_tests
Change-Id: Ie9c82bfe2d36b1d6180ee223250ab5bb2ce90dd4
Jeremy Joslin [Fri, 20 Jan 2017 02:43:52 +0000 (02:43 +0000)]
Merge "Check for REQUEST_NETWORK_SCORES instead of BROADCAST_NETWORK_PRIVILEGED." am:
b5b00857eb am:
0af25e62c9 am:
5418f151cc
am:
3465cd9e30 -s ours
Change-Id: I29104b3a3747d85f4a3ed52b35c06db8bb4bf8d5
Jeremy Joslin [Fri, 20 Jan 2017 02:35:50 +0000 (02:35 +0000)]
Merge "Check for REQUEST_NETWORK_SCORES instead of BROADCAST_NETWORK_PRIVILEGED." am:
b5b00857eb am:
0af25e62c9
am:
5418f151cc
Change-Id: I74ce97c93e640a601e811b571f37fe1fed114391
Chen Xu [Fri, 20 Jan 2017 02:26:48 +0000 (02:26 +0000)]
Merge "Initial change on carrier signal filtering"
Jeremy Joslin [Fri, 20 Jan 2017 02:24:31 +0000 (02:24 +0000)]
Merge "Pass more data through the recommendation request." am:
00514f1dc0 am:
ddfbe07e96 am:
ec630d0bf0
am:
261b5c4c49 -s ours
Change-Id: I4941966e10de8a9c812f5933c27b22ba9657c9bc
Jeremy Joslin [Fri, 20 Jan 2017 02:21:00 +0000 (02:21 +0000)]
Merge "Check for REQUEST_NETWORK_SCORES instead of BROADCAST_NETWORK_PRIVILEGED." am:
b5b00857eb
am:
0af25e62c9
Change-Id: Ied883055a0b85a1df53491a88f6bd7eac594c5f5
TreeHugger Robot [Fri, 20 Jan 2017 02:19:45 +0000 (02:19 +0000)]
Merge "2D Recents: round task thumbnails properly."
TreeHugger Robot [Fri, 20 Jan 2017 02:15:52 +0000 (02:15 +0000)]
Merge "Simplify FileUtils.stringToFile()."
Jeremy Joslin [Fri, 20 Jan 2017 02:11:47 +0000 (02:11 +0000)]
Merge "Check for REQUEST_NETWORK_SCORES instead of BROADCAST_NETWORK_PRIVILEGED."
am:
b5b00857eb
Change-Id: I54a69f11284efb07ee6be58650d7a246540010dc
TreeHugger Robot [Fri, 20 Jan 2017 02:09:23 +0000 (02:09 +0000)]
Merge "Insert badged icons into the WifiSettings picker."
Jeremy Joslin [Fri, 20 Jan 2017 02:07:53 +0000 (02:07 +0000)]
Merge "Pass more data through the recommendation request." am:
00514f1dc0 am:
ddfbe07e96
am:
ec630d0bf0
Change-Id: I20ce25072262a7aef36b9fdaa317210283ca495f
TreeHugger Robot [Fri, 20 Jan 2017 02:03:29 +0000 (02:03 +0000)]
Merge "Add rankingScores and badges to WifiPicker."
Jeremy Joslin [Fri, 20 Jan 2017 02:02:03 +0000 (02:02 +0000)]
Merge "Pass more data through the recommendation request." am:
00514f1dc0
am:
ddfbe07e96
Change-Id: Ib831f420dd6ca976f9ce72476028b18ea61e2211
Siyamed Sinir [Fri, 20 Jan 2017 01:10:59 +0000 (01:10 +0000)]
Revert "Follow minikin::FontFamily constructor signature change."
This reverts commit
a0a4828614edfd633ab86f04408e7f4e55b491dd.
Bug:
34378805
Change-Id: Icbdbfbde2efe8eaebbe4334a679e3b3247057388
Treehugger Robot [Fri, 20 Jan 2017 02:00:42 +0000 (02:00 +0000)]
Merge "Check for REQUEST_NETWORK_SCORES instead of BROADCAST_NETWORK_PRIVILEGED."
Android Build Merger (Role) [Fri, 20 Jan 2017 02:00:07 +0000 (02:00 +0000)]
Merge changes from topic 'am-
e50edd437cbb475fa514e750559a7e14'
* changes:
Merge "Use separate switch ops for runtime permissions am:
e710a6fc66 am:
a2bbc26979" into nyc-mr2-dev-plus-aosp am:
583d798e41
Use separate switch ops for runtime permissions am:
e710a6fc66 am:
a2bbc26979 am:
49dc9048fd
Siyamed Sinir [Fri, 20 Jan 2017 01:59:47 +0000 (01:59 +0000)]
Merge "Revert "Introduce set/getFontVariationSettings.""
TreeHugger Robot [Fri, 20 Jan 2017 01:59:14 +0000 (01:59 +0000)]
Merge "ActivityThread: Only update code paths that have been added"
Svet Ganov [Fri, 20 Jan 2017 01:58:55 +0000 (01:58 +0000)]
Merge "Use separate switch ops for runtime permissions am:
e710a6fc66 am:
a2bbc26979" into nyc-mr2-dev-plus-aosp
am:
583d798e41
Change-Id: Icd7e22dadb81e58514cef920fd9ed7cb9207433b
Svet Ganov [Fri, 20 Jan 2017 01:58:26 +0000 (01:58 +0000)]
Use separate switch ops for runtime permissions am:
e710a6fc66 am:
a2bbc26979
am:
49dc9048fd
Change-Id: I37a87f67e0ca1cf2d4bb0ebe5bfe5ac68a2a13b6
Svet Ganov [Fri, 20 Jan 2017 01:56:57 +0000 (01:56 +0000)]
Use separate switch ops for runtime permissions am:
e710a6fc66 am:
7751660b2a
am:
c6107e1834
Change-Id: I7ddec832ff602026d28ea6f7ab649e72bde48d24
Jeremy Joslin [Fri, 20 Jan 2017 01:52:38 +0000 (01:52 +0000)]
Merge "Pass more data through the recommendation request."
am:
00514f1dc0
Change-Id: I97e11e876bcb7ccdb55a333b31f9970ae5edd001
Android Build Merger (Role) [Fri, 20 Jan 2017 01:48:12 +0000 (01:48 +0000)]
Merge "Use separate switch ops for runtime permissions am:
e710a6fc66 am:
a2bbc26979" into nyc-mr2-dev-plus-aosp
Svet Ganov [Fri, 20 Jan 2017 01:47:17 +0000 (01:47 +0000)]
Use separate switch ops for runtime permissions am:
e710a6fc66
am:
7751660b2a
Change-Id: Ib85eea6690b89cd4e5d8817fbea0845d9cdd0f45
Svet Ganov [Fri, 20 Jan 2017 01:47:14 +0000 (01:47 +0000)]
Use separate switch ops for runtime permissions am:
e710a6fc66
am:
a2bbc26979
Change-Id: I490613902b0c068fd95d3d9d8a4695769ca1e582
Treehugger Robot [Fri, 20 Jan 2017 01:44:19 +0000 (01:44 +0000)]
Merge "Pass more data through the recommendation request."
Svet Ganov [Fri, 20 Jan 2017 01:41:20 +0000 (01:41 +0000)]
Use separate switch ops for runtime permissions
am:
e710a6fc66
Change-Id: Iac7d5e7f80ddbcafea3b1d26860e3cb0b46b6bd5
Svet Ganov [Fri, 20 Jan 2017 01:41:11 +0000 (01:41 +0000)]
Use separate switch ops for runtime permissions
am:
e710a6fc66
Change-Id: I86cd237bffdde972de69b91fa086ac5f5ec349e8
Jiaquan He [Fri, 20 Jan 2017 01:33:30 +0000 (01:33 +0000)]
2D Recents: handle keyboard config changes. am:
44db90262e
am:
a925230cbc
Change-Id: Iae7e4908f1fe7aec921cb2bc03ba433aebb4e929
TreeHugger Robot [Fri, 20 Jan 2017 01:31:07 +0000 (01:31 +0000)]
Merge "Tron metric for force stop app"
Jiaquan He [Fri, 20 Jan 2017 01:25:14 +0000 (01:25 +0000)]
2D Recents: handle keyboard config changes.
am:
44db90262e
Change-Id: I3b2594016b11c01671fd0f9e45ec3f0c673709fd
TreeHugger Robot [Fri, 20 Jan 2017 01:23:32 +0000 (01:23 +0000)]
Merge "Grant access to ephemeral metadata"
Siyamed Sinir [Fri, 20 Jan 2017 01:11:15 +0000 (01:11 +0000)]
Revert "Introduce set/getFontVariationSettings."
This reverts commit
ba3028c1fc9fca2d45acc841557da2c9a83923bf.
Bug:
34378805
Change-Id: I8250c87af5d65fb45789632580be4ae1b8711372
TreeHugger Robot [Fri, 20 Jan 2017 01:07:14 +0000 (01:07 +0000)]
Merge "Rename View.setTooltip/getTooltip to setTooltipText/getTooltipText"
Shahriyar Amini [Fri, 20 Jan 2017 01:01:14 +0000 (01:01 +0000)]
Merge "Support setting icons from Settings or target app."
TreeHugger Robot [Fri, 20 Jan 2017 00:57:31 +0000 (00:57 +0000)]
Merge "Disable moving 3rd party apps to internal if not allowed."
Jeremy Joslin [Fri, 20 Jan 2017 00:55:33 +0000 (00:55 +0000)]
Merge "Have requestRecommendation return a CompletableFuture." am:
f48d0bb2dc am:
887ee2c32a am:
40f432a56b
am:
43be63722b -s ours
Change-Id: I8c33b78a4cadea2cac9bc67627b272979a0f333d
Jiaquan He [Thu, 19 Jan 2017 23:57:39 +0000 (15:57 -0800)]
2D Recents: round task thumbnails properly.
Test: Checked that on local sw600dp devices, task views are rounded with
8dp. Also checked that Recents works properly on phones.
Bug:
32101881
Change-Id: I6f7a09a12c3e3f1f7270bed1ae25b291fadfb8f2
Sundeep Ghuman [Tue, 10 Jan 2017 21:43:03 +0000 (13:43 -0800)]
Insert badged icons into the WifiSettings picker.
This initial pass inserts badged wifi icons when available. A later CL
will move this logic to a new AccessPointPreference subclass to further
isolate the new picker UI changes.
Bug:
33457699
Test: Manual inspection
Change-Id: I849efe3f135bb24efeb60d2484dfb56673168430
Christopher Tate [Mon, 7 Nov 2016 20:21:21 +0000 (12:21 -0800)]
Enable background restrictions
Apps that target O+ are always subject to background restrictions.
Legacy apps' background restriction is subject to the OP_RUN_IN_BACKGROUND
app op.
Apps with these properties are exempted from background restrictions:
- persistent process
- currently on the idle battery whitelist
- global whitelist for things like bluetooth services
Bug
30953212
Change-Id: Icc19b2fbc05f40dcf8c3fc4abf718c373dc8d4f6
Santos Cordon [Fri, 20 Jan 2017 00:21:33 +0000 (00:21 +0000)]
Merge "Add a Virtual 2D Display creator."
Jeremy Joslin [Wed, 18 Jan 2017 23:12:01 +0000 (15:12 -0800)]
Check for REQUEST_NETWORK_SCORES instead of BROADCAST_NETWORK_PRIVILEGED.
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
BUG:
33752149
Change-Id: I559e8f47c5edb491ea7cd0d03010736c81fcee9b
Merged-In: If261cf25c227eeeb4155e43afd9354e6ff8df3b4
Santos Cordon [Wed, 14 Dec 2016 22:52:59 +0000 (14:52 -0800)]
Add a Virtual 2D Display creator.
Listens for changes to VrMode to create/destroy a Virtual Display for 2D
apps.
Test: Logs creation/destruction of vr display while toggling vr mode.
Bug:
34280358
Change-Id: Idb52c4caa9aa0b6863cc6d2eaa55922ab81bf04a
Adam Lesinski [Thu, 19 Jan 2017 22:49:59 +0000 (14:49 -0800)]
ActivityThread: Only update code paths that have been added
When an ApplicationInfo object is updated and we want to update
code paths without restarting the app's process, we need to make
sure that we only update the paths that have changed. This means
diffing between the old paths and the new paths.
Test: watch /proc/<pid>/maps for dex entries before and after
running adb exec-out am update-appinfos all <package>
Change-Id: I6855d860478ade3184bbb578a5483d8548396daa
Sudheer Shanka [Fri, 20 Jan 2017 00:15:10 +0000 (00:15 +0000)]
Merge "Add new api Instrumentation.ActivityMonitor.onMatchIntent."
Jeremy Joslin [Wed, 18 Jan 2017 19:55:17 +0000 (11:55 -0800)]
Pass more data through the recommendation request.
Expanding the API so it can accept the WiFi config of the currently
connected network (if any) and the set of connectable WiFi
configurations. Also renamed currentRecommendedWifiConfig to
defaultWifiConfig so the name was more representative of the
parameter's purpose and added more documentation throughout.
Test: adb shell am instrument -e class android.net.RecommendationRequestTest -w com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Test: adb shell am instrument -w com.android.networkrecommendation.tests/android.support.test.runner.AndroidJUnitRunner
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
Bug:
34387385
Change-Id: Ib8c3cab8f92b5c9da806070d32412f688690f82f
Merged-In: I1089b70303b0396def7e6bf3737fdc67e40c9dcd
Jeff Sharkey [Fri, 20 Jan 2017 00:05:10 +0000 (17:05 -0700)]
Simplify FileUtils.stringToFile().
Convert to byte[] directly instead of using heavier FileWriter.
Test: builds, boots
Bug:
34364961
Change-Id: If0c09a924cd73f2c4965ac9d206f9c060788d27c
Jeremy Joslin [Fri, 20 Jan 2017 00:02:14 +0000 (00:02 +0000)]
Merge "Have requestRecommendation return a CompletableFuture." am:
f48d0bb2dc am:
887ee2c32a
am:
40f432a56b
Change-Id: I6936bd7bd64ae5da665ece4d9f401849feceed3e
Jiaquan He [Mon, 9 Jan 2017 23:50:35 +0000 (15:50 -0800)]
2D Recents: round task thumbnails properly.
Test: Checked that on local sw600dp devices, task views are rounded with
8dp. Also checked that Recents works properly on phones.
Bug:
32101881
Change-Id: I6f7a09a12c3e3f1f7270bed1ae25b291fadfb8f2
Jeremy Joslin [Thu, 19 Jan 2017 23:46:45 +0000 (23:46 +0000)]
Merge "Have requestRecommendation return a CompletableFuture." am:
f48d0bb2dc
am:
887ee2c32a
Change-Id: Ia9252f5375da2a4292293a7d895ec3cbd0c9203e
Shreyas Basarge [Thu, 19 Jan 2017 23:44:15 +0000 (23:44 +0000)]
Merge "Non incremental backup flag for requestBackup"
TreeHugger Robot [Thu, 19 Jan 2017 23:40:02 +0000 (23:40 +0000)]
Merge "Move StringPiece to libandroidfw"
Jeremy Joslin [Thu, 19 Jan 2017 23:37:58 +0000 (23:37 +0000)]
Merge "Replace the RequestRecommendationCaller if the timeout changes." am:
f604580a58 am:
600b816fe6 am:
5ee0e8aa05
am:
282cd7d371 -s ours
Change-Id: I8b94d15193a81df1ff7fd2db2132a6dc14487bec
Jeremy Joslin [Thu, 19 Jan 2017 23:37:46 +0000 (23:37 +0000)]
Merge "Have requestRecommendation return a CompletableFuture."
am:
f48d0bb2dc
Change-Id: I409c6c46144cbbfc147df7c3d3e251bd6b5fbe62
Yao Chen [Fri, 16 Dec 2016 19:03:28 +0000 (11:03 -0800)]
Disable moving 3rd party apps to internal if not allowed.
ag/
1633903 added config_allow3rdPartyAppOnInternal flag to specify
whether 3rd party apps are allowed on internal storage. We need to
respect the flag when moving apps between storages.
Bug:
30980219
Test: Added ApplicationPackageManagertest
Change-Id: I0f8e76467b5071d70f40da28c2087e689c049c06
Jeremy Joslin [Thu, 19 Jan 2017 23:31:56 +0000 (23:31 +0000)]
Merge changes I6ff80178,I03875cf1,I8d210b68 am:
5d942c1352 am:
f5e4912fa2 am:
9a6c1bb795
am:
89dca6e82c -s ours
Change-Id: Ib803888ffca5c4682b5044d2b3f650bf8b60ab4d
Jeremy Joslin [Thu, 19 Jan 2017 23:30:53 +0000 (23:30 +0000)]
New setting for recommendation request timeout. am:
44e2b84b27 am:
820ad03ba8 am:
00ccf31dbd
am:
9971919b64 -s ours
Change-Id: I867f3bfa748e109abb3dde1540944d71212a81f0
Shahriyar Amini [Thu, 19 Jan 2017 02:52:27 +0000 (18:52 -0800)]
Support setting icons from Settings or target app.
Bug:
31002801
Test: make RunSettingsLibRoboTests
Injected settings can have a dynamic icon that is based on drawable
resources in the target app or the Settings app.
Change-Id: I2d5df15b0e21d7fe02206ca8df3fbfc7af75c624
Jiaquan He [Thu, 19 Jan 2017 23:23:56 +0000 (15:23 -0800)]
2D Recents: handle keyboard config changes.
While attaching or detaching a physical keyboard, we should handle the
configuration change in RecentsActivity, so that the activity isn't
relaunched and causes abnormal behaviors.
Test: Checked that while keyboard is attached or detached, Recents
behaves normally.
Bug:
32101881
Change-Id: Ibd185aeb48b31dbde032e235fdcaa17fbcdd9c8a
Jeremy Joslin [Thu, 19 Jan 2017 23:29:53 +0000 (23:29 +0000)]
Implemented the async recommendation request call. am:
bc1308a3be am:
08031e0d0e am:
61a4bd412d
am:
6a4faba753 -s ours
Change-Id: Ie99a1bd3361a88c6ad04734a2043805d99dacf43
Jeremy Joslin [Thu, 19 Jan 2017 23:29:23 +0000 (23:29 +0000)]
Merge "Replace the RequestRecommendationCaller if the timeout changes." am:
f604580a58 am:
600b816fe6
am:
5ee0e8aa05
Change-Id: Icc0d7b46f0777fd998c5fae5b5796bd99cac5ace
Jeremy Joslin [Thu, 19 Jan 2017 23:28:43 +0000 (23:28 +0000)]
Async network recommendation requests. am:
cb925074d3 am:
c9d378e212 am:
428e6cd1db
am:
53526459dd -s ours
Change-Id: I6b5dcbbd4ea0546898de0d5821f97d9d385d891b