OSDN Git Service
Fyodor Kupolov [Fri, 20 Jan 2017 18:28:15 +0000 (18:28 +0000)]
Merge "[DO NOT MERGE] Do not report boot timings on first boot or runtime restart" into nyc-mr2-dev am:
1dcfc423cd
am:
750d641ac1 -s ours
Change-Id: I4264b0c19ad42204e81342eb12aed5dbd03fdefc
Fyodor Kupolov [Fri, 20 Jan 2017 18:27:15 +0000 (18:27 +0000)]
[DO NOT MERGE] Do not report boot timings on first boot or runtime restart am:
83a218c416
am:
155e452f25 -s ours
Change-Id: Ibc7e072662aca3a346326ee232305f2231785ce4
Fyodor Kupolov [Fri, 20 Jan 2017 18:23:20 +0000 (18:23 +0000)]
Merge "[DO NOT MERGE] Do not report boot timings on first boot or runtime restart" into nyc-mr2-dev
am:
1dcfc423cd
Change-Id: I00117f3c0ac6d9bae5650dceea182790ed43bb1c
Fyodor Kupolov [Fri, 20 Jan 2017 18:23:16 +0000 (18:23 +0000)]
[DO NOT MERGE] Do not report boot timings on first boot or runtime restart
am:
83a218c416
Change-Id: Ib503ffb8d0d718aa6af4b420cc71e32a033e658b
Fyodor Kupolov [Fri, 20 Jan 2017 18:17:58 +0000 (18:17 +0000)]
Merge "[DO NOT MERGE] Do not report boot timings on first boot or runtime restart" into nyc-mr2-dev
Bartosz Fabianowski [Fri, 20 Jan 2017 18:15:56 +0000 (18:15 +0000)]
Merge "Allow system to retrieve persistent preferred activities"
Crystal Qin [Fri, 20 Jan 2017 18:13:41 +0000 (18:13 +0000)]
Merge "Add new key purpose Wrap Key to KeyProperties.java and KeymasterDefs.java."
TreeHugger Robot [Fri, 20 Jan 2017 18:08:48 +0000 (18:08 +0000)]
Merge "Visual refresh for QS"
TreeHugger Robot [Fri, 20 Jan 2017 18:05:58 +0000 (18:05 +0000)]
Merge "Don't set a task description for work lock overlay"
Fyodor Kupolov [Thu, 19 Jan 2017 20:11:32 +0000 (12:11 -0800)]
[DO NOT MERGE] Do not report boot timings on first boot or runtime restart
During first boot after OTA, additional dexopting has to be done
during PM initialization. Timings for OTA are reported separately,
so we should ignore first boot to avoid skewing the metrics.
The following metrics were updated:
- framework_locked_boot_completed
- framework_boot_completed
Cherry-picked from commit
1d87e40d4214a7f6d20a58d6f27cca174f0d974e
Test: manual
Bug:
32807863
Change-Id: I9d545cf38118f45f3f13597df2949d0ae4abd26a
Jeff Sharkey [Fri, 20 Jan 2017 17:31:55 +0000 (17:31 +0000)]
Merge "StrictMode to detect untagged network traffic."
TreeHugger Robot [Fri, 20 Jan 2017 17:29:58 +0000 (17:29 +0000)]
Merge "Add additional fields to RecommendationRequest."
Philipp Weiß [Fri, 20 Jan 2017 17:29:49 +0000 (17:29 +0000)]
Merge "Adjust device-monitoring dialog strings"
TreeHugger Robot [Fri, 20 Jan 2017 17:20:03 +0000 (17:20 +0000)]
Merge "Change default settings theme to light color."
Michal Karpinski [Fri, 20 Jan 2017 17:12:18 +0000 (17:12 +0000)]
Merge "Unhide enabling backup service in DO APIs"
Makoto Onuki [Fri, 20 Jan 2017 16:49:12 +0000 (16:49 +0000)]
Merge "requestPinShortcut for pinned shortcut still notifies launcher"
Jason Monk [Wed, 18 Jan 2017 14:17:13 +0000 (09:17 -0500)]
Visual refresh for QS
Adds circles and things
Test: visual
Change-Id: I7d974fcfe6257357abfd1a7d0ee521f0e6cee588
phweiss [Fri, 20 Jan 2017 15:33:12 +0000 (16:33 +0100)]
Adjust device-monitoring dialog strings
Add Char-limits and do minor style changes.
BUG:
33655277
BUG:
31207965
BUG:
29748723
Test: only string changes
Change-Id: I2b3187ad4a466b7c08f6ee865cb20e0cca492ff6
TreeHugger Robot [Fri, 20 Jan 2017 14:31:36 +0000 (14:31 +0000)]
Merge "Refactor GLFunctorDrawable to use new SkCanvas API for clip region"
Julia Reynolds [Fri, 20 Jan 2017 14:30:15 +0000 (14:30 +0000)]
Merge "Save deleted channels."
TreeHugger Robot [Fri, 20 Jan 2017 13:32:01 +0000 (13:32 +0000)]
Merge "Prepare for removal of legacy-test from default targets"
TreeHugger Robot [Fri, 20 Jan 2017 12:08:14 +0000 (12:08 +0000)]
Merge "Adding app op and intent action for external sources"
Jorim Jaggi [Fri, 20 Jan 2017 11:46:09 +0000 (11:46 +0000)]
Merge "Persist task snapshots to disk"
Suprabh Shukla [Fri, 16 Dec 2016 22:47:25 +0000 (14:47 -0800)]
Adding app op and intent action for external sources
Added an app op to control which package and uid can install apps on the
device and an intent action to launch the settings fragment.
Test: Will include in follow up CL, tracked in b/
33792674
Bug:
31002700
Change-Id: Ic073495759d9867f8001a6c712e402398c53dfc9
Erik Kline [Fri, 20 Jan 2017 10:25:22 +0000 (10:25 +0000)]
Merge "Refactor to SimChangeListener class" am:
a12217012e am:
74247b4ee8 am:
6dacd5ecf2
am:
dc81bd74ae
Change-Id: Ifa36726ce67fd81ca508d5530b815f5e82557a89
Erik Kline [Fri, 20 Jan 2017 10:21:20 +0000 (10:21 +0000)]
Merge "Refactor to SimChangeListener class" am:
a12217012e am:
74247b4ee8
am:
6dacd5ecf2
Change-Id: Ia80e64c9f1188953aa4d9687bc7b0b0659de968a
Erik Kline [Fri, 20 Jan 2017 10:18:52 +0000 (10:18 +0000)]
Merge "Address comments from previous change (320592)" am:
e7cb6c3761 am:
b6f606b59f am:
454a408717
am:
430b1ff0f0
Change-Id: I488ec47172c48f2965b33fc484a26f395aa48a29
Erik Kline [Fri, 20 Jan 2017 10:16:56 +0000 (10:16 +0000)]
Merge "Refactor to SimChangeListener class" am:
a12217012e
am:
74247b4ee8
Change-Id: I59dc854bd74eb8ba6addae90a4a87453868b5368
Erik Kline [Fri, 20 Jan 2017 10:14:50 +0000 (10:14 +0000)]
Merge "Address comments from previous change (320592)" am:
e7cb6c3761 am:
b6f606b59f
am:
454a408717
Change-Id: I374c8c63e4fb3310c3c50cc531a65005991c2fe2
Erik Kline [Fri, 20 Jan 2017 10:13:08 +0000 (10:13 +0000)]
Merge "Refactor to SimChangeListener class"
am:
a12217012e
Change-Id: I863f0b23251a0ebd18a76cf08e1ff0f2cee9cda3
Erik Kline [Fri, 20 Jan 2017 10:10:52 +0000 (10:10 +0000)]
Merge "Address comments from previous change (320592)" am:
e7cb6c3761
am:
b6f606b59f
Change-Id: Icc5aa3d6cafd9829e65a0e82523727a9aba4ade5
Treehugger Robot [Fri, 20 Jan 2017 10:05:50 +0000 (10:05 +0000)]
Merge "Refactor to SimChangeListener class"
Erik Kline [Fri, 20 Jan 2017 10:04:51 +0000 (10:04 +0000)]
Merge "Address comments from previous change (320592)"
am:
e7cb6c3761
Change-Id: I3266a02a4a2fd76c4bb2f1a744103add63307e26
Treehugger Robot [Fri, 20 Jan 2017 09:57:26 +0000 (09:57 +0000)]
Merge "Address comments from previous change (320592)"
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
Paul Duffin [Thu, 19 Jan 2017 16:47:45 +0000 (16:47 +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.
Bug:
30188076
Test: make checkbuild
Change-Id: If507b641624a2933e722f61e815890fcdf442265
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
Erik Kline [Tue, 17 Jan 2017 08:31:26 +0000 (17:31 +0900)]
Refactor to SimChangeListener class
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest frameswork-net passes
- tested wifi-to-mobile tethering, including SIM remove/insert
Bug:
32163131
Change-Id: I6aac9a8f34cfd0079a4433471ec08b9b1ec0d754
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:31:29 +0000 (16:31 +0900)]
Address comments from previous change (320592)
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest frameworks-net passes
- vanilla wifi-to-mobile tethering works
Bug:
32163131
Change-Id: I8788cb0d93606a2893c3dbc4f22e72f450f319b8
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."
Crystal Qin [Tue, 3 Jan 2017 23:45:23 +0000 (15:45 -0800)]
Add new key purpose Wrap Key to KeyProperties.java and
KeymasterDefs.java.
Test: There will be a CTS test CL submitted together.
Change-Id: Ic60c3efc451cd7cbb04689b3d7bf9d607fae6c1f
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
Jeff Sharkey [Thu, 19 Jan 2017 18:55:54 +0000 (11:55 -0700)]
StrictMode to detect untagged network traffic.
Network usage is tracked by the kernel at the UID level, which is
granular enough for normal apps, but large components (such as the
system server) are impossible to debug without adding additional
socket tagging to help identify subsystems within a UID.
To help ensure that system components tag all their network traffic,
this change offers a new StrictMode option to detect and report
untagged sockets.
Test: builds, boots, all common traffic tagged
Bug:
30943431,
30414041
Change-Id: I825c7941076054732264690247de2863342638e2
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."
Amin Shaikh [Fri, 20 Jan 2017 01:24:41 +0000 (17:24 -0800)]
Add additional fields to RecommendationRequest.
- Add networkId and timestamp for the last user selected network
Bug:
34467596
Test: runtest --path core/tests/coretests/src/android/net/RecommendationRequestTest.java
Change-Id: Ic81c1beede1a643cd428b6e5c57ed430a6b1ccc0
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