OSDN Git Service
Colin Cross [Fri, 20 Jan 2017 04:04:27 +0000 (04:04 +0000)]
Merge "Revert "Update layoutlib following Change Id10ca97f on FontFamily""
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
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
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
Todd Kennedy [Fri, 13 Jan 2017 22:15:36 +0000 (14:15 -0800)]
Grant access to ephemeral metadata
When an ephemeral application explicitly accesses an
installed application, it grants access to its package
metadata. The ephemeral application effectively stays
hidden if it doesn't explicitly connect to any activity,
service or provider [i.e. implicit connections using
an ACTION_VIEW/CATEGORY_BROWSABLE intent will not expose
its metadata].
Bug:
34123112
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.EphemeralTest
Change-Id: I7e1680902599b3ada0d4fba5998af30566017051
Treehugger Robot [Thu, 19 Jan 2017 23:25:50 +0000 (23:25 +0000)]
Merge "Have requestRecommendation return a CompletableFuture."
Jeremy Joslin [Thu, 19 Jan 2017 23:24:16 +0000 (23:24 +0000)]
Merge changes I6ff80178,I03875cf1,I8d210b68 am:
5d942c1352 am:
f5e4912fa2
am:
9a6c1bb795
Change-Id: Ic00047a933a33ca51fcb770694d1f41ba7a09484
Jeremy Joslin [Thu, 19 Jan 2017 23:23:20 +0000 (23:23 +0000)]
New setting for recommendation request timeout. am:
44e2b84b27 am:
820ad03ba8
am:
00ccf31dbd
Change-Id: If14705a0e4c41dbd40ae90b46b37e5ad2b6e5c4b
Jeremy Joslin [Thu, 19 Jan 2017 23:22:20 +0000 (23:22 +0000)]
Implemented the async recommendation request call. am:
bc1308a3be am:
08031e0d0e
am:
61a4bd412d
Change-Id: I53549134c264ff5d282d1e6d5138581c9f5bcb5b
Jeremy Joslin [Thu, 19 Jan 2017 23:21:35 +0000 (23:21 +0000)]
Merge "Replace the RequestRecommendationCaller if the timeout changes." am:
f604580a58
am:
600b816fe6
Change-Id: I0756a2f72df6a9a41bd0c405155318c693d34546
Jeremy Joslin [Thu, 19 Jan 2017 23:21:09 +0000 (23:21 +0000)]
Async network recommendation requests. am:
cb925074d3 am:
c9d378e212
am:
428e6cd1db
Change-Id: Ifb0d27a912c2ca82d6dc18b513e1bc12c0215df1
Jeremy Joslin [Thu, 19 Jan 2017 23:14:33 +0000 (23:14 +0000)]
Merge changes I6ff80178,I03875cf1,I8d210b68 am:
5d942c1352
am:
f5e4912fa2
Change-Id: I97104593be351ea75fa5307b9bcc0904b406c27b
Jeremy Joslin [Thu, 19 Jan 2017 23:13:19 +0000 (23:13 +0000)]
New setting for recommendation request timeout. am:
44e2b84b27
am:
820ad03ba8
Change-Id: Ib4999e09073c74bb4594ce2e744032d3349dce94
Sundeep Ghuman [Thu, 15 Dec 2016 01:53:31 +0000 (17:53 -0800)]
Add rankingScores and badges to WifiPicker.
Adds support to request scores in WifiTracker and then plumb
those scores via AccessPoint.java. AccessPoints will sort on
ranking scores. Show badging in WifiSettings picker.
Bug:
33457699,
33778046
Test: Unit tests
Change-Id: Icc3161cf147b3a9715d6e9f56af574e52ae6c832
Jeremy Joslin [Thu, 19 Jan 2017 23:12:24 +0000 (23:12 +0000)]
Implemented the async recommendation request call. am:
bc1308a3be
am:
08031e0d0e
Change-Id: Idc136d72820fbf7c1d747068d87c505ec7e3cc5c
Jeremy Joslin [Thu, 19 Jan 2017 23:11:28 +0000 (23:11 +0000)]
Merge "Replace the RequestRecommendationCaller if the timeout changes."
am:
f604580a58
Change-Id: I07c14f02c9f20122a7154df31ee745b1a3b43e88
Jeremy Joslin [Thu, 19 Jan 2017 23:11:08 +0000 (23:11 +0000)]
Async network recommendation requests. am:
cb925074d3
am:
c9d378e212
Change-Id: I66ea5246f35e6665c1ffb01e6314293a59f6acca
Jeremy Joslin [Thu, 19 Jan 2017 23:05:10 +0000 (23:05 +0000)]
Merge changes I6ff80178,I03875cf1,I8d210b68
am:
5d942c1352
Change-Id: I6f56b3fa03de6d848ca92693f43ba80ede33a0f2
Jeremy Joslin [Thu, 19 Jan 2017 23:05:02 +0000 (23:05 +0000)]
New setting for recommendation request timeout.
am:
44e2b84b27
Change-Id: I8fd6e0c75d22d0f83db414a389c4d8caaf745469
Jeremy Joslin [Thu, 19 Jan 2017 23:03:56 +0000 (23:03 +0000)]
Implemented the async recommendation request call.
am:
bc1308a3be
Change-Id: I8cd3365a053527c8f4da6c35b1c646281eda74be
Jeremy Joslin [Thu, 19 Jan 2017 23:03:06 +0000 (23:03 +0000)]
Async network recommendation requests.
am:
cb925074d3
Change-Id: I9e3ac1f778d6e9bfe817225423f80540230633e3
Treehugger Robot [Thu, 19 Jan 2017 23:02:52 +0000 (23:02 +0000)]
Merge "Replace the RequestRecommendationCaller if the timeout changes."
Treehugger Robot [Thu, 19 Jan 2017 22:55:16 +0000 (22:55 +0000)]
Merge changes I6ff80178,I03875cf1,I8d210b68
* changes:
New setting for recommendation request timeout.
Implemented the async recommendation request call.
Async network recommendation requests.
Kazuki Kobayashi [Thu, 19 Jan 2017 22:40:10 +0000 (22:40 +0000)]
Merge "Fix clipping for date and time on QS" am:
a5f968806e am:
6cad668a25 am:
8bf5945c3f
am:
02e50306f9
Change-Id: Ifa97ccb8a26ef547871a520a81ebe20820ed5bcc
Kazuki Kobayashi [Thu, 19 Jan 2017 22:35:02 +0000 (22:35 +0000)]
Merge "Fix clipping for date and time on QS" am:
a5f968806e am:
6cad668a25
am:
8bf5945c3f
Change-Id: Ia811eba9511d385e74668a97db11df3b8d0e9315
Kazuki Kobayashi [Thu, 19 Jan 2017 22:30:05 +0000 (22:30 +0000)]
Merge "Fix clipping for date and time on QS" am:
a5f968806e
am:
6cad668a25
Change-Id: I19ae46145d788db06e64b1b1737b7c30ae53f7f0
Kazuki Kobayashi [Thu, 19 Jan 2017 22:25:23 +0000 (22:25 +0000)]
Merge "Fix clipping for date and time on QS"
am:
a5f968806e
Change-Id: I75c89c14ba9fe723ce47bff9061c716aee225735
Treehugger Robot [Thu, 19 Jan 2017 22:17:35 +0000 (22:17 +0000)]
Merge "Fix clipping for date and time on QS"
Shreyas Basarge [Wed, 11 Jan 2017 17:15:58 +0000 (17:15 +0000)]
Non incremental backup flag for requestBackup
This cl adds a new requestBackup API to
BackupManager that takes in an int flag
to indicate whether the caller wants the
entire key value set to be passed to the
transport and not just a diff.
Change-Id: Ia225797a58c4431fe742f2f116b257d006b30cd1
Bug:
33749084
Ref: go/request-backup-api-changes
Test: GTS Test at ag/
1774002
Keyvan Amiri [Thu, 19 Jan 2017 21:56:26 +0000 (21:56 +0000)]
Merge "Fixed the text styling for framework SeekBarPrefenrece"
TreeHugger Robot [Thu, 19 Jan 2017 21:52:32 +0000 (21:52 +0000)]
Merge "Fix up the tests."
TreeHugger Robot [Thu, 19 Jan 2017 21:51:55 +0000 (21:51 +0000)]
Merge "Add Wi-Fi friction icons to AccessPointPreference."
Rebecca Silberstein [Thu, 19 Jan 2017 21:41:02 +0000 (21:41 +0000)]
Merge "SystemServer: cherry-pick p2p service start" am:
4c937464eb am:
392f7d789c am:
d3ff73eba4
am:
da4ea530ee -s ours
Change-Id: I4ecfb90df65dd582f2432d7c5705a4e8a555bd40
Rebecca Silberstein [Thu, 19 Jan 2017 21:36:03 +0000 (21:36 +0000)]
Merge "SystemServer: cherry-pick p2p service start" am:
4c937464eb am:
392f7d789c
am:
d3ff73eba4
Change-Id: I9427fd6c760c58c6caf65800fbbfbaf2c35e3335
Jeremy Joslin [Wed, 18 Jan 2017 22:21:56 +0000 (14:21 -0800)]
Have requestRecommendation return a CompletableFuture.
Reworked the new requestRecommendation call to return a
CompletableFuture instead of using a custom callback.
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
Bug:
33784158
Change-Id: Ib12f0674d45ad6e2e21449bc3665467b3c20f49d
Merged-In: If24a94eb6289cb1952052b2cc3bc7856ce2192a5
Rebecca Silberstein [Thu, 19 Jan 2017 21:31:06 +0000 (21:31 +0000)]
Merge "SystemServer: cherry-pick p2p service start" am:
4c937464eb
am:
392f7d789c
Change-Id: I737b1307f4c42b8c88974418e3b6dab6b117509f
Rebecca Silberstein [Thu, 19 Jan 2017 21:26:00 +0000 (21:26 +0000)]
Merge "SystemServer: cherry-pick p2p service start"
am:
4c937464eb
Change-Id: I6f851c4e157150cab541d9a991cc1b7fe736eb7c
Jeremy Joslin [Tue, 17 Jan 2017 23:48:13 +0000 (15:48 -0800)]
Replace the RequestRecommendationCaller if the timeout changes.
The timeout associated with a TimedRemoteCaller can't be changed
after creation so we have to create a new instance anytime the
timeout changes (which shouldn't be too often). The instance is
stored and retrieved from an AtomicReference to avoid concurrency
issues.
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
Bug:
34060959
Change-Id: I52f5d617feb9b3536ff3474b5d032113e3caea5c
Merged-In: I1662ac27f7442a16d2ffd7257469f1983b7f0e5c
Rebecca Silberstein [Thu, 19 Jan 2017 21:21:23 +0000 (21:21 +0000)]
Merge "SystemServer: cherry-pick p2p service start"
Jeremy Joslin [Wed, 4 Jan 2017 01:31:23 +0000 (17:31 -0800)]
New setting for recommendation request timeout.
Added a new global setting, NETWORK_RECOMMENDATION_REQUEST_TIMEOUT_MS,
to control the maximum amount of time a recommendation request can
take.
Updated the NetworkScoreService to monitor the value and to update
its cached copy on observed changes.
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
Bug:
34060959
Change-Id: I6ff80178440794e4a5da39ee7b5164621316e7bd
Merged-In: I7650ee024e53dbc856cf20d7520a6eb252c73bdf
Jeremy Joslin [Thu, 29 Dec 2016 22:49:38 +0000 (14:49 -0800)]
Implemented the async recommendation request call.
Implemented requestAsyncRecommendation() by introducing a Handler
implementation to handle requests that time out and a OneTimeCallback
class to prevent multiple callbacks from being sent back for the same
request.
Change-Id: I03875cf1d789cbc92aa4c6b500c6b519bff8e165
Merged-In: Ida2ff860d78d86185ab9ab22232b5b6dc1e4b310
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
BUG:
33784158