OSDN Git Service
Hugo Benichi [Tue, 1 Aug 2017 15:14:02 +0000 (15:14 +0000)]
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am:
456b91561d -s ours am:
ff55799950 -s ours am:
17e2448c26 -s ours am:
7cf8e71e33 -s ours
am:
f94f0f3c64 -s ours
Change-Id: Iecd2b076021a844f688f8221e204c22300ed1c93
Hugo Benichi [Tue, 1 Aug 2017 15:03:31 +0000 (15:03 +0000)]
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am:
456b91561d -s ours am:
ff55799950 -s ours am:
17e2448c26 -s ours
am:
7cf8e71e33 -s ours
Change-Id: Idf2184eb808068366384031694c7fa89fe49c8bb
Hugo Benichi [Tue, 1 Aug 2017 14:50:36 +0000 (14:50 +0000)]
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am:
456b91561d -s ours am:
ff55799950 -s ours
am:
17e2448c26 -s ours
Change-Id: Idc2217a66f60caa783957fd6caeaafa1ff1615bc
Hugo Benichi [Tue, 1 Aug 2017 14:37:06 +0000 (14:37 +0000)]
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am:
456b91561d -s ours
am:
ff55799950 -s ours
Change-Id: I6d788c5b7cd5c6877799e5a3e0ad865996147b70
Hugo Benichi [Tue, 1 Aug 2017 14:30:02 +0000 (14:30 +0000)]
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler
am:
456b91561d -s ours
Change-Id: Ie54e0712dc83514ff3ddcd6cee1b0bd2e80c73ad
Geoffrey Pitsch [Tue, 1 Aug 2017 14:23:11 +0000 (14:23 +0000)]
Merge "Disable AOD when accessibility color inversion is on." into oc-dr1-dev am:
861b35e1df
am:
d536ba3f41
Change-Id: Ie3a3f9ad7f4294fbfa4f4162b026e1df2e5cf641
Android Build Merger (Role) [Tue, 1 Aug 2017 14:18:43 +0000 (14:18 +0000)]
Merge "Merge "Disable AOD when accessibility color inversion is on." into oc-dr1-dev am:
861b35e1df am:
7662de2771" into oc-mr1-dev-plus-aosp
Geoffrey Pitsch [Tue, 1 Aug 2017 14:16:46 +0000 (14:16 +0000)]
Merge "Disable AOD when accessibility color inversion is on." into oc-dr1-dev am:
861b35e1df
am:
7662de2771
Change-Id: Ib93c18b5b04030d8b0840ce8a813bd57a982e1d0
Neil Fuller [Tue, 1 Aug 2017 14:14:33 +0000 (14:14 +0000)]
Merge "Remove redundant TODOs from PackageTracker" into oc-mr1-dev
am:
d4ea42d8db
Change-Id: I878e8bf78e83e93a2e80b3485676553b94026612
Geoffrey Pitsch [Tue, 1 Aug 2017 14:09:10 +0000 (14:09 +0000)]
Merge "Disable AOD when accessibility color inversion is on." into oc-dr1-dev
am:
861b35e1df
Change-Id: Ib0c2a708e2556fc604631891666b70a841a1129a
Geoffrey Pitsch [Tue, 1 Aug 2017 14:08:36 +0000 (14:08 +0000)]
Merge "Disable AOD when accessibility color inversion is on." into oc-dr1-dev
am:
861b35e1df
Change-Id: I4ee3ad06138a66b47bca6e56fbbd0bd970d91e08
Neil Fuller [Tue, 1 Aug 2017 14:06:19 +0000 (14:06 +0000)]
Merge "Remove redundant TODOs from PackageTracker" into oc-mr1-dev
Geoffrey Pitsch [Tue, 1 Aug 2017 14:00:22 +0000 (14:00 +0000)]
Merge "Disable AOD when accessibility color inversion is on." into oc-dr1-dev
Narayan Kamath [Tue, 1 Aug 2017 11:46:53 +0000 (11:46 +0000)]
Merge "PrintManagerService: Don't prune services on all package change events." into oc-mr1-dev
am:
735ed6c011
Change-Id: I320bc044611da195b13b5976b827a70edc71bcb3
Narayan Kamath [Tue, 1 Aug 2017 11:38:45 +0000 (11:38 +0000)]
Merge "PrintManagerService: Don't prune services on all package change events." into oc-mr1-dev
Neil Fuller [Tue, 1 Aug 2017 10:12:17 +0000 (10:12 +0000)]
Merge "Add a new constant to TimeZoneRulesDataContract" into oc-mr1-dev
am:
70ddf0932b
Change-Id: I5cf42b8926f4e0d22bff50d90a007b6c04530b8b
Narayan Kamath [Mon, 31 Jul 2017 10:10:50 +0000 (11:10 +0100)]
PrintManagerService: Don't prune services on all package change events.
We should only need to prune services if the package that changed
had a print service or has been changed to have a print service.
Bug:
63019430
Test: Manual; observed that the print spooler isn't started up.
Test: run cts -m CtsPrintTestCases
Change-Id: I32df27e4b1d11615cf6053dd3d35c2b60068d0d3
Neil Fuller [Tue, 1 Aug 2017 10:06:16 +0000 (10:06 +0000)]
Merge "Add a new constant to TimeZoneRulesDataContract" into oc-mr1-dev
Neil Fuller [Tue, 1 Aug 2017 09:19:12 +0000 (09:19 +0000)]
Merge "Fix tracing call for RulesManagerService startup" into oc-mr1-dev
am:
ce24dd382d
Change-Id: Ifadd27aa8f05efc2244aef76fa18e6ee245b72e2
Neil Fuller [Tue, 1 Aug 2017 09:11:18 +0000 (09:11 +0000)]
Merge "Fix tracing call for RulesManagerService startup" into oc-mr1-dev
Bill Yi [Tue, 1 Aug 2017 08:15:31 +0000 (08:15 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
f2b81340f5 -s ours
Change-Id: Ib215cd0c63c44e547519b9beacc903b05de1ef24
Bill Yi [Tue, 1 Aug 2017 08:07:54 +0000 (08:07 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
4dd25981b9 -s ours
Change-Id: I0c3f52c12d789e16e5e340f3f6960caa3a00d2c0
TreeHugger Robot [Tue, 1 Aug 2017 08:05:33 +0000 (08:05 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Tue, 1 Aug 2017 07:58:07 +0000 (07:58 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Android Build Merger (Role) [Tue, 1 Aug 2017 07:51:40 +0000 (07:51 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
7eca0300b9 -s ours am:
fb80235f41 -s ours" into oc-mr1-dev-plus-aosp
Bill Yi [Tue, 1 Aug 2017 07:48:01 +0000 (07:48 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
7eca0300b9 -s ours
am:
18a4f6b083 -s ours
Change-Id: I94ebb6cf7bfcc632a8fa9fc608519f53b05f0a51
Bill Yi [Tue, 1 Aug 2017 07:48:01 +0000 (07:48 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
7eca0300b9 -s ours
am:
fb80235f41 -s ours
Change-Id: Ia65005887ed720a1d90fe93f5bc86a285c38df0c
Bill Yi [Tue, 1 Aug 2017 07:41:04 +0000 (07:41 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
7eca0300b9 -s ours
Change-Id: I28041089f69930af33b4ab93d031a2c2efceb0ab
Bill Yi [Tue, 1 Aug 2017 07:41:01 +0000 (07:41 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
7eca0300b9 -s ours
Change-Id: I0a52d4ad04ee589d80dd34f218eba693097aa979
TreeHugger Robot [Tue, 1 Aug 2017 07:32:58 +0000 (07:32 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Yohei Yukawa [Tue, 1 Aug 2017 06:23:47 +0000 (06:23 +0000)]
Merge "Fine-tune the condition to hide IME switcher" into oc-dr1-dev am:
dbd60cd6ee
am:
dd730a1796
Change-Id: I47e49fdb37ad53ef18c9f4839317480a51d92cca
Yohei Yukawa [Tue, 1 Aug 2017 06:17:58 +0000 (06:17 +0000)]
Merge "Fine-tune the condition to hide IME switcher" into oc-dr1-dev am:
dbd60cd6ee
am:
0da3dce9b4
Change-Id: Ice71e70788d42c33271f9a3b1612fe142da9b561
Yohei Yukawa [Tue, 1 Aug 2017 06:11:09 +0000 (06:11 +0000)]
Merge "Fine-tune the condition to hide IME switcher" into oc-dr1-dev
am:
dbd60cd6ee
Change-Id: I919a34c60181f4582992d4d7bf7838b66051b39d
Yohei Yukawa [Tue, 1 Aug 2017 06:11:02 +0000 (06:11 +0000)]
Merge "Fine-tune the condition to hide IME switcher" into oc-dr1-dev
am:
dbd60cd6ee
Change-Id: I5b6ff8bb9913fb43386c51fd47ae5e80e76541f2
Yohei Yukawa [Tue, 1 Aug 2017 06:01:20 +0000 (06:01 +0000)]
Merge "Fine-tune the condition to hide IME switcher" into oc-dr1-dev
Hugo Benichi [Tue, 1 Aug 2017 05:27:59 +0000 (05:27 +0000)]
Merge "NsdManager: remove duplicated argument validation" into oc-mr1-dev
am:
4f48862d0f -s ours
Change-Id: I66aa7d2d7128272bedc04568dbdcb759a3be8afe
TreeHugger Robot [Tue, 1 Aug 2017 05:17:52 +0000 (05:17 +0000)]
Merge "NsdManager: remove duplicated argument validation" into oc-mr1-dev
z00208928 [Tue, 1 Aug 2017 03:54:56 +0000 (03:54 +0000)]
Merge "power: gps: add gps read timeout" into oc-mr1-dev
am:
7e22a7eed3
Change-Id: Ic4a3d52b13d978de62a22656095c78094024eb90
TreeHugger Robot [Tue, 1 Aug 2017 03:47:09 +0000 (03:47 +0000)]
Merge "power: gps: add gps read timeout" into oc-mr1-dev
Hugo Benichi [Tue, 2 May 2017 04:36:28 +0000 (13:36 +0900)]
NsdManager: remove duplicated argument validation
This patch simplifies argument validation in NsdManager public api and
regroup duplicated validation into common methods.
This makes stack traces more actionable as now specific errors will
cause the api to throw exception from specific methods, whereas before
IllegalArgumentException would be thrown from inside the same api method
for different reasons.
This patch also includes a couple of other small cleanups.
Test: $ runtest -x frameworks/base/tests/net/../NsdManagerTest.java
Bug:
35362108
Bug:
37013369
Bug:
62044295
Bug:
63826516
Merged-In: Iaad13e13976e9bf8f508d7188f823f8184ac414b
(cherry pick from commit
ff3e6ccca1715ae72c6499cc7c894d27f46e8403)
Change-Id: I5e6a1ecc6b98069ef0089bbceecf73f7692df227
Dianne Hackborn [Tue, 1 Aug 2017 02:28:46 +0000 (02:28 +0000)]
Merge "Add documentation on oneway transaction ordering." into oc-mr1-dev
am:
0b8f281637
Change-Id: Id6d9e01440abc7940a1e39edf6a5eee3b83d83b7
TreeHugger Robot [Tue, 1 Aug 2017 02:21:21 +0000 (02:21 +0000)]
Merge "Add documentation on oneway transaction ordering." into oc-mr1-dev
Android Build Merger (Role) [Tue, 1 Aug 2017 02:19:31 +0000 (02:19 +0000)]
Merge "Merge "Document WifiManager.getConnectionInfo permission" into oc-mr1-dev am:
46b2968ff9" into oc-mr1-dev-plus-aosp
Michael Plass [Tue, 1 Aug 2017 02:14:37 +0000 (02:14 +0000)]
Merge "Document WifiManager.getConnectionInfo permission" into oc-mr1-dev
am:
46b2968ff9
Change-Id: I5503d3cc37c2371e86430bab1897d87f702c748f
Android Build Merger (Role) [Tue, 1 Aug 2017 02:13:38 +0000 (02:13 +0000)]
Merge "Merge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into cw-f-dev am:
a053eaa841 -s ours am:
65d806d043 -s ours am:
6b2d37ca25 -s ours am:
1831989a6e -s ours am:
e0947f27d1 -s ours" into oc-mr1-dev-plus-aosp
Tyler Freeman [Tue, 1 Aug 2017 02:09:44 +0000 (02:09 +0000)]
Merge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into cw-f-dev am:
a053eaa841 -s ours am:
65d806d043 -s ours am:
6b2d37ca25 -s ours am:
a4f4b537cc -s ours
am:
b9c03e5c13 -s ours
Change-Id: I92382698bd92d54b1d463aa80573e11daae3b477
Tyler Freeman [Tue, 1 Aug 2017 02:08:42 +0000 (02:08 +0000)]
Merge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into cw-f-dev am:
a053eaa841 -s ours am:
65d806d043 -s ours am:
6b2d37ca25 -s ours am:
1831989a6e -s ours
am:
e0947f27d1 -s ours
Change-Id: Id7fc08b5774c84e1ebb73a37d95070e8310a90f3
Android Build Merger (Role) [Tue, 1 Aug 2017 02:04:36 +0000 (02:04 +0000)]
Merge "Merge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into cw-f-dev am:
a053eaa841 -s ours am:
65d806d043 -s ours am:
6b2d37ca25 -s ours am:
1831989a6e -s ours am:
c20422ab40 -s ours" into oc-mr1-dev-plus-aosp
Bill Yi [Tue, 1 Aug 2017 02:03:43 +0000 (19:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idd7fe75cda287243462dc045eff8f3ab2511bd47
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
TreeHugger Robot [Tue, 1 Aug 2017 02:02:47 +0000 (02:02 +0000)]
Merge "Document WifiManager.getConnectionInfo permission" into oc-mr1-dev
Tyler Freeman [Tue, 1 Aug 2017 02:01:22 +0000 (02:01 +0000)]
Merge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into cw-f-dev am:
a053eaa841 -s ours am:
65d806d043 -s ours am:
6b2d37ca25 -s ours am:
1831989a6e -s ours
am:
c20422ab40 -s ours
Change-Id: I8a19dc6e44c73e67d8798c2599bc2e53f6b86f57
Tyler Freeman [Tue, 1 Aug 2017 01:59:43 +0000 (01:59 +0000)]
Merge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into cw-f-dev am:
a053eaa841 -s ours am:
65d806d043 -s ours am:
6b2d37ca25 -s ours
am:
a4f4b537cc -s ours
Change-Id: If1975f1c4897032e473da9c1ee67df8035d2d399
Christopher Tate [Tue, 1 Aug 2017 01:59:13 +0000 (01:59 +0000)]
Merge "Persisted jobs versus incorrect boot-time RTC" into oc-mr1-dev
am:
d04d64c133
Change-Id: Iea1cf18398f137736b9f50494429e54eb18569d8
Tyler Freeman [Tue, 1 Aug 2017 01:54:27 +0000 (01:54 +0000)]
Merge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into cw-f-dev am:
a053eaa841 -s ours am:
65d806d043 -s ours am:
6b2d37ca25 -s ours
am:
1831989a6e -s ours
Change-Id: Ib7948e307bfd18f54fc84fab6f1fc3d876cc9351
Tyler Freeman [Tue, 1 Aug 2017 01:53:40 +0000 (01:53 +0000)]
Merge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into cw-f-dev am:
a053eaa841 -s ours am:
65d806d043 -s ours am:
6b2d37ca25 -s ours
am:
1831989a6e -s ours
Change-Id: I73c6844270e95d54307335418f4bfd2a0098aade
TreeHugger Robot [Tue, 1 Aug 2017 01:50:06 +0000 (01:50 +0000)]
Merge "Persisted jobs versus incorrect boot-time RTC" into oc-mr1-dev
Tyler Freeman [Tue, 1 Aug 2017 01:49:11 +0000 (01:49 +0000)]
Merge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into cw-f-dev am:
a053eaa841 -s ours am:
65d806d043 -s ours
am:
6b2d37ca25 -s ours
Change-Id: I4b52d3a68a38bb67cc67a99aad4f13ae6ae906bb
Jeff Sharkey [Tue, 1 Aug 2017 01:47:58 +0000 (01:47 +0000)]
Merge "Update inferred policies from SubscriptionPlan." into oc-mr1-dev
am:
2aa79aa73d
Change-Id: I067325928a685305d6f53912bd401f9bbf624bea
Bill Yi [Tue, 1 Aug 2017 01:42:03 +0000 (18:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I913c1e958acf25433ad56dd3d6caa97441b8754a
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Tyler Freeman [Tue, 1 Aug 2017 01:41:18 +0000 (01:41 +0000)]
Merge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into cw-f-dev am:
a053eaa841 -s ours am:
65d806d043 -s ours
am:
6b2d37ca25 -s ours
Change-Id: I111a86ba53a48ab3db3e5211e86afc0a1d2a21e0
Jeff Sharkey [Tue, 1 Aug 2017 01:38:09 +0000 (01:38 +0000)]
Merge "Update inferred policies from SubscriptionPlan." into oc-mr1-dev
Tyler Freeman [Tue, 1 Aug 2017 01:33:44 +0000 (01:33 +0000)]
Merge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into cw-f-dev am:
a053eaa841 -s ours
am:
65d806d043 -s ours
Change-Id: Ie89e28aae64abfc833ed97748654d509cd52c07b
Tyler Freeman [Tue, 1 Aug 2017 01:24:08 +0000 (01:24 +0000)]
Merge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into cw-f-dev
am:
a053eaa841 -s ours
Change-Id: If8383edac561ad83edf182ee1c6e9687b180a1c2
Tyler Freeman [Tue, 1 Aug 2017 01:10:44 +0000 (01:10 +0000)]
Merge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into cw-f-dev
Eric Schwarzenbach [Tue, 1 Aug 2017 01:10:38 +0000 (01:10 +0000)]
Merge "Add individual ScanResult speeds to verbose logging." into oc-mr1-dev
am:
402e44173d
Change-Id: I76a6b0552b8924746b2a28628b79c226002961ec
TreeHugger Robot [Tue, 1 Aug 2017 01:04:51 +0000 (01:04 +0000)]
Merge "Add individual ScanResult speeds to verbose logging." into oc-mr1-dev
Android Build Merger (Role) [Tue, 1 Aug 2017 00:52:37 +0000 (00:52 +0000)]
Merge "Merge changes from topic 'am-
6a441a334fc44df4b5ce76e9c455027d' into oc-mr1-dev am:
1680e5a56e" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 1 Aug 2017 00:50:50 +0000 (00:50 +0000)]
Merge changes from topic 'am-
6888cf31d8e14dab98bec7df0b9168c6' into oc-mr1-dev-plus-aosp
* changes:
Merge "Show error code in WFC error notification." into oc-dr1-dev am:
d2063214a5 am:
3961ac3945
Merge "Remoe translations of values-mcc310-mnc260" into oc-dr1-dev am:
0891411cfd am:
2940beda60
Meng Wang [Tue, 1 Aug 2017 00:49:06 +0000 (00:49 +0000)]
Merge changes from topic 'am-
6a441a334fc44df4b5ce76e9c455027d' into oc-mr1-dev
am:
1680e5a56e
Change-Id: I4b9b530c0d6d4af7bb6f2f2a5277a311505d8045
Meng Wang [Tue, 1 Aug 2017 00:46:39 +0000 (00:46 +0000)]
Merge "Show error code in WFC error notification." into oc-dr1-dev am:
d2063214a5
am:
3961ac3945
Change-Id: Ia824cceb7ac0bdb00e435d01b1246fafb062615f
Meng Wang [Tue, 1 Aug 2017 00:45:41 +0000 (00:45 +0000)]
Merge "Remoe translations of values-mcc310-mnc260" into oc-dr1-dev am:
0891411cfd
am:
2940beda60
Change-Id: Ieeb3c842c8e105e5fc8b43578e18f57c32e7042a
Fyodor Kupolov [Tue, 1 Aug 2017 00:45:33 +0000 (00:45 +0000)]
Merge "List column names in the error message" into oc-mr1-dev
am:
2729912a35
Change-Id: Ia477660fdee2f94f042d0c3d463481ee550abd56
Android Build Merger (Role) [Tue, 1 Aug 2017 00:41:28 +0000 (00:41 +0000)]
Merge changes from topic 'am-
6a441a334fc44df4b5ce76e9c455027d' into oc-mr1-dev
* changes:
Merge "Show error code in WFC error notification." into oc-dr1-dev am:
d2063214a5
Merge "Remoe translations of values-mcc310-mnc260" into oc-dr1-dev am:
0891411cfd
Meng Wang [Tue, 1 Aug 2017 00:36:58 +0000 (00:36 +0000)]
Merge "Show error code in WFC error notification." into oc-dr1-dev
am:
d2063214a5
Change-Id: I7c1980af1c877c7b3b4500daccb1226876c7e5bf
Meng Wang [Tue, 1 Aug 2017 00:36:56 +0000 (00:36 +0000)]
Merge "Show error code in WFC error notification." into oc-dr1-dev
am:
d2063214a5
Change-Id: Id6679935220de109c9d891431696fc3354a021fd
TreeHugger Robot [Tue, 1 Aug 2017 00:36:49 +0000 (00:36 +0000)]
Merge "List column names in the error message" into oc-mr1-dev
Meng Wang [Tue, 1 Aug 2017 00:35:45 +0000 (00:35 +0000)]
Merge "Remoe translations of values-mcc310-mnc260" into oc-dr1-dev
am:
0891411cfd
Change-Id: I305e747d63fcefd02323058831064fc39c7a2ebb
Meng Wang [Tue, 1 Aug 2017 00:35:42 +0000 (00:35 +0000)]
Merge "Remoe translations of values-mcc310-mnc260" into oc-dr1-dev
am:
0891411cfd
Change-Id: Id6972effd7feae66bdc7d53be08c832c14cc2d90
Meng Wang [Tue, 1 Aug 2017 00:28:12 +0000 (00:28 +0000)]
Merge "Show error code in WFC error notification." into oc-dr1-dev
Meng Wang [Tue, 1 Aug 2017 00:28:12 +0000 (00:28 +0000)]
Merge "Remoe translations of values-mcc310-mnc260" into oc-dr1-dev
Fyodor Kupolov [Tue, 1 Aug 2017 00:06:04 +0000 (00:06 +0000)]
Merge "Added setIdleConnectionTimeout method" into oc-mr1-dev
am:
82f289a4b4
Change-Id: I31aaefcd59a0947532c84ccf07c828c4060c303e
Dianne Hackborn [Tue, 1 Aug 2017 00:02:51 +0000 (17:02 -0700)]
Add documentation on oneway transaction ordering.
Test: built
Change-Id: I4d2e336327a4ce9c8f76d49037c894e981bdf571
Fyodor Kupolov [Mon, 31 Jul 2017 23:56:02 +0000 (23:56 +0000)]
Merge "Added setIdleConnectionTimeout method" into oc-mr1-dev
Christopher Tate [Wed, 26 Jul 2017 21:27:38 +0000 (14:27 -0700)]
Persisted jobs versus incorrect boot-time RTC
Devices routinely boot in a state where the RTC is wildly incorrect
in the past (2009, 1999, or even at Unix epoch zero). When we have
persistent jobs to be scheduled at boot, this presents a problem: when
should those jobs run, given that our idea of "now" is incorrect?
The previous implementation fell back to rescheduling these jobs
"from scratch" in this situation, as though they were newly-introduced,
but this turns out to have some emergent pathologies when the jobs
were intended to become runnable after long initial delays: the
rescheduling behavior could wind up starving jobs out entirely,
never running them regardless of how much real uptime the device
had, given the "wrong" pattern of reboots.
We now preserve the original nominal schedule, but recognize when we
have booted in a pathological situation, and correct the schedule for
these jobs when the system clock becomes sensible.
Bug
63817592
Test: JobScheduler test suite plus manual bogus-boot-time repro
Change-Id: Ia36fc5298b68db74e4e07e973b68e68e66206b43
Jeff Sharkey [Sun, 30 Jul 2017 22:52:51 +0000 (16:52 -0600)]
Update inferred policies from SubscriptionPlan.
When creating or updating inferred network policies, consult any
SubscriptionPlan information first, then fallback to CarrierService
values, before finally falling back to system defaults.
Dump known SubscriptionPlan values in dumpsys output for debugging.
Fix bug where updateNetworkRulesNL() tried calculating cycles when
non existed.
Test: builds, boots, subscription plans update
Test: bit FrameworksServicesTests:com.android.server.NetworkPolicyManagerServiceTest
Bug:
63925474,
64124815
Change-Id: I12257cada14f72890d5346e366643aac88de278e
Eric Schwarzenbach [Tue, 25 Jul 2017 21:32:21 +0000 (14:32 -0700)]
Add individual ScanResult speeds to verbose logging.
Moves the individual ScanResult summary string generation out of
getVisibilityStatus into its own method `verboseScanResultSummary`,
to reduce duplication and to enable testing the per-ScanResult speed labeling.
Bug:
63866500
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java
Change-Id: I9583d142a7d50314017154703df4e1ce69fc68aa
Android Build Merger (Role) [Mon, 31 Jul 2017 22:46:17 +0000 (22:46 +0000)]
Merge "Merge "Camera2: Release input surface on capture session close" into oc-dr1-dev am:
06802167e5 am:
6f1422711b" into oc-mr1-dev-plus-aosp
Eino-Ville Talvala [Mon, 31 Jul 2017 22:43:30 +0000 (22:43 +0000)]
Merge "Camera2: Release input surface on capture session close" into oc-dr1-dev am:
06802167e5
am:
6f1422711b
Change-Id: I4ef1d06c0151ad62ddd3be3152c4d92f15879a87
Eino-Ville Talvala [Mon, 31 Jul 2017 22:40:50 +0000 (22:40 +0000)]
Merge "Camera2: Release input surface on capture session close" into oc-dr1-dev am:
06802167e5
am:
102e9a7e3b
Change-Id: I2f2ebf1df3ba3a9f6e8a7daf654d118580a96a1d
Yohei Yukawa [Mon, 31 Jul 2017 22:37:14 +0000 (15:37 -0700)]
Fine-tune the condition to hide IME switcher
This is a follow up CL to a previous CL [1] that aimed to avoid
redundant IME switcher icon/notification on the keyguard, which already
has a keyboard icon to show IME switcher.
What the previous attempt overlooked is that when some other window is
shown over the keyguard and accepting text input, then we instead may
want to show the IME switcher icon/notification in the system UI level
because such a window may or may not have the icon to show IME
switcher.
This CL addresses above case by checking whether the keyguard is also
occluded or not. Bug
64224022 is also filed to find any other better
solution to stop relying on the keyguard visibility.
[1]: Ibee9123f4a520e77f4baf8bdd3d75364ab451100
2c93efc9eb188532472edc9e0c3e1ab8121aa20d
Test: Manually done as follows
1. Enable multiple IMEs
2. Set a password to lockscreen
3. Lock screen
4. Make sure that IME switcher UI is not shown when typing
password on the keyguard (Bug
5858903 is still fixed)
5. Show any window that has EditText over the keyguard
6. Focus in to that EditText
7. Make sure that IME switcher UI is shown
Fixes:
63585213
Change-Id: I2ae7fc7676e5b64d8910dbc6833d3042e8d2329a
Adam Lesinski [Mon, 31 Jul 2017 22:32:13 +0000 (22:32 +0000)]
Merge "Remove extraneous invalidate call that unregisters AssetManagers" into oc-dr1-dev am:
defdb1fd70
am:
630faa085a
Change-Id: I6df3097ef7e88308eefd8d55ee793f88b07365d2
Eino-Ville Talvala [Mon, 31 Jul 2017 22:30:01 +0000 (22:30 +0000)]
Merge "Camera2: Release input surface on capture session close" into oc-dr1-dev
am:
06802167e5
Change-Id: I3370a3c8853d171b29856d2a94e7121e6a5ad1b5
Eino-Ville Talvala [Mon, 31 Jul 2017 22:30:01 +0000 (22:30 +0000)]
Merge "Camera2: Release input surface on capture session close" into oc-dr1-dev
am:
06802167e5
Change-Id: Iedafc28d1a63b708b1992e4ef3570069c59d087a
Adam Lesinski [Mon, 31 Jul 2017 22:23:54 +0000 (22:23 +0000)]
Merge "Remove extraneous invalidate call that unregisters AssetManagers" into oc-dr1-dev am:
defdb1fd70
am:
80454c2c88
Change-Id: I33ffcecebec53c73a52ab7b4b17808e076784087
Eino-Ville Talvala [Mon, 31 Jul 2017 22:21:40 +0000 (22:21 +0000)]
Merge "Camera2: Release input surface on capture session close" into oc-dr1-dev
Adam Lesinski [Mon, 31 Jul 2017 22:17:27 +0000 (22:17 +0000)]
Merge "Remove extraneous invalidate call that unregisters AssetManagers" into oc-dr1-dev
am:
defdb1fd70
Change-Id: I6878ca92b2bd8b2e9569147dde007ae657adc87c
Adam Lesinski [Mon, 31 Jul 2017 22:17:26 +0000 (22:17 +0000)]
Merge "Remove extraneous invalidate call that unregisters AssetManagers" into oc-dr1-dev
am:
defdb1fd70
Change-Id: I16587768d92201f8d4d083b70ae972cca47e8b5c
Adam Lesinski [Mon, 31 Jul 2017 22:08:30 +0000 (22:08 +0000)]
Merge "Remove extraneous invalidate call that unregisters AssetManagers" into oc-dr1-dev
Android Build Merger (Role) [Mon, 31 Jul 2017 21:57:52 +0000 (21:57 +0000)]
Merge "Merge "When exiting persistent vr, we should exit overall vr mode." into oc-dr1-dev am:
34b2389fcf am:
9a554952db" into oc-mr1-dev-plus-aosp
Alex Sakhartchouk [Mon, 31 Jul 2017 21:55:06 +0000 (21:55 +0000)]
Merge "When exiting persistent vr, we should exit overall vr mode." into oc-dr1-dev am:
34b2389fcf
am:
9a554952db
Change-Id: I16154593751dd03131b23b36be8a657ccc10836a
OSDN Git Service
