OSDN Git Service
Jeff Sharkey [Fri, 20 Jan 2017 23:12:19 +0000 (23:12 +0000)]
Merge "Add Binder support for Parcelable exceptions." am:
a2ef6b5741 am:
c3fbf32011 am:
4a0a4664b9
am:
7bb9ccc1e5
Change-Id: I9346a576d57c9f7093b875c4a43134f2ef095018
Sunny Goyal [Fri, 20 Jan 2017 23:07:18 +0000 (23:07 +0000)]
Merge "Fixing dimensions for AppWidgetProviderInfo not getting updated properly for PinItemRequest"
Dianne Hackborn [Fri, 20 Jan 2017 23:05:37 +0000 (23:05 +0000)]
Merge "Improve behavior of bg check."
Dianne Hackborn [Thu, 12 Jan 2017 23:10:57 +0000 (15:10 -0800)]
Improve behavior of bg check.
There is a new APP_START_MODE_DELAYED_RIGID which means that
things discovering something is not allowed to start should
report a clear error back to the caller. This is how apps
that opt in to bg check should behave, and will now
be used if the app op mode is set to ERRORED.
This (for now?) removes the code that allows services to
be started if the request is coming from a foreground process.
That behavior isn't in the current bg check spec, and
probably not what we want as the standard platform model (since
it makes knowing when a service can start even harder to
determine). It was originally done for the experimental
bg check work in N to see how much we could avoid
breaking existing apps, so not relevant when apps need to
explicitly opt in.
Also report temporary whitelist changes to activity manager for
it to lift background restrictions temporarily for apps. Being
on the whitelist is now part of UidRecord, preventing a uid from
going idle.
Test: Initial CTS test added.
Change-Id: I36fd906fa69de8b7ff360605ae17c088f182e172
Jeff Sharkey [Fri, 20 Jan 2017 23:03:40 +0000 (23:03 +0000)]
Merge "Add Binder support for Parcelable exceptions." am:
a2ef6b5741 am:
c3fbf32011
am:
4a0a4664b9
Change-Id: I9b5667ca6e5497a4eedaaf88979a1a3d0e22c174
Jiuyu Sun [Fri, 20 Jan 2017 22:58:21 +0000 (22:58 +0000)]
Merge "Change the default behavior when MCC/MNC changes."
Jeff Sharkey [Fri, 20 Jan 2017 22:56:45 +0000 (22:56 +0000)]
Merge "Add Binder support for Parcelable exceptions." am:
a2ef6b5741
am:
c3fbf32011
Change-Id: Ibd977a017ce48f0791520af3500969aec0c132e5
Jeff Sharkey [Fri, 20 Jan 2017 22:50:49 +0000 (22:50 +0000)]
Merge "Add Binder support for Parcelable exceptions."
am:
a2ef6b5741
Change-Id: Ide766c0220e86b7661af83551354b3a498297ed8
Jeff Sharkey [Fri, 20 Jan 2017 22:45:03 +0000 (22:45 +0000)]
Merge "Add Binder support for Parcelable exceptions."
Chad Brubaker [Fri, 20 Jan 2017 22:06:55 +0000 (22:06 +0000)]
Merge "Add ephemeral whitelist for SettingsProvider"
Holly Jiuyu Sun [Thu, 12 Jan 2017 01:34:03 +0000 (17:34 -0800)]
Change the default behavior when MCC/MNC changes.
By default, we don't restart the activity when MCC/MNC changes
even when they are not set in configChanges. If they want to
restart, set mcc or mnc in the new attribute restartOnConfigChanges.
Bug:
34258948
Test: Test in unit test(testGetActivityConfigChanges() in
PackageParserTest.java) and on real device with
changing the SIM card.
Change-Id: Icd6899597c9b8f2e5706e74373a0280d19150092
TreeHugger Robot [Fri, 20 Jan 2017 21:44:56 +0000 (21:44 +0000)]
Merge "Expose WifiConfiguration#ephemeral is a SystemApi"
TreeHugger Robot [Fri, 20 Jan 2017 21:18:27 +0000 (21:18 +0000)]
Merge "Make TelephonyManager#get/setAllowedCarriers system api"
TreeHugger Robot [Fri, 20 Jan 2017 20:33:21 +0000 (20:33 +0000)]
Merge "Change KernelUidCpuTimeReader Slog.wtf to Slog.e"
TreeHugger Robot [Fri, 20 Jan 2017 19:45:30 +0000 (19:45 +0000)]
Merge "Destroy DisplayLists on time"
Sundeep Ghuman [Fri, 20 Jan 2017 19:42:00 +0000 (19:42 +0000)]
Merge "Allow REQUEST_NETWORK_SCORES to be used by SetupWizard."
Amin Shaikh [Fri, 20 Jan 2017 19:05:13 +0000 (11:05 -0800)]
Expose WifiConfiguration#ephemeral is a SystemApi
Bug:
34503179
Test: make
Change-Id: I3a89b89da67152bb522ae4dbfd1cfe1b4830d8ae
Philipp Weiß [Fri, 20 Jan 2017 19:25:06 +0000 (19:25 +0000)]
Merge "DO NOT MERGE Finalize device-monitoring dialog strings" into nyc-mr2-dev am:
c281fd12af
am:
fc6771a9a6 -s ours
Change-Id: I69d09880b997dd615faaf18089cfcc8268d68b2a
phweiss [Fri, 20 Jan 2017 19:23:58 +0000 (19:23 +0000)]
DO NOT MERGE Finalize device-monitoring dialog strings am:
232b0d4088
am:
61d7be70e7 -s ours
Change-Id: I28d6bbda7a09cfca1c82cc94eae1f4b496ca8aa5
Philipp Weiß [Fri, 20 Jan 2017 19:18:38 +0000 (19:18 +0000)]
Merge "DO NOT MERGE Finalize device-monitoring dialog strings" into nyc-mr2-dev
am:
c281fd12af
Change-Id: Idb993945120ca591dfa9471bfc4a36706fe70e5f
phweiss [Fri, 20 Jan 2017 19:18:29 +0000 (19:18 +0000)]
DO NOT MERGE Finalize device-monitoring dialog strings
am:
232b0d4088
Change-Id: I37008b2f10b746ed7aa0c455d832efd7b2966c77
Philipp Weiß [Fri, 20 Jan 2017 19:12:44 +0000 (19:12 +0000)]
Merge "DO NOT MERGE Finalize device-monitoring dialog strings" into nyc-mr2-dev
Chad Brubaker [Thu, 5 Jan 2017 23:51:41 +0000 (15:51 -0800)]
Add ephemeral whitelist for SettingsProvider
Currently the list is small, only whats required to launch a basic
ephemeral app. It will expand in followup CLs.
Note that the goal of this is not to completely shut down all ways that
an ephemeral app could learn the value (or part of) of a setting not in
the set. The goal is to limit the raw access to settings to a small set that
includes settings that ephemeral apps should have access to directly
System APIs that are exposed to ephemeral apps may allow for
ephemeral apps to learn the value of settings not in the directly
exposed set and that is OK and _not_ a security issue.
This contains a hack to support code in system system server that in
the process of a binder transaction reads a setting using a
ContentReceiver with a system package name. This was previously not an
issue but causes an exception to be thrown from getCallingPackage which
reading a setting now calls.
Bug:
33349998
Test: Boots, functions as normal for regular apps.
Test: cts-tradefed run cts -m CtsProviderTestCases -t
android.provider.cts.SettingsTest
Change-Id: Icc839b0d98c725d23cdd395e8cb76a7b293f8767
Ta-wei Yen [Fri, 20 Jan 2017 18:45:28 +0000 (18:45 +0000)]
Merge "Add voicemail backup/restore columns" into nyc-mr2-dev am:
c1a1348b99
am:
f1a0d799c4
Change-Id: I0219d934fbae05e06d9187ad9e93529885019fe2
Ta-wei Yen [Fri, 20 Jan 2017 18:44:39 +0000 (18:44 +0000)]
Add voicemail backup/restore columns am:
f48d5ce630
am:
1f296f7793
Change-Id: I38e6e33438500a0815bb1b87dc21617213f42637
Ta-wei Yen [Fri, 20 Jan 2017 18:38:31 +0000 (18:38 +0000)]
Merge "Add voicemail backup/restore columns" into nyc-mr2-dev
am:
c1a1348b99
Change-Id: Ifd5116c2d8e44d6f16d6abd76d41fe5aebb28a24
Ta-wei Yen [Fri, 20 Jan 2017 18:38:23 +0000 (18:38 +0000)]
Add voicemail backup/restore columns
am:
f48d5ce630
Change-Id: I2dd76b4107b9e7c75595fa3c49dcda74cebd2a09
Sundeep Ghuman [Fri, 20 Jan 2017 18:32:18 +0000 (10:32 -0800)]
Allow REQUEST_NETWORK_SCORES to be used by SetupWizard.
Bug:
34479801
Test: Built system and setup wizard and tested.
Change-Id: I4fcc3d1f56f78cfb0deaf13d0eccae97dac4ffa2
phweiss [Fri, 20 Jan 2017 17:41:57 +0000 (18:41 +0100)]
DO NOT MERGE Finalize device-monitoring dialog strings
Add Char-limits, do minor style changes and remove STOPSHIP comment.
Related change on master:
ag/
1800040
0d08ca7d7fa12217f4a6562764b4ea65f3fa31f2
BUG:
33655277
BUG:
31207965
BUG:
29748723
Test: only string changes
Change-Id: I37d1b509c6344d7f7d144fc0d8950f45faeaaef4
Ta-wei Yen [Fri, 20 Jan 2017 18:31:41 +0000 (18:31 +0000)]
Merge "Add voicemail backup/restore columns" into nyc-mr2-dev
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"
John Reck [Fri, 20 Jan 2017 03:54:18 +0000 (19:54 -0800)]
Destroy DisplayLists on time
Change-Id: I32a97d1234545075e9423c352c772e09ca954741
Fixes:
34072929
Test: Manual, see b/
34072929#comment36
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
Adam Lesinski [Wed, 27 Jul 2016 23:11:27 +0000 (16:11 -0700)]
Change KernelUidCpuTimeReader Slog.wtf to Slog.e
There is a known issue in the kernel uidcputime module that triggers
the WTF, which has a cost to the system. Convert to a regular log
instead.
Bug:
28950306
Change-Id: I7cbb3138f644075f0d9d65ce8b52bd835eb270fd
(cherry picked from commit
82a4d6f93bd804735ca722887bad05290a65cd37)
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