OSDN Git Service
TreeHugger Robot [Mon, 27 Nov 2017 10:17:25 +0000 (10:17 +0000)]
Merge "Add @Presubmit back to SettingsBackupTest"
TreeHugger Robot [Mon, 27 Nov 2017 04:12:38 +0000 (04:12 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Sun, 26 Nov 2017 22:39:16 +0000 (22:39 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Sun, 26 Nov 2017 22:37:17 +0000 (22:37 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Sun, 26 Nov 2017 22:36:13 +0000 (22:36 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Sun, 26 Nov 2017 19:45:16 +0000 (11:45 -0800)]
Import translations. DO NOT MERGE
Change-Id: I7ca2a7f0a9f8280d1c48a0c1ecb9c68553b8b7d9
Auto-generated-cl: translation import
Bill Yi [Sun, 26 Nov 2017 17:33:19 +0000 (09:33 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0bbc89008d10bee8530c7e2ad2b81df9fa87846e
Auto-generated-cl: translation import
Bill Yi [Sun, 26 Nov 2017 17:05:00 +0000 (09:05 -0800)]
Import translations. DO NOT MERGE
Change-Id: I1c1b8d2908d542f4b1a26bc7e61e07ce634d53cf
Auto-generated-cl: translation import
Bill Yi [Sun, 26 Nov 2017 17:02:03 +0000 (09:02 -0800)]
Import translations. DO NOT MERGE
Change-Id: Icc0a96079b89c483a584c5ead08850a3328caedb
Auto-generated-cl: translation import
Bill Yi [Sun, 26 Nov 2017 16:45:29 +0000 (08:45 -0800)]
Import translations. DO NOT MERGE
Change-Id: I056b783ab3288a98a4615a0d4634f3a7e0341cbe
Auto-generated-cl: translation import
Yao Chen [Sat, 25 Nov 2017 23:33:09 +0000 (15:33 -0800)]
Fix statsd crash caused by non-existing data folder.
Test: manual
Change-Id: Ie470279929ff6ce40c4828a3cdda6d78542a3caa
Christine Franks [Fri, 24 Nov 2017 23:21:57 +0000 (23:21 +0000)]
Merge "Add owner for ColorDisplayService"
Neil Fuller [Fri, 24 Nov 2017 19:46:00 +0000 (19:46 +0000)]
Merge "Fix checkapi for OpenJDK 9 builds"
Neil Fuller [Fri, 24 Nov 2017 15:58:38 +0000 (15:58 +0000)]
Fix checkapi for OpenJDK 9 builds
This change explitly hides com.android.okhttp
from doclava. The public.txt generation was
previously relying on a package.html in
com.android to hide all subpackages, which
doesn't work with javadoc 9.
Test: make droid (with both OpenJDK 8 and OpenJDK 9)
Bug:
69709687
Change-Id: If61b69f913be044adb4cd34867459bde6330ea2c
Bryan Mawhinney [Fri, 24 Nov 2017 16:12:08 +0000 (16:12 +0000)]
Add @Presubmit back to SettingsBackupTest
Test: runtest --path frameworks/base/core/tests/coretests/src/android/provider/SettingsBackupTest.java
Change-Id: I5b43bf58bca39cc7393f37d7c3ce6a26aff6d858
Bryan Mawhinney [Fri, 24 Nov 2017 15:49:09 +0000 (15:49 +0000)]
Merge "Make SettingsBackupTest pass again"
Andrei Stingaceanu [Fri, 24 Nov 2017 14:27:21 +0000 (14:27 +0000)]
Merge "[Magnifier - 10] Make it public"
Bryan Mawhinney [Fri, 24 Nov 2017 13:44:48 +0000 (13:44 +0000)]
Make SettingsBackupTest pass again
Test: runtest --path frameworks/base/core/tests/coretests/src/android/provider/SettingsBackupTest.java
Change-Id: I2c783bae9146adc9c4538bc34795da4e6e9573ee
TreeHugger Robot [Fri, 24 Nov 2017 13:31:05 +0000 (13:31 +0000)]
Merge "Binding on-demand #2: PerformFullTransportBackupTask usage"
Andrei Stingaceanu [Tue, 21 Nov 2017 14:53:38 +0000 (14:53 +0000)]
[Magnifier - 10] Make it public
* moves the Magnifier from com.android.internal.widget to
android.widget
* removes useless public getters; useless for now because we have
no magnifier configuration but the hardcoded one
Bug:
67839742
Bug:
63531115
Test: bit CtsWidgetTestCases:android.widget.cts.MagnifierTest
Change-Id: Ie6f474c4c781038650007a15937d61c650ee5fdd
Bernardo Rufino [Wed, 15 Nov 2017 17:21:42 +0000 (17:21 +0000)]
Binding on-demand #2: PerformFullTransportBackupTask usage
Migrate the full-backup task to use binding on-demand
Ref: http://go/br-binding-on-demand
Bug:
17140907
Test: make RunFrameworksServicesRoboTests
Test: runtest -p com.android.server.backup frameworks-services
Test: adb shell bmgr backupnow <packages>
With transports manually unbound and also canceled the operation a
few times. Then inspected TransportClient logcat
Test: gts-tradefed run commandAndExit gts-dev -m GtsBackupTestCases
Test: gts-tradefed run commandAndExit gts-dev -m GtsBackupHostTestCases
Test: cts-tradefed run commandAndExit cts-dev -m CtsBackupTestCases
Test: Manually unbound before GTS/CTS above.
Change-Id: I15abe970db0b9858e0e2e4eb666358db3a9d50ad
TreeHugger Robot [Thu, 23 Nov 2017 17:50:20 +0000 (17:50 +0000)]
Merge "WM: Move WindowManagerPolicy, DisplayFrames and WindowManagerInternal into services"
TreeHugger Robot [Thu, 23 Nov 2017 16:59:22 +0000 (16:59 +0000)]
Merge "Disable window tracing on user builds. - Make window trace shell commands fail gracefully in user builds. - Dont start the trace thread on user builds."
Adrian Roos [Mon, 20 Nov 2017 16:55:31 +0000 (17:55 +0100)]
WM: Move WindowManagerPolicy, DisplayFrames and WindowManagerInternal into services
Splits WindowManagerPolicy into a framework and a services part, preventing concepts that are
internal to the window manager from leaking out into the framework.
Test: make droid
Change-Id: I7b6a54f55f76f6fbb5f27090981b8f1d4d8be88b
Rubin Xu [Thu, 23 Nov 2017 15:40:52 +0000 (15:40 +0000)]
Merge "Let keyguard UI procced as soon as user password is validated"
Rubin Xu [Wed, 15 Nov 2017 11:55:35 +0000 (11:55 +0000)]
Let keyguard UI procced as soon as user password is validated
Notify the callback as soon as first stage password verification passes,
leaving the decryption of synthetic password in the background. This should
reduce the perceived latency of device unlock UI wise.
Bug:
68380673
Test: Measured time manually, unlock on marlin now takes 70ms, and taimen
takes 90ms.
Change-Id: Ibb787251f8fea776c6745d45ee2d8ab60515a5f4
Alan Stokes [Thu, 23 Nov 2017 12:09:52 +0000 (12:09 +0000)]
Merge "Add unit tests for DexLogger."
Peter Visontay [Thu, 23 Nov 2017 11:06:46 +0000 (11:06 +0000)]
Merge "Fix outdated docs of permission protection levels."
Alan Stokes [Mon, 20 Nov 2017 15:37:58 +0000 (15:37 +0000)]
Add unit tests for DexLogger.
Bug:
63927552
Test: runtest frameworks-services -c com.android.server.pm.dex.DexLoggerTests --install=".*FrameworksServicesTests.apk"
Change-Id: I5f775b5309060c78cb6aaf0c28c4aa777ff11e8e
TreeHugger Robot [Thu, 23 Nov 2017 04:52:35 +0000 (04:52 +0000)]
Merge "Captures metrics on disk when devices reboot and shutdown. Specifically,"
TreeHugger Robot [Thu, 23 Nov 2017 04:04:55 +0000 (04:04 +0000)]
Merge "Fixes out of range bug in SimpleConditionTracker."
TreeHugger Robot [Thu, 23 Nov 2017 02:42:07 +0000 (02:42 +0000)]
Merge "Changed FillResponse so it can have only a client state."
yro [Thu, 16 Nov 2017 06:50:23 +0000 (22:50 -0800)]
Captures metrics on disk when devices reboot and shutdown. Specifically,
1. Create intent receiver in StatsCompanionService to listen to shutdown
events.
2. Create StatsWriter class to handle disk writes and deleting files.
3. Update StatsLogProcessor, ConfigManager, and StatsService to handle
files on disk using StatsWriter.
4. Add a wrapper for ConfigMetricsReport.
Still TODO is to be able to add a guardrail to prevent accumulating
excessive amount files on disk, which will be followed up by another
change.
Test: statsd, statsd_test
Change-Id: Ia0b3af315af545daa8b0078b3700c600aa7c285f
TreeHugger Robot [Thu, 23 Nov 2017 02:35:04 +0000 (02:35 +0000)]
Merge "Correct A2DP status when audio routes changed"
Sungsoo Lim [Tue, 21 Nov 2017 04:12:24 +0000 (13:12 +0900)]
Correct A2DP status when audio routes changed
When a Bluetooth device is connected and then a media is started,
sometimes MediaRouterService gets media playback status change first
and get the Bluetooth device status change later. This causes the
media plays through the phone speaker instead of BT devices.
This CL prevent that situation by not changing A2DP status when
BT device is not connected, and by calling restoreBluetoothA2dp
at the end of dispatchAudioRoutesChanged.
Bug:
69499034
Test: manually tested the bug, passed Media CTS
Change-Id: I7547a39e5ce58f58c249a25efa55446a3b023416
Jeff Sharkey [Thu, 23 Nov 2017 02:00:06 +0000 (02:00 +0000)]
Merge changes from topic "predicatez"
* changes:
Emit all APIs using Predicates.
Massage APIs for upcoming doclava change.
David Chen [Thu, 23 Nov 2017 00:47:59 +0000 (16:47 -0800)]
Fixes out of range bug in SimpleConditionTracker.
One of the unit tests was flaky because mStopAllLogMatcherIndex may
be greater than the size of eventMatcherValues, so we access an
element that is greater than the vector size.
Test: Check unit-tests still work. Flake is a bit hard to find.
Change-Id: Ib177cd0ae00bbe7aa6982c6ec31d9094253a9c10
TreeHugger Robot [Thu, 23 Nov 2017 00:26:48 +0000 (00:26 +0000)]
Merge "Set the metric name for alerts in fake config and add a test to make sure the fake config is valid.."
TreeHugger Robot [Thu, 23 Nov 2017 00:12:40 +0000 (00:12 +0000)]
Merge "Make member function as const whenever possible."
Amith Yamasani [Thu, 23 Nov 2017 00:00:23 +0000 (00:00 +0000)]
Merge "The job scheduler now backs off jobs based on standby bucketing"
Yifan Hong [Wed, 22 Nov 2017 23:28:56 +0000 (23:28 +0000)]
Merge "android.os.HidlSupport: add getPidIfSharable() for HALs" am:
e72b6f0d31 am:
8cf7761747
am:
523665a293
Change-Id: I901c938c2c56ab1c1649c218b37d4ab131cd3c7b
Yifan Hong [Wed, 22 Nov 2017 23:18:46 +0000 (23:18 +0000)]
Merge "android.os.HidlSupport: add getPidIfSharable() for HALs" am:
e72b6f0d31
am:
8cf7761747
Change-Id: I842bf4791467620e597018ce0e9441cfb0732026
Felipe Leme [Wed, 22 Nov 2017 23:14:56 +0000 (23:14 +0000)]
Merge "Minor improvements on autofill javadocs and logging."
TreeHugger Robot [Wed, 22 Nov 2017 23:08:06 +0000 (23:08 +0000)]
Merge "Fix ConfigManager unit test."
Yifan Hong [Wed, 22 Nov 2017 23:06:33 +0000 (23:06 +0000)]
Merge "android.os.HidlSupport: add getPidIfSharable() for HALs"
am:
e72b6f0d31
Change-Id: I7ea5895cdfd09786732b597be600329a334c1cb4
Yifan Hong [Wed, 22 Nov 2017 22:51:19 +0000 (22:51 +0000)]
Merge "android.os.HidlSupport: add getPidIfSharable() for HALs"
Christine Franks [Wed, 22 Nov 2017 22:43:11 +0000 (14:43 -0800)]
Add owner for ColorDisplayService
Test: make -j100
Change-Id: I776acca1fa91800d225aae3d1d63447d295ed6cc
Jordan Liu [Wed, 22 Nov 2017 22:36:17 +0000 (22:36 +0000)]
Merge "Update javadocs for ACTION_CONFIGURE_VOICEMAIL" am:
80aefae026 am:
e6e67e2396
am:
59e3c519f5
Change-Id: Ibd99a60779e93105aeed2bc8a9f573b4f9d3723e
Yangster [Wed, 22 Nov 2017 22:24:24 +0000 (14:24 -0800)]
Make member function as const whenever possible.
Test: unit tests passed.
Change-Id: I751cabf305a4b5aa2095853cc951837da0df4c78
Jordan Liu [Wed, 22 Nov 2017 22:26:49 +0000 (22:26 +0000)]
Merge "Update javadocs for ACTION_CONFIGURE_VOICEMAIL" am:
80aefae026
am:
e6e67e2396
Change-Id: I5b0219998a6de6709bec137237583c050a6cdc02
Jordan Liu [Wed, 22 Nov 2017 22:17:47 +0000 (22:17 +0000)]
Merge "Update javadocs for ACTION_CONFIGURE_VOICEMAIL"
am:
80aefae026
Change-Id: Ie18492114c58d1c83c060712d2a936687353ea99
Jordan Liu [Wed, 22 Nov 2017 22:09:33 +0000 (22:09 +0000)]
Merge "Update javadocs for ACTION_CONFIGURE_VOICEMAIL"
Christopher Tate [Fri, 27 Oct 2017 00:26:53 +0000 (17:26 -0700)]
The job scheduler now backs off jobs based on standby bucketing
The default parameters here translate to roughly this rate limiting:
ACTIVE: run jobs whenever
WORKING: ~ hourly
FREQUENT: ~ every 6 hours
RARE: ~ daily
Bug:
63527785
Test: cts & manual (WIP)
atest CtsJobSchedulerTestCases
Change-Id: I58f8e53e5bdf40601823e5a10a9f2383a6f67ae5
Yangster-mac [Wed, 22 Nov 2017 05:58:44 +0000 (21:58 -0800)]
Set the metric name for alerts in fake config and add a test to make sure the fake config is valid..
Test: unit test passed.
Change-Id: I1879fc523cca9fc6c672332ab4ac383f21dc16fc
Evan Rosky [Wed, 22 Nov 2017 21:31:54 +0000 (21:31 +0000)]
Merge "Revert "Don't allow 0-sized views to be focused.""
TreeHugger Robot [Wed, 22 Nov 2017 21:20:05 +0000 (21:20 +0000)]
Merge "Fix stack animation background coordinates."
Yao Chen [Wed, 22 Nov 2017 20:51:10 +0000 (12:51 -0800)]
Fix ConfigManager unit test.
Test: statsd_test
Change-Id: I47c5458fef7a30a618e783a94c3f10659d0be742
Peter Visontay [Wed, 15 Nov 2017 12:38:14 +0000 (12:38 +0000)]
Fix outdated docs of permission protection levels.
1) Added deprecation notice to the 'system' and 'signatureOrSystem' protection levels.
These were deprecated in API Level 23:
https://developer.android.com/reference/android/content/pm/PermissionInfo.html#PROTECTION_SIGNATURE_OR_SYSTEM
https://developer.android.com/reference/android/content/pm/PermissionInfo.html#PROTECTION_FLAG_SYSTEM
2) Removed an outdated list of protection levels from PermissionInfo.protectionLevel's JavaDoc.
Its Javadoc has a link to an up-to-date list.
Test: Ran "make docs".
Change-Id: Ia6dc88ba3a66f248f60f010323d5ba40200c1cda
Felipe Leme [Fri, 17 Nov 2017 16:21:23 +0000 (08:21 -0800)]
Minor improvements on autofill javadocs and logging.
Test: m update-api
Bug:
69456547
Change-Id: I2cab6d7d6ecbe7c1842a5be37af923dd20355b73
Todd Kennedy [Wed, 22 Nov 2017 20:02:48 +0000 (20:02 +0000)]
Merge "Make sense out of scan & parse flags"
TreeHugger Robot [Wed, 22 Nov 2017 19:47:43 +0000 (19:47 +0000)]
Merge "Brightness mirror should use QS theme"
Brad Ebinger [Wed, 22 Nov 2017 19:42:33 +0000 (19:42 +0000)]
Merge "Refactor ImsService to AIDL" am:
8a02c63f16 am:
e575ad10ca
am:
f9c3af2797
Change-Id: Ia51168c15e10bd20c67460edd0861582a0ac3cb9
Jeff Sharkey [Wed, 22 Nov 2017 19:34:08 +0000 (12:34 -0700)]
Emit all APIs using Predicates.
Generate APIs using updated doclava.
Test: manual inspection of API text files
Bug:
69505783
Change-Id: I2efd22998a64ebb57588b073c4a591242f4aef91
Brad Ebinger [Wed, 22 Nov 2017 19:32:29 +0000 (19:32 +0000)]
Merge "Refactor ImsService to AIDL" am:
8a02c63f16
am:
e575ad10ca
Change-Id: I760a56622f5db4fe241d0174711ff107ff072c8d
Jeff Sharkey [Sun, 19 Nov 2017 03:43:03 +0000 (20:43 -0700)]
Massage APIs for upcoming doclava change.
These changes are needed to ensure that "checkapi" doesn't claim
that we're changing the API after an upcoming doclava change.
Test: manual inspection of API text files
Bug:
69505783
Change-Id: I8292ba80cc65b7dd78f0e9dba4fcc7ffcedfab9c
Robert Carr [Tue, 21 Nov 2017 21:18:40 +0000 (13:18 -0800)]
Fix stack animation background coordinates.
Forgot that we aren't yet in a relative coordinate space for the stack!
Bug:
69623943
Test: Manual
Change-Id: Id4285355dc0da967f450dacd0eb59372be9d2426
Brad Ebinger [Wed, 22 Nov 2017 19:23:16 +0000 (19:23 +0000)]
Merge "Refactor ImsService to AIDL"
am:
8a02c63f16
Change-Id: I195d7ccff8498241b6c7be819d2ee96b661d51e1
Brad Ebinger [Wed, 22 Nov 2017 19:16:21 +0000 (19:16 +0000)]
Merge "Refactor ImsService to AIDL"
Dianne Hackborn [Wed, 22 Nov 2017 18:27:59 +0000 (18:27 +0000)]
Merge "Fix issue #
67019445: Detect BATTERY_LOW/OKAY"
Eran Messeri [Wed, 22 Nov 2017 17:12:29 +0000 (17:12 +0000)]
Merge "DevicePolicyManager: Make installed keys user-selectable by default."
TreeHugger Robot [Wed, 22 Nov 2017 15:55:53 +0000 (15:55 +0000)]
Merge "Notify apps when channels/groups are blocked/unblocked"
TreeHugger Robot [Wed, 22 Nov 2017 15:54:05 +0000 (15:54 +0000)]
Merge "Show warning when app was compiled against incompatible preview SDK"
Todd Kennedy [Mon, 6 Nov 2017 22:45:53 +0000 (14:45 -0800)]
Make sense out of scan & parse flags
Parse flags are often used confusingly to control policy during
APK parsing. Additionally, some flags [such as PARSE_IS_PRIVILEGED
or PARSE_IS_SYSTEM] aren't always determined based upon APK location
[they change based upon which apps are installed]. This means we
have to perform some gymnastics to set them correctly _before_
parsing a package.
Instead, these should be scan flags that can be determined at a
later point during package parsing. Then, based upon the scan flag
we apply policy on the package object to create the resulting
data structures.
Bug:
63539144
Bug:
69663125
Test: Manual; it builds, runs and applications can be installed / removed
Test: bit FrameworksServicesTests:com.android.server.pm.
Change-Id: I53fb18e58544e0a39f35eb6fb53c950e5c696aee
Evan Laird [Wed, 22 Nov 2017 14:57:23 +0000 (14:57 +0000)]
Merge "Use SystemUIDialog.setWindowOnTop to make user-switching dialogs not steal focus"
Bernardo Rufino [Wed, 22 Nov 2017 14:23:04 +0000 (14:23 +0000)]
Merge "Binding on-demand #1: TransportClient infra + PerformBackupTask usage"
Adam Koski [Wed, 22 Nov 2017 13:21:25 +0000 (13:21 +0000)]
Merge "Fix conditional keep rules for new semantics"
TreeHugger Robot [Wed, 22 Nov 2017 12:50:19 +0000 (12:50 +0000)]
Merge "Check camera permissions for any devices using the VIDEO class"
TreeHugger Robot [Wed, 22 Nov 2017 10:25:03 +0000 (10:25 +0000)]
Merge "Update LocationManagerService wakelock tag to follow the naming convention."
TreeHugger Robot [Wed, 22 Nov 2017 07:36:49 +0000 (07:36 +0000)]
Merge "Add static dependency between key_store_service and IKeyStoreService.aidl"
TreeHugger Robot [Wed, 22 Nov 2017 06:55:52 +0000 (06:55 +0000)]
Merge "Fix the fake statsd config. Better error messages."
Hugo Benichi [Wed, 22 Nov 2017 05:36:34 +0000 (05:36 +0000)]
Merge "Light refactors to packet wakeup events." am:
e887e2b9c1 am:
c6dc6baf4f
am:
90e68c6869 -s ours
Change-Id: Icf9bbf1b0d20acaf0fa4f7cf60fd390dc29a00b3
Hugo Benichi [Wed, 22 Nov 2017 05:27:11 +0000 (05:27 +0000)]
Merge "Light refactors to packet wakeup events." am:
e887e2b9c1
am:
c6dc6baf4f
Change-Id: I4c19f1cdfe7a9fb47aad23a21b0aa0ae8e03277a
Hugo Benichi [Wed, 22 Nov 2017 05:19:01 +0000 (05:19 +0000)]
Merge "Light refactors to packet wakeup events."
am:
e887e2b9c1
Change-Id: I40f637114cbfc04bce4058af0a1f43f38bd461db
Hugo Benichi [Wed, 22 Nov 2017 05:08:50 +0000 (05:08 +0000)]
Merge "Light refactors to packet wakeup events."
Colin Cross [Wed, 22 Nov 2017 04:32:55 +0000 (04:32 +0000)]
Merge "Revert "Add a wrapper ConfigMetricReportList to hold multiple ConfigMetricReports""
Colin Cross [Wed, 22 Nov 2017 04:30:33 +0000 (04:30 +0000)]
Revert "Add a wrapper ConfigMetricReportList to hold multiple ConfigMetricReports"
This reverts commit
24904b845f6257f3d6be5374a1e11d67715034c6.
Broke the build when combined with Ia58d215d30ed7570c0aa1b0627d3b88f8355d425.
Change-Id: Ie54a62ec7471e0183fc2627e06648efda0129a7a
Dmitry Dementyev [Wed, 22 Nov 2017 04:20:36 +0000 (20:20 -0800)]
Add static dependency between key_store_service and
IKeyStoreService.aidl
Test: manual
Bug:
69539820
Change-Id: I1b65b0355635bf4bc8b16a7fba48d48a77e0ca46
TreeHugger Robot [Wed, 22 Nov 2017 03:37:55 +0000 (03:37 +0000)]
Merge "heif: add muxer support for heic tracks"
TreeHugger Robot [Wed, 22 Nov 2017 02:55:50 +0000 (02:55 +0000)]
Merge "Output doze mode power in BatteryStats"
TreeHugger Robot [Wed, 22 Nov 2017 02:16:02 +0000 (02:16 +0000)]
Merge "Statsd test app."
Android Build Merger (Role) [Wed, 22 Nov 2017 02:12:38 +0000 (02:12 +0000)]
Merge "Merge "Javadoc cleanup of IpSecManager API." am:
d09d106ec0 am:
2a82aa70b5 am:
9f6a3431a1"
TreeHugger Robot [Wed, 22 Nov 2017 02:12:14 +0000 (02:12 +0000)]
Merge "Add a wrapper ConfigMetricReportList to hold multiple ConfigMetricReports"
Jonathan Basseri [Wed, 22 Nov 2017 02:10:32 +0000 (02:10 +0000)]
Merge "Javadoc cleanup of IpSecManager API." am:
d09d106ec0 am:
2a82aa70b5
am:
9f6a3431a1
Change-Id: Id10e39da5495f9367332cbc5c754506fc64f3c75
Jonathan Basseri [Wed, 22 Nov 2017 02:00:53 +0000 (02:00 +0000)]
Merge "Javadoc cleanup of IpSecManager API." am:
d09d106ec0
am:
2a82aa70b5
Change-Id: I53e9b3d18fda1122f6a8a6300185c743cc26dbf6
Jonathan Basseri [Wed, 22 Nov 2017 01:51:46 +0000 (01:51 +0000)]
Merge "Javadoc cleanup of IpSecManager API."
am:
d09d106ec0
Change-Id: Iaf206b0980d3bed14fe6b8318d2073577212b460
Suprabh Shukla [Wed, 22 Nov 2017 01:38:26 +0000 (01:38 +0000)]
Merge "Delaying jobs while coming out of doze"
Jonathan Basseri [Wed, 22 Nov 2017 01:32:06 +0000 (01:32 +0000)]
Merge "Javadoc cleanup of IpSecManager API."
TreeHugger Robot [Wed, 22 Nov 2017 01:11:22 +0000 (01:11 +0000)]
Merge "Implement minikin::Run"
TreeHugger Robot [Wed, 22 Nov 2017 01:10:51 +0000 (01:10 +0000)]
Merge "Add very long press to open global actions menu."
Hugo Benichi [Tue, 14 Nov 2017 13:42:46 +0000 (22:42 +0900)]
Light refactors to packet wakeup events.
This patch uses the recently added MacAddress class in WakeupEvent and
WakeupStats for replacing the byte array representation of dest mac
addresses in packet wakeup events.
Bug:
28806131
Test: runtest frameworks-net
Merged-In: I5a3c76498a4b720f0d9308a65b5dd4b32377d0d1
(partial cherry pick from
884970e0ba74c96f7c375454d3c58bb3fdc0bf46)
Change-Id: I878d51d4cc53c6d9a2cc3c55faa15b86156afbd7