OSDN Git Service
Philip P. Moltmann [Mon, 10 Jul 2017 19:07:54 +0000 (12:07 -0700)]
Verify regex on CharSequenceTransformation
... Also
- change the constructor of the Builder of this class
- Do not crash if the subsitutions for the regexes are invalid
Change-Id: I965d5830f4932eb40ec22d7fa308815955920a99
Bug:
62534917
Test: cts-tradefed run cts-dev -m CtsAutoFillServiceTestCases
Tor Norbye [Mon, 10 Jul 2017 19:43:12 +0000 (19:43 +0000)]
Merge "Add COMPANION_DEVICE_SERVICE to @ServiceName"
TreeHugger Robot [Mon, 10 Jul 2017 18:44:50 +0000 (18:44 +0000)]
Merge "Rate limit notification sounds/vibrations"
TreeHugger Robot [Mon, 10 Jul 2017 18:26:50 +0000 (18:26 +0000)]
Merge "Add missing resource when building in AAPT1"
TreeHugger Robot [Mon, 10 Jul 2017 17:59:36 +0000 (17:59 +0000)]
Merge "Hide some systemapi methods"
TreeHugger Robot [Mon, 10 Jul 2017 17:50:40 +0000 (17:50 +0000)]
Merge "Add "-g" option to run GC to "am dumpheap"."
Winson Chung [Mon, 10 Jul 2017 17:26:05 +0000 (17:26 +0000)]
Merge "Fix issue with PiP touch drift." into oc-dr1-dev am:
b544b81b53
am:
198ac8a2f3
Change-Id: I2aa29ed090509b22b9d895dbc991510b425cbc9b
Winson Chung [Mon, 10 Jul 2017 17:18:45 +0000 (17:18 +0000)]
Merge "Fix issue with PiP touch drift." into oc-dr1-dev
am:
b544b81b53
Change-Id: Idf6f88cb33aa9ba39c67f83419b18c03ef829ed2
Julia Reynolds [Mon, 10 Jul 2017 17:14:57 +0000 (17:14 +0000)]
Merge "Limit the number of notis an app can enqueue" into oc-dr1-dev am:
c65071d625
am:
8d4cd22ffb
Change-Id: I60ddda50a6d5a6a3028361435a340d6191f6c729
Winson Chung [Mon, 10 Jul 2017 17:12:35 +0000 (17:12 +0000)]
Merge "Fix issue with PiP touch drift." into oc-dr1-dev
Lucas Dupin [Mon, 10 Jul 2017 17:06:33 +0000 (17:06 +0000)]
Merge "Add theme style flag to WallpaperColors" into oc-dr1-dev am:
8b94ef697e
am:
a9682937b6
Change-Id: Id3a0cd1c34166f156d0c94b412ca7d9397e38672
Julia Reynolds [Mon, 10 Jul 2017 17:06:23 +0000 (17:06 +0000)]
Merge "Limit the number of notis an app can enqueue" into oc-dr1-dev
am:
c65071d625
Change-Id: I85e7117a88be1a629a953f1c721faba508d6d424
Lucas Dupin [Mon, 10 Jul 2017 16:58:46 +0000 (16:58 +0000)]
Merge "Add theme style flag to WallpaperColors" into oc-dr1-dev
am:
8b94ef697e
Change-Id: Ic63c9dc9963846afd2ab854630d56512059609d9
Julia Reynolds [Mon, 10 Jul 2017 16:55:01 +0000 (16:55 +0000)]
Merge "Limit the number of notis an app can enqueue" into oc-dr1-dev
Lucas Dupin [Mon, 10 Jul 2017 16:49:33 +0000 (16:49 +0000)]
Merge "Add theme style flag to WallpaperColors" into oc-dr1-dev
Julia Reynolds [Mon, 19 Jun 2017 12:16:04 +0000 (08:16 -0400)]
Rate limit notification sounds/vibrations
1 alert per second.
Bug:
36662487
Test: runtest systemui-notification
Change-Id: I42c2342c7ccb86f5912d729c7c2a0074f3000ad2
Julia Reynolds [Mon, 10 Jul 2017 16:35:31 +0000 (16:35 +0000)]
Merge "Rate limit notification sounds/vibrations" into oc-dr1-dev am:
00d83ea50f
am:
685525ed0a -s ours
Change-Id: I8a493d381a8f016ba1fe30e09e6624dc21f5c11c
Julia Reynolds [Mon, 10 Jul 2017 16:02:37 +0000 (16:02 +0000)]
Merge "Rate limit notification sounds/vibrations" into oc-dr1-dev
am:
00d83ea50f
Change-Id: I9228a7b79f4c8f438fceb462128d16eddda2b563
TreeHugger Robot [Mon, 10 Jul 2017 15:57:32 +0000 (15:57 +0000)]
Merge "Rate limit notification sounds/vibrations" into oc-dr1-dev
Makoto Onuki [Fri, 7 Jul 2017 21:58:58 +0000 (14:58 -0700)]
Add "-g" option to run GC to "am dumpheap".
Bug:
62144301
Test: manual test
Change-Id: I187e3acc3c3a97e6799192ab10b1bf16c7fee02f
TreeHugger Robot [Mon, 10 Jul 2017 15:01:52 +0000 (15:01 +0000)]
Merge "Allow splits to declare a classloader type."
TreeHugger Robot [Mon, 10 Jul 2017 15:01:07 +0000 (15:01 +0000)]
Merge "Allow setup apps to colorize notifications."
Neil Fuller [Mon, 10 Jul 2017 14:50:28 +0000 (14:50 +0000)]
Merge "Configure the package name of the updater app" am:
ed3e6d47ff am:
e293f7ee0d am:
fa04abb74e
am:
84fa8cb999
Change-Id: I1dc9af416b2b9faa2e4c36c474627c1e168e95ec
Neil Fuller [Mon, 10 Jul 2017 14:42:02 +0000 (14:42 +0000)]
Merge "Configure the package name of the updater app" am:
ed3e6d47ff am:
e293f7ee0d
am:
fa04abb74e
Change-Id: I8239ffae3bfd5b8414482c5e486f62af5b1bdf31
Bryce Lee [Mon, 10 Jul 2017 14:37:56 +0000 (14:37 +0000)]
Merge "Add app bounds to Configuration#compareTo." into oc-dr1-dev am:
649053810f
am:
31bf99946c
Change-Id: I502d823cb4f9089a1c460d8a810381fef7333b2d
Neil Fuller [Mon, 10 Jul 2017 14:33:52 +0000 (14:33 +0000)]
Merge "Configure the package name of the updater app" am:
ed3e6d47ff
am:
e293f7ee0d
Change-Id: I5cf0cabc7c7abbce7a9c1181f40706966cafebfb
Bryce Lee [Mon, 10 Jul 2017 14:30:25 +0000 (14:30 +0000)]
Merge "Add app bounds to Configuration#compareTo." into oc-dr1-dev
am:
649053810f
Change-Id: Ifc8c8e2df9296072f1c5746cff0bc005755b60a8
Neil Fuller [Mon, 10 Jul 2017 14:26:32 +0000 (14:26 +0000)]
Merge "Configure the package name of the updater app"
am:
ed3e6d47ff
Change-Id: I6de319392c50bd8d6de56144d11333d18701fcdb
Narayan Kamath [Mon, 10 Jul 2017 14:25:54 +0000 (14:25 +0000)]
Merge "SharedPreferencesImpl: Avoid pointless allocation during apply."
Bryce Lee [Mon, 10 Jul 2017 14:21:37 +0000 (14:21 +0000)]
Merge "Add app bounds to Configuration#compareTo." into oc-dr1-dev
Lorenzo Colitti [Mon, 10 Jul 2017 14:18:43 +0000 (14:18 +0000)]
Merge "Make failure to set addrgenmode a non-fatal error." am:
9c170157a8 am:
97e7afe8d0 am:
856a887361
am:
d8c0e9f2c5
Change-Id: Iae28dd9448ad6efdc51b80637ba9c9ce8bd66d43
Neil Fuller [Mon, 10 Jul 2017 14:14:46 +0000 (14:14 +0000)]
Merge "Configure the package name of the updater app"
Przemyslaw Szczepaniak [Mon, 10 Jul 2017 14:09:01 +0000 (14:09 +0000)]
Merge "Track libcore commit
2fd032687ba3d4d7f6af560482c5aba525584621" am:
c895fcef8f am:
03e304e4e8 am:
0d53000386
am:
193c7d05c8
Change-Id: I2f31a97b8392a1085b485eed831fc67a57dc46ba
Lorenzo Colitti [Mon, 10 Jul 2017 14:04:48 +0000 (14:04 +0000)]
Merge "Make failure to set addrgenmode a non-fatal error." am:
9c170157a8 am:
97e7afe8d0
am:
856a887361
Change-Id: Ide3e67921fb2f1751c74e03d05d7eb7b83d26dca
Neil Fuller [Mon, 10 Jul 2017 14:04:21 +0000 (14:04 +0000)]
Merge "Fix dumpsys output for staged install version" am:
7fc43b1fbd am:
d725e7aeab am:
e17e10a123
am:
b5e6e4ee86
Change-Id: I3a9daebb33791646e81506306edaadab445056eb
Przemyslaw Szczepaniak [Mon, 10 Jul 2017 14:02:33 +0000 (14:02 +0000)]
Merge "Track libcore commit
2fd032687ba3d4d7f6af560482c5aba525584621" am:
c895fcef8f am:
03e304e4e8
am:
0d53000386
Change-Id: I7e6064ba6d0b74584eec526d61ebb46abc02ad4f
Hugo Benichi [Mon, 10 Jul 2017 14:02:27 +0000 (14:02 +0000)]
Merge "CaptivePortalLogin ignores some ssl errors." am:
d56856876f -s ours am:
ae62bb1d41 am:
6393105afb
am:
f6f8090448
Change-Id: I1e3f872cf2d8d3550ccfecdd6a81be1bd8f4e530
Neil Fuller [Mon, 10 Jul 2017 13:55:46 +0000 (13:55 +0000)]
Merge "Fix dumpsys output for staged install version" am:
7fc43b1fbd am:
d725e7aeab
am:
e17e10a123
Change-Id: I49e05c4578478b893bc378e2a7b2f10e90727e89
Lorenzo Colitti [Mon, 10 Jul 2017 13:54:41 +0000 (13:54 +0000)]
Merge "Make failure to set addrgenmode a non-fatal error." am:
9c170157a8
am:
97e7afe8d0
Change-Id: Icadae1e993287fd54e3c5f96b6773d713b8a1e6e
Hugo Benichi [Mon, 10 Jul 2017 13:53:58 +0000 (13:53 +0000)]
Merge "CaptivePortalLogin ignores some ssl errors." am:
d56856876f -s ours am:
ae62bb1d41
am:
6393105afb
Change-Id: I76dac07dd54ee15992d59a1e75eff5f3c2de6c25
Przemyslaw Szczepaniak [Mon, 10 Jul 2017 13:52:37 +0000 (13:52 +0000)]
Merge "Track libcore commit
2fd032687ba3d4d7f6af560482c5aba525584621" am:
c895fcef8f
am:
03e304e4e8
Change-Id: I3aadaccd191e59046db1ac138da71bbbc0261811
Neil Fuller [Mon, 10 Jul 2017 13:48:50 +0000 (13:48 +0000)]
Merge "Fix dumpsys output for staged install version" am:
7fc43b1fbd
am:
d725e7aeab
Change-Id: Ic5fdbbcfed2d840a74b01443d9ba5806b52f4745
Hugo Benichi [Mon, 10 Jul 2017 13:47:15 +0000 (13:47 +0000)]
Merge "CaptivePortalLogin ignores some ssl errors." am:
d56856876f -s ours
am:
ae62bb1d41
Change-Id: I92eceaf2295c7209166444248f0b1a719bef5f21
Lorenzo Colitti [Mon, 10 Jul 2017 13:43:02 +0000 (13:43 +0000)]
Merge "Make failure to set addrgenmode a non-fatal error."
am:
9c170157a8
Change-Id: Ia4074f720ce0db69c86cd58ddc574d595cfceeee
Julia Reynolds [Wed, 5 Jul 2017 12:47:03 +0000 (08:47 -0400)]
Limit the number of notis an app can enqueue
In addition to the number they can post. Also decrease
the number of posts per second to 5, but allow finished
progress notifications through.
Fixes:
63173849
Fixes:
63167456
Test: runtests systemui-notification & simultaneously
downloading 5 files.
Change-Id: I0c8ea35b3d9d38b000ea5fe383515e1d5a26bac7
Przemyslaw Szczepaniak [Mon, 10 Jul 2017 13:40:49 +0000 (13:40 +0000)]
Merge "Track libcore commit
2fd032687ba3d4d7f6af560482c5aba525584621"
am:
c895fcef8f
Change-Id: I1aecc608b0eaa807489683526a9267003eb975b1
Neil Fuller [Mon, 10 Jul 2017 13:39:10 +0000 (13:39 +0000)]
Merge "Fix dumpsys output for staged install version"
am:
7fc43b1fbd
Change-Id: I14f5775c5347072365e0d84ad811078bf57c5855
Julia Reynolds [Mon, 19 Jun 2017 12:16:04 +0000 (08:16 -0400)]
Rate limit notification sounds/vibrations
1 alert per second.
Bug:
36662487
Test: runtest systemui-notification
Change-Id: I2046ae17b9e89ac0a83e182b91422fd242bc7557
Hugo Benichi [Mon, 10 Jul 2017 13:37:31 +0000 (13:37 +0000)]
Merge "CaptivePortalLogin ignores some ssl errors."
am:
d56856876f -s ours
Change-Id: I6e4b778a7ea4ca9425834ed37c7f2b59cf458186
Julia Reynolds [Fri, 30 Jun 2017 17:34:01 +0000 (13:34 -0400)]
Allow setup apps to colorize notifications.
Fixes:
63147379
Test: runtest systemui-notification, core tests
Change-Id: I2077a9fd563826d978d0dc01be89dd0bbc09eebf
Beverly Tai [Mon, 10 Jul 2017 12:59:18 +0000 (12:59 +0000)]
Merge "Clear all won't clear group notifs with no clear flag"
Treehugger Robot [Mon, 10 Jul 2017 12:15:47 +0000 (12:15 +0000)]
Merge "Make failure to set addrgenmode a non-fatal error."
Treehugger Robot [Mon, 10 Jul 2017 12:00:31 +0000 (12:00 +0000)]
Przemyslaw Szczepaniak [Tue, 4 Jul 2017 09:32:11 +0000 (10:32 +0100)]
Track libcore commit
2fd032687ba3d4d7f6af560482c5aba525584621
Test: Make
Bug:
62779247
Change-Id: I919df93b20e809f42a27225403e1549b763b0a60
Treehugger Robot [Mon, 10 Jul 2017 11:52:11 +0000 (11:52 +0000)]
Merge "Fix dumpsys output for staged install version"
Hugo Benichi [Mon, 10 Jul 2017 11:42:45 +0000 (11:42 +0000)]
Merge "CaptivePortalLogin ignores some ssl errors."
Adam Lesinski [Mon, 10 Jul 2017 11:22:06 +0000 (11:22 +0000)]
Merge "AAPT2: Bump version number to v2.18"
Adam Lesinski [Mon, 10 Jul 2017 11:19:28 +0000 (04:19 -0700)]
AAPT2: Bump version number to v2.18
Test: none
Change-Id: I6e3b4c95a7d7ba416ba368e5b19782dbffa04fd8
Paul Duffin [Mon, 10 Jul 2017 10:59:37 +0000 (10:59 +0000)]
Merge "Add android.test.mock to the optional runtime libraries"
Lorenzo Colitti [Mon, 10 Jul 2017 10:05:13 +0000 (19:05 +0900)]
Make failure to set addrgenmode a non-fatal error.
Bug:
17613910
Test: bullhead builds, boots, connects to wifi
Change-Id: I310dcacc6784c13904fca79b839b5f4d94bfc45e
Narayan Kamath [Mon, 10 Jul 2017 09:15:26 +0000 (10:15 +0100)]
SharedPreferencesImpl: Avoid pointless allocation during apply.
Test: make
Change-Id: I5ae03b5561b38e23af50764e17ac5ccfccc1b476
Hugo Benichi [Sat, 17 Jun 2017 04:36:35 +0000 (13:36 +0900)]
CaptivePortalLogin ignores some ssl errors.
This patch changes the ssl error handler of the captive portal login
activity to ignore errors for resources coming from a different hostname
that the top-level page currently loading.
This allows logging into misconfigured portals that incorrectly bans ssl
to some hostnames necessary for loading their portal login pages.
Bug:
62332137
Test: manually tested with captive portal entwork.
Change-Id: I05378ed74e678829e46fbeee18df916ec6ec2856
TreeHugger Robot [Mon, 10 Jul 2017 02:17:17 +0000 (02:17 +0000)]
Merge "PIP: Fix crash when the PIP menu activity is started by intent"
Erik Kline [Sat, 8 Jul 2017 07:36:40 +0000 (07:36 +0000)]
Merge "Add more logging to the Tethering SharedLog" am:
839cc0433f am:
0a76af09b1 am:
6999649f0d -s ours
am:
496623f0ad -s ours
Change-Id: Ibcc97d1f80b273757613a6ede257da3a34c7904c
Erik Kline [Sat, 8 Jul 2017 07:28:40 +0000 (07:28 +0000)]
Merge "Add more logging to the Tethering SharedLog" am:
839cc0433f am:
0a76af09b1
am:
6999649f0d -s ours
Change-Id: I690d3d30b2e71275700ee3176a5e103ca18a4cb1
Erik Kline [Sat, 8 Jul 2017 07:21:40 +0000 (07:21 +0000)]
Merge "Add more logging to the Tethering SharedLog" am:
839cc0433f
am:
0a76af09b1
Change-Id: Ie3bd8e8a5d8911303cead707e0485c78ea7d055c
Erik Kline [Sat, 8 Jul 2017 07:14:59 +0000 (07:14 +0000)]
Merge "Add more logging to the Tethering SharedLog"
am:
839cc0433f
Change-Id: Ibc2c9989ee9c5980003a60b43345baafc2cd3c0c
Treehugger Robot [Sat, 8 Jul 2017 07:06:09 +0000 (07:06 +0000)]
Merge "Add more logging to the Tethering SharedLog"
Fan Zhang [Fri, 7 Jul 2017 21:38:57 +0000 (14:38 -0700)]
Add missing resource when building in AAPT1
Bug:
36663882
Bug:
63450183
Test: global build
Change-Id: Id3cc8199e4572f4b5f733ea865f750b8600508bb
Sundeep Ghuman [Sat, 8 Jul 2017 03:18:43 +0000 (03:18 +0000)]
Merge "Change initial value of mStaleScanResults to true." into oc-dr1-dev am:
e72ec3cab2
am:
335a2d7e3c
Change-Id: I4b09fe0fbcecc562ced0ed2a6793b2ae87b0f731
Sundeep Ghuman [Sat, 8 Jul 2017 03:13:09 +0000 (03:13 +0000)]
Merge "Change initial value of mStaleScanResults to true." into oc-dr1-dev
am:
e72ec3cab2
Change-Id: If268b2db323fa52c92fccc1b259599a0be204b87
TreeHugger Robot [Sat, 8 Jul 2017 03:06:37 +0000 (03:06 +0000)]
Merge "Change initial value of mStaleScanResults to true." into oc-dr1-dev
TreeHugger Robot [Sat, 8 Jul 2017 02:10:13 +0000 (02:10 +0000)]
Merge "Add buffer-size parameter to FastXmlSerializer ctor"
Sundeep Ghuman [Wed, 5 Jul 2017 21:19:30 +0000 (14:19 -0700)]
Change initial value of mStaleScanResults to true.
In ag/
2409026 we introduced a stale scan result bit to prevent callbacks
from sticky broadcasts from occuring until we have fetched the latest
set of scan results. However, this initial value was set to false hence
there is a race condition in which the currently connected network can
still be shown without any other networks, as the scan results have not
yet been processed.
By changing the initial value to true, we address this race condition.
Bug: b/
62493360
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java
Change-Id: I5f2108e17d2c549e2176ccf64e640fbd4808b5f1
Lucas Dupin [Sat, 8 Jul 2017 00:33:40 +0000 (00:33 +0000)]
Merge "Moving color extraction classes" into oc-dr1-dev am:
456cb9603a
am:
bdda30f826 -s ours
Change-Id: Ice8eb59b11540040b3732855d8b83ca82bdec0ec
Lucas Dupin [Sat, 8 Jul 2017 00:26:50 +0000 (00:26 +0000)]
Merge "Moving color extraction classes" into oc-dr1-dev
am:
456cb9603a
Change-Id: I6e1d6a124f9937b06648859333290f643ccc0150
TreeHugger Robot [Sat, 8 Jul 2017 00:21:44 +0000 (00:21 +0000)]
Merge "Moving color extraction classes" into oc-dr1-dev
Winson Chung [Fri, 7 Jul 2017 21:49:49 +0000 (14:49 -0700)]
Fix issue with PiP touch drift.
- Fix issue with cumulative truncation of positions causing a large x/y
error causing drift. Instead of using the rounded stack position,
keep track of the cumulative delta and apply that on each move.
Bug:
62541932
Test: Pip activity, move around with finger and ensure no drift
Change-Id: Ic7737a6b19672ee8a1d98fd57f84a1d89f4a17e9
Christopher Tate [Fri, 7 Jul 2017 23:46:37 +0000 (16:46 -0700)]
Add buffer-size parameter to FastXmlSerializer ctor
Also increase the default internal buffer size from 8kb to 32kb. We
have evidence that we're incurring a fair bit of "extra" disk write load
in various common circumstances like SharedPreferences, and this should
help eliminate that.
Bug
63432101
Test: bit CtsContentTestCases:.SharedPreferencesTest
Change-Id: Iba4768262142555a279284b2ae70741424ee2184
Etan Cohen [Fri, 7 Jul 2017 23:34:00 +0000 (23:34 +0000)]
Merge "[AWARE] Fix close guard method name" into oc-dr1-dev am:
9aabf29541
am:
b6c183a6eb
Change-Id: I0f28c240cc474bf975e9b8b1ece8b5da20b57e11
Derek Tan [Fri, 7 Jul 2017 23:31:37 +0000 (23:31 +0000)]
Merge "Prevent any app except LPA to create logical channel to AID of ISD-R." into oc-dr1-dev am:
f1328fee0d
am:
0eba3cb020
Change-Id: I435e1a197b44eeff8b7453e2b9f88e9a901c285d
TreeHugger Robot [Fri, 7 Jul 2017 23:28:10 +0000 (23:28 +0000)]
Merge "Bit: support running all tests in a java package."
Wale Ogunwale [Fri, 7 Jul 2017 23:24:40 +0000 (23:24 +0000)]
Merge "Don't remove starting window for visible app." into oc-dr1-dev am:
d4b83f96f8
am:
654f917c17
Change-Id: I492ab4b9f28edc65fcd2b60c7d314fe8462437b2
Etan Cohen [Fri, 7 Jul 2017 23:21:05 +0000 (23:21 +0000)]
Merge "[AWARE] Fix close guard method name" into oc-dr1-dev
am:
9aabf29541
Change-Id: Ibdf4c9f91a41ba68c2d5ece4615a12e101638471
Derek Tan [Fri, 7 Jul 2017 23:18:54 +0000 (23:18 +0000)]
Merge "Prevent any app except LPA to create logical channel to AID of ISD-R." into oc-dr1-dev
am:
f1328fee0d
Change-Id: I8646c7983330beaf90f7935d01675f33df2bf7ef
Wale Ogunwale [Fri, 7 Jul 2017 23:17:26 +0000 (23:17 +0000)]
Merge "Don't remove starting window for visible app." into oc-dr1-dev
am:
d4b83f96f8
Change-Id: I0be58fbdffafd87919fe259914af3855e3768b0f
Etan Cohen [Fri, 7 Jul 2017 23:13:34 +0000 (23:13 +0000)]
Merge "[AWARE] Fix close guard method name" into oc-dr1-dev
Derek Tan [Fri, 7 Jul 2017 23:12:44 +0000 (23:12 +0000)]
Merge "Prevent any app except LPA to create logical channel to AID of ISD-R." into oc-dr1-dev
Wale Ogunwale [Fri, 7 Jul 2017 23:09:55 +0000 (23:09 +0000)]
Merge "Don't remove starting window for visible app." into oc-dr1-dev
TreeHugger Robot [Fri, 7 Jul 2017 23:01:33 +0000 (23:01 +0000)]
Merge "AAPT2: Fix processing of quotes in XML"
TreeHugger Robot [Fri, 7 Jul 2017 23:00:05 +0000 (23:00 +0000)]
Merge "AAPT2: Accept Java unicode identifiers"
TreeHugger Robot [Fri, 7 Jul 2017 22:33:29 +0000 (22:33 +0000)]
Merge "Revert "Change initial value of mStaleScanResults to false.""
TreeHugger Robot [Fri, 7 Jul 2017 22:21:21 +0000 (22:21 +0000)]
Merge "Use a separate lock object instead of mSpellCheckerMap"
Xiangyu/Malcolm Chen [Fri, 7 Jul 2017 22:16:32 +0000 (22:16 +0000)]
Merge "Provide materials for Mobile network settings UI."
TreeHugger Robot [Fri, 7 Jul 2017 22:06:54 +0000 (22:06 +0000)]
Merge "Moving color extraction classes"
Amith Yamasani [Fri, 7 Jul 2017 21:54:31 +0000 (21:54 +0000)]
Merge "Add logging for unusually long read times" into oc-dr1-dev am:
2a8a58ea98
am:
6a4ab438b9
Change-Id: I4d4ba6681ebda8ba7bfe0ca9117243377b53478a
Amith Yamasani [Fri, 7 Jul 2017 21:50:29 +0000 (21:50 +0000)]
Merge "Add logging for unusually long read times" into oc-dr1-dev
am:
2a8a58ea98
Change-Id: Ic043ad8fd15aac4583be3944190b52f3e914c6d7
Kouji Shiotani [Fri, 7 Jul 2017 21:46:11 +0000 (21:46 +0000)]
Merge "Fix wrong array index bound in NotificationUsageStats" am:
87e893a449 am:
1249e0a1b0 am:
03f4ddb1b2
am:
41369279a2
Change-Id: I067a46e3c4937c5cc3713d1f4080975ff8aa3698
TreeHugger Robot [Fri, 7 Jul 2017 21:43:46 +0000 (21:43 +0000)]
Merge "Add logging for unusually long read times" into oc-dr1-dev
Kouji Shiotani [Fri, 7 Jul 2017 21:39:39 +0000 (21:39 +0000)]
Merge "Fix wrong array index bound in NotificationUsageStats" am:
87e893a449 am:
1249e0a1b0
am:
03f4ddb1b2
Change-Id: Iafd1e341d6e1054453bf1db6d880abe227fac631