OSDN Git Service
TreeHugger Robot [Wed, 2 Aug 2017 00:43:41 +0000 (00:43 +0000)]
Merge "Make a11y shortcut dialog themeable" into oc-mr1-dev
Felipe Leme [Wed, 2 Aug 2017 00:35:45 +0000 (00:35 +0000)]
Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev am:
6829a1dace
am:
27eb322ed2 -s ours
Change-Id: I4e65c04b63813ef95ec8bb99e783dfe223ca7a5a
Felipe Leme [Wed, 2 Aug 2017 00:26:37 +0000 (00:26 +0000)]
Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev
am:
6829a1dace
Change-Id: I41dec3cb31e6b523927717950f827f45dadabd8b
TreeHugger Robot [Wed, 2 Aug 2017 00:08:15 +0000 (00:08 +0000)]
Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev
Sundeep Ghuman [Tue, 1 Aug 2017 22:47:07 +0000 (22:47 +0000)]
Merge "Fix broken robotests." into oc-dr1-dev
am:
a048e3c03f
Change-Id: If07fc6d27b94cd515f2b205ab2cd77bd84302942
TreeHugger Robot [Tue, 1 Aug 2017 22:38:28 +0000 (22:38 +0000)]
Merge "Fix broken robotests." into oc-dr1-dev
Selim Cinek [Tue, 1 Aug 2017 21:58:33 +0000 (21:58 +0000)]
Merge "Fixed an issue where the statusbar was expanded" into oc-dr1-dev
am:
bbd9264c46
Change-Id: I0e0d6fac50335a93b5ee15af75096d7db0389a70
TreeHugger Robot [Tue, 1 Aug 2017 21:37:00 +0000 (21:37 +0000)]
Merge "Fixed an issue where the statusbar was expanded" into oc-dr1-dev
Andrew Solovay [Tue, 1 Aug 2017 21:31:59 +0000 (21:31 +0000)]
Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev am:
d71cc3b72e
am:
9e1b7759dc
Change-Id: I9b6e9c02f2237c48fdac4fd6f0c4afc4eb8b03cd
Andrew Solovay [Tue, 1 Aug 2017 21:21:58 +0000 (21:21 +0000)]
Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev
am:
d71cc3b72e
Change-Id: I8130d71136078d17196e198db6ff36f7f8489a5c
Andrew Solovay [Tue, 1 Aug 2017 21:07:18 +0000 (21:07 +0000)]
Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev
Phil Weaver [Fri, 28 Jul 2017 19:58:15 +0000 (12:58 -0700)]
Make a11y shortcut dialog themeable
Bug:
64145430
Test: Brought up dialog. It's now blue.
Change-Id: Ib830734da43001260628133c05f3f3faee9c1563
(cherry picked from commit
5351872f4f033badbb176b273e38afb5d33b35b8)
Lucas Dupin [Tue, 1 Aug 2017 20:49:39 +0000 (20:49 +0000)]
Merge "Volume slider content description" into oc-mr1-dev
TreeHugger Robot [Tue, 1 Aug 2017 20:31:01 +0000 (20:31 +0000)]
Merge "Add new Dolby Vision Profile types" into oc-mr1-dev
Love Khanna [Tue, 1 Aug 2017 20:03:44 +0000 (20:03 +0000)]
Merge "Set default value for T3T_PMM." into oc-dr1-dev
am:
756d93964d
Change-Id: Idf050b3f7a144a5074b33677269305d9eadd312d
Dianne Hackborn [Tue, 1 Aug 2017 20:01:32 +0000 (20:01 +0000)]
Merge "Fix issue #
64224738: Document return value of IBinder.transact()" into oc-mr1-dev
Adam Cohen [Tue, 1 Aug 2017 19:56:04 +0000 (19:56 +0000)]
Merge "Revert "Fixing occasional jump when launching certain apps from Recents."" into oc-dr1-dev
am:
0151c395b5
Change-Id: I2ae775926cdd52e2e0fb00cd2c2fb2b7dc92e863
Jason Monk [Tue, 1 Aug 2017 19:52:08 +0000 (19:52 +0000)]
Merge "Make it easier to click on phone nav buttons" into oc-dr1-dev
am:
7d08ca6e4d
Change-Id: I8e2c578cb564b2bc2de7c793eb40dea2639fa04e
TreeHugger Robot [Tue, 1 Aug 2017 19:48:12 +0000 (19:48 +0000)]
Merge "Set default value for T3T_PMM." into oc-dr1-dev
TreeHugger Robot [Tue, 1 Aug 2017 19:46:29 +0000 (19:46 +0000)]
Merge "Log package parse timings" into oc-mr1-dev
Adam Cohen [Tue, 1 Aug 2017 19:41:42 +0000 (19:41 +0000)]
Merge "Revert "Fixing occasional jump when launching certain apps from Recents."" into oc-dr1-dev
Jason Monk [Tue, 1 Aug 2017 19:41:10 +0000 (19:41 +0000)]
Merge "Make it easier to click on phone nav buttons" into oc-dr1-dev
Felipe Leme [Tue, 1 Aug 2017 19:33:25 +0000 (19:33 +0000)]
Merge "Minor Autofill javadoc fix." into oc-mr1-dev
Badhri Jagan Sridharan [Tue, 1 Aug 2017 19:03:55 +0000 (19:03 +0000)]
Merge "Reword analog audio not supported notification" into oc-dr1-dev
am:
69840ca338
Change-Id: I6a9a611c13de7a63e6d5bdbf4718827f2295a28b
Adam Lesinski [Tue, 1 Aug 2017 18:58:54 +0000 (18:58 +0000)]
Merge "Refresh constants when MCC/MNC changes in PowerUI" into oc-dr1-dev
am:
50d25dc00c
Change-Id: I33fc54b3ae91f9e616022ccf2f6cf7e5440e0b25
TreeHugger Robot [Tue, 1 Aug 2017 18:51:53 +0000 (18:51 +0000)]
Merge "Reword analog audio not supported notification" into oc-dr1-dev
Jason Monk [Tue, 1 Aug 2017 18:48:01 +0000 (18:48 +0000)]
Merge "Cleanup QS dialogs" into oc-dr1-dev
am:
cb5e0e63b4
Change-Id: Ib51f630bfe644e9deaec73c32dc4f3d6aa9237b5
Adam Lesinski [Tue, 1 Aug 2017 18:47:42 +0000 (18:47 +0000)]
Merge "Refresh constants when MCC/MNC changes in PowerUI" into oc-dr1-dev
Calin Juravle [Tue, 1 Aug 2017 18:38:05 +0000 (18:38 +0000)]
Merge changes from topic 'class-loaders-mr1' into oc-mr1-dev
* changes:
Use the class loader context when optimizing secondary dex files
Add DexClassLoader to the list of supported class loaders
Jason Monk [Tue, 1 Aug 2017 18:31:15 +0000 (18:31 +0000)]
Merge "Cleanup QS dialogs" into oc-dr1-dev
Alison Cichowlas [Tue, 1 Aug 2017 18:18:45 +0000 (18:18 +0000)]
Merge "Move ShutdownThread calls to system ui thread." into oc-dr1-dev
am:
39a556f1d8
Change-Id: I51580faadf97d828d5b2c4d7adba99cd7d36d4f2
Alison Cichowlas [Tue, 1 Aug 2017 18:06:39 +0000 (18:06 +0000)]
Merge "Move ShutdownThread calls to system ui thread." into oc-dr1-dev
Dianne Hackborn [Tue, 1 Aug 2017 18:06:13 +0000 (18:06 +0000)]
Merge "Fix issue #
64140901: Maps crashed entering PIP right after..." into oc-mr1-dev
Selim Cinek [Tue, 1 Aug 2017 17:44:29 +0000 (10:44 -0700)]
Fixed an issue where the statusbar was expanded
Since we weren't always updating our state whether
our scrims are visible, we could get stuck in an
uninteractable state.
Test: manual, doubletap on AOD notification
Change-Id: I48eca4f29775578382098cf8be876be09ba037a9
Fixes:
64216359
Tomasz Wasilczyk [Tue, 1 Aug 2017 17:43:02 +0000 (17:43 +0000)]
Merge "Add permission annotation to RadioManager methods." into oc-mr1-dev
Lucas Dupin [Tue, 1 Aug 2017 17:36:10 +0000 (10:36 -0700)]
Volume slider content description
Volume, ring and acessibility sliders now report their names
when talk back is on.
Examples:
26% acessibility seek control, use volume keys to adjust.
0% ring seek control, disabled.
Change-Id: I0a775a9b90254c9f338b9f4f38efbff10f626853
Fixes:
62354047
Test: Turn talk back on, tap on volume sliders
TreeHugger Robot [Tue, 1 Aug 2017 17:29:35 +0000 (17:29 +0000)]
Merge "Revert "Implement family fallback." DO NOT MERGE" into oc-mr1-dev
Love Khanna [Tue, 1 Aug 2017 13:02:59 +0000 (18:32 +0530)]
Set default value for T3T_PMM.
If HCEF Application does not provide the T3T PMM value, set the
default value (
FFFFFFFFFFFFFFFF) as per NCI specification.
Bug:
64112415
Test: CTS Verifier; HCE-F Reader/Emulator Test
Change-Id: I24f212d9bebd978342e4dd04d618572132e7eb4b
(cherry picked from commit
20a77e973f62f145ab7b3a4822ce34407c0ca476)
Jason Monk [Tue, 1 Aug 2017 16:51:18 +0000 (16:51 +0000)]
Merge "Fix QS wifi scan state" into oc-dr1-dev
am:
ce099ba8bc
Change-Id: Ibd2879449d580e73631e2199b68e78eaae53e788
Jason Monk [Tue, 1 Aug 2017 16:41:43 +0000 (16:41 +0000)]
Merge "Fix QS wifi scan state" into oc-dr1-dev
Jason Monk [Fri, 28 Jul 2017 18:35:13 +0000 (14:35 -0400)]
Make it easier to click on phone nav buttons
When touches fall through the normal click targets, redirect them
to the nearest view.
Test: runtest systemui
Change-Id: I48267d9b1e15bf8dbe8725b72326751b03196efa
Fixes:
64080938
Makoto Onuki [Tue, 1 Aug 2017 16:11:27 +0000 (16:11 +0000)]
Merge "Revert "Reduce duplicate strings due to the package cache."" into oc-mr1-dev
Paul Mclean [Tue, 1 Aug 2017 15:35:05 +0000 (15:35 +0000)]
Merge "Fix exceptions causing HTC dongle (and JBL headset) to fail connection logic." into oc-dr1-dev
am:
f3562ffdfb
Change-Id: I0304bf7c72a340f4bebebea89d2e934ae5830b33
Paul Mclean [Tue, 1 Aug 2017 15:28:27 +0000 (15:28 +0000)]
Merge "Fix exceptions causing HTC dongle (and JBL headset) to fail connection logic." into oc-dr1-dev
Bill Yi [Tue, 1 Aug 2017 15:24:27 +0000 (15:24 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
040c26f636 -s ours
Change-Id: I696a2a7a8ca66a4f901640e4f83c6c31f2c43d4d
TreeHugger Robot [Tue, 1 Aug 2017 15:18:52 +0000 (15:18 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Maggie Lee [Tue, 1 Aug 2017 15:15:06 +0000 (15:15 +0000)]
Merge "power: gps: add gps read timeout" into cw-f-dev am:
33676dddbd am:
b5da08a276 am:
d88f4b723d
am:
cd68805540
Change-Id: I5c2264ef11bb4e3275e1b32b0b8f6eb44fffd500
Andriy Naborskyy [Tue, 1 Aug 2017 15:11:55 +0000 (15:11 +0000)]
Merge changes I49a76582,Iac4b75bc into cw-f-dev am:
f18599a15b am:
9295f58d26 am:
502986f72a
am:
5223106231
Change-Id: I86eb04b02e44eb827509888746010d18bba8a997
Hugo Benichi [Tue, 1 Aug 2017 15:10:35 +0000 (15:10 +0000)]
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am:
456b91561d -s ours am:
ff55799950 -s ours am:
17e2448c26 -s ours
am:
0dbabf02f2 -s ours
Change-Id: I5b252535638054e87fb3cc6069d51a6c4da7dce0
Maggie Lee [Tue, 1 Aug 2017 15:03:39 +0000 (15:03 +0000)]
Merge "power: gps: add gps read timeout" into cw-f-dev am:
33676dddbd am:
b5da08a276
am:
d88f4b723d
Change-Id: I63d677df2353fff2d2e786e25b0dc416837f1581
Andriy Naborskyy [Tue, 1 Aug 2017 14:56:23 +0000 (14:56 +0000)]
Merge changes I49a76582,Iac4b75bc into cw-f-dev am:
f18599a15b am:
9295f58d26
am:
502986f72a
Change-Id: Ic615cfdefcf6a226c868e9203e74070e9000a931
Hugo Benichi [Tue, 1 Aug 2017 14:55:26 +0000 (14:55 +0000)]
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am:
456b91561d -s ours am:
ff55799950 -s ours
am:
17e2448c26 -s ours
Change-Id: Ia38655a26410e9ea78e394e5c59e052739f041a6
Maggie Lee [Tue, 1 Aug 2017 14:47:57 +0000 (14:47 +0000)]
Merge "power: gps: add gps read timeout" into cw-f-dev am:
33676dddbd
am:
b5da08a276
Change-Id: I5d96dd73affe79880583347e32a95be8510a5462
Jason Monk [Tue, 1 Aug 2017 14:38:02 +0000 (10:38 -0400)]
Cleanup QS dialogs
Test: manual
Change-Id: I3a87b171d9000ac6628f3d83fc2a817136dc3010
Fixes:
64159285
Fixes:
64158814
Andriy Naborskyy [Tue, 1 Aug 2017 14:38:26 +0000 (14:38 +0000)]
Merge changes I49a76582,Iac4b75bc into cw-f-dev am:
f18599a15b
am:
9295f58d26
Change-Id: Ifd70690f5e275e89d59a15134427e2bcc91e67c7
Maggie Lee [Tue, 1 Aug 2017 14:37:40 +0000 (14:37 +0000)]
Merge "power: gps: add gps read timeout" into cw-f-dev
am:
33676dddbd
Change-Id: I7e3a779631c2de4a14521c8dac6d5b2d96ce1b29
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
Maggie Lee [Tue, 1 Aug 2017 14:31:23 +0000 (14:31 +0000)]
Merge "power: gps: add gps read timeout" into cw-f-dev
Andriy Naborskyy [Tue, 1 Aug 2017 14:30:05 +0000 (14:30 +0000)]
Merge changes I49a76582,Iac4b75bc into cw-f-dev
am:
f18599a15b
Change-Id: Ib1f6b94a4970bbec28d6bbc7de8969c9d5d3975f
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
Andriy Naborskyy [Tue, 1 Aug 2017 14:16:30 +0000 (14:16 +0000)]
Merge changes I49a76582,Iac4b75bc into cw-f-dev
* changes:
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler
DO NOT MERGE ANYWHERE ConnectivityService: safer locking
Jason Monk [Tue, 1 Aug 2017 14:13:43 +0000 (10:13 -0400)]
Fix QS wifi scan state
Test: manual
Change-Id: Icc4e627f1248b5749801ad532220b3b9fade036d
Fixes:
63648257
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
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:38:45 +0000 (11:38 +0000)]
Merge "PrintManagerService: Don't prune services on all package change events." into oc-mr1-dev
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:11:18 +0000 (09:11 +0000)]
Merge "Fix tracing call for RulesManagerService startup" into oc-mr1-dev
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
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
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: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
TreeHugger Robot [Tue, 1 Aug 2017 05:17:52 +0000 (05:17 +0000)]
Merge "NsdManager: remove duplicated argument validation" into oc-mr1-dev
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
Andrew Solovay [Tue, 1 Aug 2017 02:13:38 +0000 (19:13 -0700)]
docs: Noted that JobIntentService is usually a better choice
Since IntentService is subject to the O background restrictions,
most devs are better off switching to the new JobIntentService.
(I assume IntentService is not actually deprecated; if it is, tell
me and I'll change this to a @deprecated tag!)
See first comment for doc stage location.
Test: make ds-docs
Bug:
64159987
Change-Id: I83a53d1e6336c2134bf4c61bedd2ae42cd80493a
TreeHugger Robot [Tue, 1 Aug 2017 02:21:21 +0000 (02:21 +0000)]
Merge "Add documentation on oneway transaction ordering." into oc-mr1-dev
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 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
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
Sundeep Ghuman [Tue, 1 Aug 2017 01:46:45 +0000 (18:46 -0700)]
Fix broken robotests.
In ag/
2580164 AccessPoint.java made a reference to WifiTracker, which
in term references WifiNetworkScoreCache. Since the Robolectric in the
platform still has not been updated to support API 26 (Android O), this
caused the test to break.
By definining the class in the test package, the test can be fixed until
proper Android O support is added to the robolectric prebuilts in the
platform code.
Bug:
64217019
Test: make -j40 RunSettingsLibRoboTests
Change-Id: I6cfd5c17d1aba98d43cca4828058493960a7ff79
Fyodor Kupolov [Tue, 1 Aug 2017 01:44:11 +0000 (18:44 -0700)]
Log package parse timings
Log time it takes to parse a package (parse=) and update the cache
(update_cache=), if time exceeds 100ms threshold.
This can be useful for analyzing bugreports of slow PM init post-OTA.
Test: manual
Bug:
62462279
Change-Id: I4099b21fae6a5db8c8f1cbc2147a33b9ee51767a
Adam Lesinski [Mon, 31 Jul 2017 20:42:00 +0000 (13:42 -0700)]
Refresh constants when MCC/MNC changes in PowerUI
The PowerUI in SystemUI decides whether to show high temperature
warnings to the user based on resources defined for mnc/mcc
configurations. PowerUI only loads the relevant constants once
at startup, meaning any SIM changes that come after the initialization
are not visible. Sometimes, these changes are the first initialization
of mnc/mcc.
PowerUI now listens to configuration changes and updates its internal
state when mnc/mcc changes occur.
Bug:
62845934
Test: manual (put SIM in device and reboot)
Change-Id: Id6a13017924f0367594aa29419aac59ac8b7c157
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
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
Makoto Onuki [Tue, 1 Aug 2017 00:42:33 +0000 (00:42 +0000)]
Revert "Reduce duplicate strings due to the package cache."
The pool is just broken.... I need to fix it and re-evaluate.
This reverts commit
e86a29c6e60a58ad42aeaa990d8ba665964dbe31.
Change-Id: I296df71e76ffff1d1d0fc8a50e3493e20c124a7b
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
Dianne Hackborn [Tue, 1 Aug 2017 00:38:53 +0000 (17:38 -0700)]
Fix issue #
64224738: Document return value of IBinder.transact()
Also add appropriate @NonNull and @Nullable annotations.
Test: built
Change-Id: I22de48105ef685baf594cfc004dd3e27e2ba09e9
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