Narayan Kamath
0515c80d01
Merge "PrintManagerService: Don't prune services on all package change events." into oc-mr1-dev am: 735ed6c011
...
am: e81a350a45
2017-08-01 11:57:28 +00:00
Narayan Kamath
e81a350a45
Merge "PrintManagerService: Don't prune services on all package change events." into oc-mr1-dev
...
am: 735ed6c011
2017-08-01 11:46:53 +00:00
Narayan Kamath
735ed6c011
Merge "PrintManagerService: Don't prune services on all package change events." into oc-mr1-dev
2017-08-01 11:38:45 +00:00
Neil Fuller
1627b03b3d
Merge "Add a new constant to TimeZoneRulesDataContract" into oc-mr1-dev am: 70ddf0932b
...
am: bc66bdc72a
2017-08-01 10:20:09 +00:00
Neil Fuller
bc66bdc72a
Merge "Add a new constant to TimeZoneRulesDataContract" into oc-mr1-dev
...
am: 70ddf0932b
2017-08-01 10:12:17 +00:00
Narayan Kamath
973d8af11b
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
2017-08-01 10:09:33 +00:00
Neil Fuller
70ddf0932b
Merge "Add a new constant to TimeZoneRulesDataContract" into oc-mr1-dev
2017-08-01 10:06:16 +00:00
Neil Fuller
de9d7c1972
Merge "Fix tracing call for RulesManagerService startup" into oc-mr1-dev am: ce24dd382d
...
am: 315def899f
2017-08-01 09:26:18 +00:00
Neil Fuller
315def899f
Merge "Fix tracing call for RulesManagerService startup" into oc-mr1-dev
...
am: ce24dd382d
2017-08-01 09:19:12 +00:00
Neil Fuller
ce24dd382d
Merge "Fix tracing call for RulesManagerService startup" into oc-mr1-dev
2017-08-01 09:11:18 +00:00
Bill Yi
ff573674fd
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: f2b81340f5 -s ours
...
am: 797db6f8b0
2017-08-01 08:25:40 +00:00
Bill Yi
797db6f8b0
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: f2b81340f5
2017-08-01 08:15:31 +00:00
Bill Yi
8e093b50c8
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 4dd25981b9 -s ours
...
am: e3ffca0d96
2017-08-01 08:15:31 +00:00
Bill Yi
e3ffca0d96
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: 4dd25981b9
2017-08-01 08:07:54 +00:00
TreeHugger Robot
f2b81340f5
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
2017-08-01 08:05:33 +00:00
Bill Yi
3f3ef090ce
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
...
am: 63cfdfc02e
2017-08-01 08:01:48 +00:00
Bill Yi
486f6f0b65
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 7eca0300b9 -s ours am: 18a4f6b083 -s ours
...
am: 4dd0c0b4b6
2017-08-01 07:58:49 +00:00
TreeHugger Robot
4dd25981b9
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
2017-08-01 07:58:07 +00:00
Android Build Merger (Role)
63cfdfc02e
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
2017-08-01 07:51:40 +00:00
Bill Yi
4dd0c0b4b6
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 7eca0300b9 -s ours
...
am: 18a4f6b083
2017-08-01 07:48:01 +00:00
Bill Yi
e858e9b36d
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 7eca0300b9 -s ours
...
am: fb80235f41
2017-08-01 07:48:01 +00:00
Bill Yi
18a4f6b083
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: 7eca0300b9
2017-08-01 07:41:04 +00:00
Bill Yi
fb80235f41
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: 7eca0300b9
2017-08-01 07:41:01 +00:00
TreeHugger Robot
7eca0300b9
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
2017-08-01 07:32:58 +00:00
Yohei Yukawa
e9a2b2a839
Merge "Fine-tune the condition to hide IME switcher" into oc-dr1-dev am: dbd60cd6ee am: dd730a1796
...
am: ff009d0bf6
2017-08-01 06:32:29 +00:00
Yohei Yukawa
83ae16afa0
Merge "Fine-tune the condition to hide IME switcher" into oc-dr1-dev am: dbd60cd6ee am: 0da3dce9b4
...
am: ec8558abcd
2017-08-01 06:25:37 +00:00
Yohei Yukawa
ff009d0bf6
Merge "Fine-tune the condition to hide IME switcher" into oc-dr1-dev am: dbd60cd6ee
...
am: dd730a1796
2017-08-01 06:23:47 +00:00
Yohei Yukawa
ec8558abcd
Merge "Fine-tune the condition to hide IME switcher" into oc-dr1-dev am: dbd60cd6ee
...
am: 0da3dce9b4
2017-08-01 06:17:58 +00:00
Yohei Yukawa
dd730a1796
Merge "Fine-tune the condition to hide IME switcher" into oc-dr1-dev
...
am: dbd60cd6ee
2017-08-01 06:11:09 +00:00
Yohei Yukawa
0da3dce9b4
Merge "Fine-tune the condition to hide IME switcher" into oc-dr1-dev
...
am: dbd60cd6ee
2017-08-01 06:11:02 +00:00
Yohei Yukawa
dbd60cd6ee
Merge "Fine-tune the condition to hide IME switcher" into oc-dr1-dev
2017-08-01 06:01:20 +00:00
Hugo Benichi
f40207a6cf
Merge "NsdManager: remove duplicated argument validation" into oc-mr1-dev am: 4f48862d0f -s ours
...
am: 0e3927f01a
2017-08-01 05:35:11 +00:00
Hugo Benichi
0e3927f01a
Merge "NsdManager: remove duplicated argument validation" into oc-mr1-dev
...
am: 4f48862d0f
2017-08-01 05:27:59 +00:00
TreeHugger Robot
4f48862d0f
Merge "NsdManager: remove duplicated argument validation" into oc-mr1-dev
2017-08-01 05:17:52 +00:00
z00208928
8563d11bc6
Merge "power: gps: add gps read timeout" into oc-mr1-dev am: 7e22a7eed3
...
am: f8ba37696e
2017-08-01 04:02:21 +00:00
z00208928
f8ba37696e
Merge "power: gps: add gps read timeout" into oc-mr1-dev
...
am: 7e22a7eed3
2017-08-01 03:54:56 +00:00
TreeHugger Robot
d140c09d56
Merge "Introduce new InflatingEmojiListActivity for JankTest."
2017-08-01 03:48:09 +00:00
TreeHugger Robot
7e22a7eed3
Merge "power: gps: add gps read timeout" into oc-mr1-dev
2017-08-01 03:47:09 +00:00
Dianne Hackborn
0785389f81
Merge "Add documentation on oneway transaction ordering." into oc-mr1-dev am: 0b8f281637
...
am: dae5beb369
2017-08-01 02:49:33 +00:00
Hugo Benichi
4aa743c343
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 ff3e6ccca1
2017-08-01 02:45:23 +00:00
Michael Plass
3bc40c7168
Merge "Merge "Document WifiManager.getConnectionInfo permission" into oc-mr1-dev am: 46b2968ff9" into oc-mr1-dev-plus-aosp
...
am: 4dac5a76e2
2017-08-01 02:44:55 +00:00
Tyler Freeman
5548995258
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
...
am: cadc093160
2017-08-01 02:33:18 +00:00
Dianne Hackborn
dae5beb369
Merge "Add documentation on oneway transaction ordering." into oc-mr1-dev
...
am: 0b8f281637
2017-08-01 02:28:46 +00:00
Tyler Freeman
e9c5edb267
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
...
am: fdfa9c69a1
2017-08-01 02:25:14 +00:00
TreeHugger Robot
0b8f281637
Merge "Add documentation on oneway transaction ordering." into oc-mr1-dev
2017-08-01 02:21:21 +00:00
Android Build Merger (Role)
4dac5a76e2
Merge "Merge "Document WifiManager.getConnectionInfo permission" into oc-mr1-dev am: 46b2968ff9" into oc-mr1-dev-plus-aosp
2017-08-01 02:19:31 +00:00
Tyler Freeman
f5892d6255
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
...
am: 43924dcbba
2017-08-01 02:17:50 +00:00
Michael Plass
abbcc0f4c7
Merge "Document WifiManager.getConnectionInfo permission" into oc-mr1-dev
...
am: 46b2968ff9
2017-08-01 02:14:37 +00:00
Android Build Merger (Role)
cadc093160
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
2017-08-01 02:13:38 +00:00
Tyler Freeman
fdfa9c69a1
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
2017-08-01 02:09:44 +00:00
