OSDN Git Service
TreeHugger Robot [Fri, 19 Jan 2018 06:08:23 +0000 (06:08 +0000)]
Merge "Camera: Update MOTION_TRACKING requirements"
TreeHugger Robot [Fri, 19 Jan 2018 05:51:43 +0000 (05:51 +0000)]
Merge "Add 4 new fields to KeychainSnapshot"
Android Build Merger (Role) [Fri, 19 Jan 2018 05:36:48 +0000 (05:36 +0000)]
Merge "Merge "Fixing app compat issue b/
72143978" am:
8353a39ecc am:
61bab24fa8 am:
1993c5618a"
Ian Pedowitz [Fri, 19 Jan 2018 05:35:27 +0000 (05:35 +0000)]
Merge "Fixing app compat issue b/
72143978" am:
8353a39ecc am:
61bab24fa8
am:
1993c5618a
Change-Id: If6e67a008d02dc561982583a3819de1ef3e06e46
Android Build Merger (Role) [Fri, 19 Jan 2018 05:30:31 +0000 (05:30 +0000)]
Merge "Merge "HIDL: Check error value." am:
898137f817 am:
74426e9c2d am:
b9b7bfb02f"
Steven Moreland [Fri, 19 Jan 2018 05:30:07 +0000 (05:30 +0000)]
Merge "HIDL: Check error value." am:
898137f817 am:
74426e9c2d
am:
b9b7bfb02f
Change-Id: I2b1506eee7c7a5f9557029abd2013c3b2ae0c523
TreeHugger Robot [Fri, 19 Jan 2018 05:27:46 +0000 (05:27 +0000)]
Merge "StaticLayoutPerfTest: Use fixed seed in each test case"
Jeff Sharkey [Fri, 19 Jan 2018 05:25:20 +0000 (05:25 +0000)]
Merge "Add ability to override subscriber capabilities." am:
d6cd4b241a am:
5e097d452b
am:
992cfa2667
Change-Id: I46a6c87751494afca6fdd13736d7a4877e3cc833
Dan Zhang [Fri, 19 Jan 2018 05:21:12 +0000 (05:21 +0000)]
Merge "Fix <Report Audio Status> update" am:
1d5e2c3c37 am:
e7aaba48de
am:
4775f0c76e
Change-Id: I98074b58c0b9def3d766c40ac2c5bc669a2abd0f
Dan Zhang [Fri, 19 Jan 2018 05:17:09 +0000 (05:17 +0000)]
Merge "Fix OTP performance with no Vendor ID device" am:
6ecaac4c9f am:
b88d9b4593
am:
0f279d4577
Change-Id: I0f8bb0736384cafd60180e658ecbe08a464db8d4
Dan Zhang [Fri, 19 Jan 2018 05:13:10 +0000 (05:13 +0000)]
Merge "Fix NPE by pressing Volume Up/Down" am:
fca5ee0bb8 am:
bd57a4d8a1
am:
cc07fa73a1
Change-Id: I95d710489a0ad87c6e3811603097e5438f11f413
Dan Zhang [Fri, 19 Jan 2018 05:09:15 +0000 (05:09 +0000)]
Merge "Fix illegal volume value issue" am:
20443a8dbb am:
65dd4cbf32
am:
3a05ecd714
Change-Id: I64f27d734dc93c036b4f8bd1ecf3088821b92a75
TreeHugger Robot [Fri, 19 Jan 2018 05:03:27 +0000 (05:03 +0000)]
Merge "Revert the field number change to make statsd_config proto backward-compatible."
TreeHugger Robot [Fri, 19 Jan 2018 05:02:18 +0000 (05:02 +0000)]
Merge "Temporary use hardcoded counterId."
TreeHugger Robot [Fri, 19 Jan 2018 04:58:29 +0000 (04:58 +0000)]
Merge "resolve merge conflicts of
f761f6371a0350bd8d62e97d14cce869a5039572 to master"
Ian Pedowitz [Fri, 19 Jan 2018 04:21:35 +0000 (04:21 +0000)]
Merge "Fixing app compat issue b/
72143978" am:
8353a39ecc
am:
61bab24fa8
Change-Id: I6f07f1d9cfd26aa8b93a2563349b5e40effb7a41
TreeHugger Robot [Fri, 19 Jan 2018 04:19:23 +0000 (04:19 +0000)]
Merge "camera: Add external flash mode key"
Ian Pedowitz [Fri, 19 Jan 2018 04:13:00 +0000 (04:13 +0000)]
Merge "Fixing app compat issue b/
72143978"
am:
8353a39ecc
Change-Id: I4ca60a29aec20f08c65d85b03a080a19d03c7345
TreeHugger Robot [Fri, 19 Jan 2018 03:37:25 +0000 (03:37 +0000)]
Merge "Ignore missing font in fontchain_linter.py"
TreeHugger Robot [Fri, 19 Jan 2018 03:36:02 +0000 (03:36 +0000)]
Merge "Make NotificationShelf nullable in StackScrollAlgorithm."
TreeHugger Robot [Fri, 19 Jan 2018 03:31:56 +0000 (03:31 +0000)]
Merge "Fix bug in statsd with uid memory guardrail"
Steven Moreland [Fri, 19 Jan 2018 03:21:45 +0000 (03:21 +0000)]
Merge "HIDL: Check error value." am:
898137f817
am:
74426e9c2d
Change-Id: Iadcd6a9264e0771aa6d9fe62cca221f2391f2d12
TreeHugger Robot [Fri, 19 Jan 2018 03:19:36 +0000 (03:19 +0000)]
Merge "Calc job standby runnability based on last job execution..."
Steven Moreland [Fri, 19 Jan 2018 03:15:30 +0000 (03:15 +0000)]
Merge "HIDL: Check error value."
am:
898137f817
Change-Id: I838c21cc0c423d41e980a360967a2773238dff81
Dmitry Dementyev [Fri, 19 Jan 2018 00:44:08 +0000 (16:44 -0800)]
Add 4 new fields to KeychainSnapshot
The fields are necessary to construct correct arguments for recovery session.
maxAttempts
counterId
serverParams
trustedHardwarePublicKey
Bug:
66499222
Test: adb shell am instrument -w -e package \
com.android.server.locksettings.recoverablekeystore \
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: If8fbc2e0a313d4367712e3598925eab0fb334258
TreeHugger Robot [Fri, 19 Jan 2018 02:53:30 +0000 (02:53 +0000)]
Merge "Put statsd on system-background cpu set."
Dmitry Dementyev [Fri, 19 Jan 2018 00:57:01 +0000 (16:57 -0800)]
Temporary use hardcoded counterId.
Bug:
66499222
Test: adb shell am instrument -w -e package \
com.android.server.locksettings.recoverablekeystore \
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I0f387e6a424f24de340276fc45cfaddb3529a715
Treehugger Robot [Fri, 19 Jan 2018 02:38:33 +0000 (02:38 +0000)]
Merge "Fixing app compat issue b/
72143978"
TreeHugger Robot [Fri, 19 Jan 2018 02:32:46 +0000 (02:32 +0000)]
Merge "Added new SIM state related broadcasts."
Arthur Hsu [Fri, 19 Jan 2018 02:30:23 +0000 (18:30 -0800)]
resolve merge conflicts of
f761f6371a0350bd8d62e97d14cce869a5039572 to
master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I095f92ed3607616a7147a23f1fd9cd65b72e921b
TreeHugger Robot [Fri, 19 Jan 2018 02:10:46 +0000 (02:10 +0000)]
Merge "Add back missing synchronized in stopGuestOrEphemeralUserIfBackground"
TreeHugger Robot [Fri, 19 Jan 2018 01:55:27 +0000 (01:55 +0000)]
Merge "Modify IHealthInfoCallback interface to return V2.0 HealthInfo"
TreeHugger Robot [Fri, 19 Jan 2018 01:48:10 +0000 (01:48 +0000)]
Merge "Fix RecoverableKeyStore unit tests."
Treehugger Robot [Fri, 19 Jan 2018 01:41:08 +0000 (01:41 +0000)]
Merge "HIDL: Check error value."
Dake Gu [Fri, 19 Jan 2018 01:32:47 +0000 (01:32 +0000)]
Merge "leanback janktest: use extra to initialize fastlane state"
TreeHugger Robot [Fri, 19 Jan 2018 01:26:41 +0000 (01:26 +0000)]
Merge "Center backspace key ripple in pin keyguard"
TreeHugger Robot [Fri, 19 Jan 2018 01:26:21 +0000 (01:26 +0000)]
Merge "condition dimension query."
TreeHugger Robot [Fri, 19 Jan 2018 01:24:40 +0000 (01:24 +0000)]
Merge changes from topic "shadow-in-app"
* changes:
Remove DragDropController#prepareDrag()
Create a drag shadow surface in app process,
Seigo Nonaka [Fri, 19 Jan 2018 01:24:31 +0000 (17:24 -0800)]
Ignore missing font in fontchain_linter.py
It is totally valid if the font is missing even if the font is listed in
fonts.xml. Android Watch has less fonts and OEM vendor may reduce the
font files.
Bug:
72159040
Test: m fontchain_lint
Change-Id: I22bdf7bfeb6d80a2a338ebf7536c8eaf193b03c5
Steven Thomas [Fri, 19 Jan 2018 01:19:44 +0000 (01:19 +0000)]
Merge "Fix missing service call when rebinding to VrCore"
Jeff Sharkey [Fri, 19 Jan 2018 01:11:41 +0000 (01:11 +0000)]
Merge "Add ability to override subscriber capabilities." am:
d6cd4b241a
am:
5e097d452b
Change-Id: Ib22d57c7cde75560cfd5bdd71b75d29b1056f783
Jeff Sharkey [Fri, 19 Jan 2018 01:04:32 +0000 (01:04 +0000)]
Merge "Add ability to override subscriber capabilities."
am:
d6cd4b241a
Change-Id: Id035d437e9b297ba70ba9231f6cfdd44e5b9c257
TreeHugger Robot [Fri, 19 Jan 2018 01:03:55 +0000 (01:03 +0000)]
Merge "Treat missing font in fallback chain"
TreeHugger Robot [Fri, 19 Jan 2018 01:00:00 +0000 (01:00 +0000)]
Merge "AAPT2: Store BinaryPrimatives in protos as oneofs"
TreeHugger Robot [Fri, 19 Jan 2018 00:53:49 +0000 (00:53 +0000)]
Merge "Add semantics for accessibility headings"
Bo Zhu [Fri, 19 Jan 2018 00:44:40 +0000 (00:44 +0000)]
Merge "Change packVaultParams to use the real vault_handle directly"
Yangster-mac [Fri, 19 Jan 2018 00:40:57 +0000 (16:40 -0800)]
Revert the field number change to make statsd_config proto backward-compatible.
Test: statsd unit test passed.
Change-Id: I28b28c0706d35da3617ec9dba4c5bfeb2527befc
TreeHugger Robot [Fri, 19 Jan 2018 00:37:42 +0000 (00:37 +0000)]
Merge "Update the dimension_in_what/condition field number."
Yao Chen [Fri, 19 Jan 2018 00:37:10 +0000 (16:37 -0800)]
Put statsd on system-background cpu set.
Bug:
72176997
Test: manual
Change-Id: Ic160dc8ffea8fd349185ad8b583e6c02dc7defa6
TreeHugger Robot [Fri, 19 Jan 2018 00:35:58 +0000 (00:35 +0000)]
Merge "GnssMeasurementsListener - Fix indexing, add & remove"
Yao Chen [Fri, 19 Jan 2018 00:27:36 +0000 (00:27 +0000)]
Merge "Revert "Enable init.rc for statsd to start statsd by default in boot time""
Ian Pedowitz [Fri, 19 Jan 2018 00:24:11 +0000 (16:24 -0800)]
Fixing app compat issue b/
72143978
Revert "Remove obsolete workaround."
This reverts commit
5e48241a95b843c10f96c57d8544af9d04807218.
Bug:
72143978
Bug:
24465209
Test: Tested failing case on sailfish, reverted back all CL's since
Test:
3471433 for b/
24465209 and apps open
TreeHugger Robot [Fri, 19 Jan 2018 00:23:33 +0000 (00:23 +0000)]
Merge "Set ActivityView's rect as tap exclude region"
Yao Chen [Fri, 19 Jan 2018 00:12:18 +0000 (00:12 +0000)]
Revert "Enable init.rc for statsd to start statsd by default in boot time"
This reverts commit
56967528d7bcc7a1342d68f19e0ffa79f2a1ed59.
Change-Id: I4b76bf5783f0df43603e82168009f33296d1f840
Christopher Tate [Thu, 18 Jan 2018 20:59:15 +0000 (12:59 -0800)]
Calc job standby runnability based on last job execution...
...not unilaterally on the current time of day. In practice, the point
is that we should let an app run new jobs immediately if it's been a long
time since it ran any, even if it's in a less-active standby bucket,
because it's being a good citizen.
Bug:
63527785
Test: atest CtsJobSchedulerTestCases
Change-Id: I1521c82f23341246484efa733c43f983a5e9e568
Dan Zhang [Fri, 19 Jan 2018 00:05:48 +0000 (00:05 +0000)]
Merge "Fix <Report Audio Status> update" am:
1d5e2c3c37
am:
e7aaba48de
Change-Id: I6f7314a01386aff883992d7f4b32bb9bb0500555
David Chen [Fri, 19 Jan 2018 00:02:42 +0000 (16:02 -0800)]
Fix bug in statsd with uid memory guardrail
Previously unsigned a negative number to unsigned type, so the int
comparison didn't work as planned.
Test: Manually tested and observed log messages.
Change-Id: Ic72c4dbde5e560288fd64ca11c4bcc81021fb1a9
Felipe Leme [Fri, 19 Jan 2018 00:01:25 +0000 (00:01 +0000)]
Merge "Fixed method name that was changed in a previous CL."
TreeHugger Robot [Fri, 19 Jan 2018 00:01:04 +0000 (00:01 +0000)]
Merge "Add factory for TaskPositioner."
Dan Zhang [Thu, 18 Jan 2018 23:59:12 +0000 (23:59 +0000)]
Merge "Fix <Report Audio Status> update"
am:
1d5e2c3c37
Change-Id: Iac3e1fe3f93c376ccc35e29d611067fb0ad8a8fc
Jeff Sharkey [Thu, 18 Jan 2018 23:58:30 +0000 (23:58 +0000)]
Merge "Add ability to override subscriber capabilities."
Felipe Leme [Thu, 18 Jan 2018 23:57:18 +0000 (15:57 -0800)]
Fixed method name that was changed in a previous CL.
Bug:
70939974
Test: nope, build is broken, must fix ASAP
Change-Id: I88cf6ccacb5baa097cea26c859b774738bd9b428
Tarandeep Singh [Thu, 18 Jan 2018 23:51:17 +0000 (23:51 +0000)]
Merge "Optimize calls to IME's onStartInput"
Doris Liu [Thu, 18 Jan 2018 23:38:49 +0000 (23:38 +0000)]
Merge "Expose some hidden APIs in Choreographer to CTS"
TreeHugger Robot [Thu, 18 Jan 2018 23:34:00 +0000 (23:34 +0000)]
Merge "Implemented shell cmd to get field classification score."
Felipe Leme [Thu, 18 Jan 2018 23:33:44 +0000 (23:33 +0000)]
Merge "Moved Field Classification score logic to ExtServices."
Dmitry Dementyev [Thu, 18 Jan 2018 22:29:49 +0000 (14:29 -0800)]
Fix RecoverableKeyStore unit tests.
Bug:
66499222
Test: adb shell am instrument -w -e package \
com.android.server.locksettings.recoverablekeystore \
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I19aeb444e2f99f698cd1f9dfa13215093f5230da
Leif Wilden [Thu, 18 Jan 2018 23:27:37 +0000 (23:27 +0000)]
Merge "Ensure keyguard is considered unlocked on devices that disable it."
Dan Zhang [Thu, 18 Jan 2018 23:20:44 +0000 (23:20 +0000)]
Merge "Fix OTP performance with no Vendor ID device" am:
6ecaac4c9f
am:
b88d9b4593
Change-Id: Iaaa8b0ebfa73f5567dc4dfc84d23ed47bb0c3827
Seigo Nonaka [Thu, 18 Jan 2018 23:08:53 +0000 (15:08 -0800)]
StaticLayoutPerfTest: Use fixed seed in each test case
Bug: None
Test: run StaticLayoutPerfTest
Change-Id: I49610b8098d67097569091e18d87eafb9911049b
Dan Zhang [Thu, 18 Jan 2018 23:16:49 +0000 (23:16 +0000)]
Merge "Fix NPE by pressing Volume Up/Down" am:
fca5ee0bb8
am:
bd57a4d8a1
Change-Id: I23595e55b5c38cecb39272f7c739c27abe1eddb3
Ng Zhi An [Wed, 17 Jan 2018 01:52:58 +0000 (17:52 -0800)]
Center backspace key ripple in pin keyguard
Bug:
71959475
Test: manual
Change-Id: Ib51cdefd8257bd9a9f0c544e177c12cb23614aa8
Makoto Onuki [Thu, 18 Jan 2018 23:10:54 +0000 (23:10 +0000)]
Merge "Revert "Add setting/experiment for small battery devices to have""
Dan Zhang [Thu, 18 Jan 2018 23:10:01 +0000 (23:10 +0000)]
Merge "Fix illegal volume value issue" am:
20443a8dbb
am:
65dd4cbf32
Change-Id: I2ab3578a84ed128e60b2c0329db0ed77af331bba
Dan Zhang [Thu, 18 Jan 2018 23:09:43 +0000 (23:09 +0000)]
Merge "Fix OTP performance with no Vendor ID device"
am:
6ecaac4c9f
Change-Id: I776ac55ca48cb9d463f4abe087c71b362ce5327d
Dan Zhang [Thu, 18 Jan 2018 23:06:49 +0000 (23:06 +0000)]
Merge "Fix NPE by pressing Volume Up/Down"
am:
fca5ee0bb8
Change-Id: I2f35ed23478b10339a9924593411e02da77207ec
TreeHugger Robot [Thu, 18 Jan 2018 23:04:06 +0000 (23:04 +0000)]
Merge "Don't use transport binder with the lock held"
Dan Zhang [Thu, 18 Jan 2018 23:03:28 +0000 (23:03 +0000)]
Merge "Fix illegal volume value issue"
am:
20443a8dbb
Change-Id: I94140f9e65e74df17053aa8824569ed8df2637a1
Mehdi Alizadeh [Thu, 18 Jan 2018 23:00:03 +0000 (23:00 +0000)]
Merge changes from topic "surface_num_clients_soft_ap"
* changes:
Adds unregisterSoftApCallback API
Unit tests for registerSoftApCallback API
Adds API to register callback for soft AP event
Yangster-mac [Tue, 16 Jan 2018 07:20:44 +0000 (23:20 -0800)]
condition dimension query.
Test: Modified the metric link test to query a subset of the predicate/condition dimensions.
Change-Id: I693f14e0b11693fc8ee0bf4fc550977c20d31f71
TreeHugger Robot [Thu, 18 Jan 2018 22:51:34 +0000 (22:51 +0000)]
Merge "Use LinkedHashMap on CharSequenceTransformation to keep order of insertions."
Mohamed Abdalkader [Thu, 18 Jan 2018 22:51:27 +0000 (22:51 +0000)]
Merge "Move Sms API to proper MMTelFeature class"
Amit Mahajan [Sat, 13 Jan 2018 01:40:29 +0000 (17:40 -0800)]
Added new SIM state related broadcasts.
Test: Basic telephony sanity and unit tests
Bug:
64131518
Change-Id: Ie3d157e79a7040c161b9038c875a4a4f49d535ff
Bo Zhu [Thu, 18 Jan 2018 19:53:57 +0000 (11:53 -0800)]
Change packVaultParams to use the real vault_handle directly
Test: adb shell am instrument -w -e package
com.android.server.locksettings.recoverablekeystore
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I5ebe28fddba3d3939a105c696250f3ea68720822
Dake Gu [Thu, 18 Jan 2018 22:24:45 +0000 (14:24 -0800)]
leanback janktest: use extra to initialize fastlane state
faster and less problem.
Bug:
71904218
Test: adb shell am instrument -w -e class
com.android.uibench.janktests.UiBenchLeanbackJankTests#testBrowseContentScroll
com.android.uibench.janktests/android.test.InstrumentationTestRunner
Change-Id: I4a5c2e0b993f3dc5f678e7b29b2b7e10b7792fe4
Steven Thomas [Thu, 7 Dec 2017 03:41:07 +0000 (19:41 -0800)]
Fix missing service call when rebinding to VrCore
When rebinding to VrCore after a VrCore crash we weren't calling
onCurrentVrActivityChanged().
Bug: b/
69839187
Test: Went through the repro steps in b/
69839187 and confirmed we
successfully recover after VrCore dies and is rebound.
Change-Id: Idbd7acb438e8b7754743c5ccaaa68b4e0a686d33
(cherry picked from commit
d03fa742c2f29330d138ba6e2241f13eb527b9b5)
Dan Zhang [Thu, 18 Jan 2018 22:16:39 +0000 (22:16 +0000)]
Merge "Fix <Report Audio Status> update"
Dan Zhang [Thu, 18 Jan 2018 22:16:23 +0000 (22:16 +0000)]
Merge "Fix OTP performance with no Vendor ID device"
Dan Zhang [Thu, 18 Jan 2018 22:15:39 +0000 (22:15 +0000)]
Merge "Fix NPE by pressing Volume Up/Down"
Yangster-mac [Thu, 18 Jan 2018 21:18:01 +0000 (13:18 -0800)]
Update the dimension_in_what/condition field number.
Test: statsd unit test passed.
Change-Id: I11aa8a5cfc3bce703cf5ed0d9696d1949df449f0
Phil Weaver [Tue, 9 Jan 2018 01:42:18 +0000 (17:42 -0800)]
Add semantics for accessibility headings
Adding the ability to mark TextView as a heading, and
to provide a heading depth. Plumbing that through to
accessibility services.
Bug:
34687453
Test: Adding CTS tests for new APIs.
Change-Id: I5262e32a2a11b2577802c68e701d2856e28abc21
Makoto Onuki [Thu, 18 Jan 2018 21:44:28 +0000 (21:44 +0000)]
Revert "Add setting/experiment for small battery devices to have"
This reverts commit
9a60382be1d94e1143cdd16576db774126193798.
Reason for revert: Broke battery saver
Bug:
72168928
Bug:
69259147
Change-Id: I09664653686a51c297224c863c4fc6d1ff7e5caf
Test: Manual test
Test: atest CtsBatterySavingTestCases
TreeHugger Robot [Thu, 18 Jan 2018 21:58:38 +0000 (21:58 +0000)]
Merge "Add time until Night Light is on/off as secondary label"
TreeHugger Robot [Thu, 18 Jan 2018 21:58:06 +0000 (21:58 +0000)]
Merge "Move a shared pointer that's going to die anyway."
Dan Zhang [Thu, 18 Jan 2018 21:50:10 +0000 (21:50 +0000)]
Merge "Fix illegal volume value issue"
Jeff Sharkey [Thu, 18 Jan 2018 13:01:59 +0000 (22:01 +0900)]
Add ability to override subscriber capabilities.
In a future set of CLs, NPMS will offer to override a handful of
capabilities on a per-subId basis. Define a no-op version of the
interface to make it easier to add new methods in the future.
Test: bit FrameworksNetTests:android.net.,com.android.server.net.
Test: bit FrameworksTelephonyTests:com.android.internal.telephony.dataconnection.DataConnectionTest
Bug:
64133169
Change-Id: I03dfd98463861f0338c4174e8d8a88c300ea5b55
Tarandeep Singh [Fri, 12 Jan 2018 22:58:59 +0000 (14:58 -0800)]
Optimize calls to IME's onStartInput
As of today onStartInput is called for every window which gains focus. We
can significantly optimize this by restricting calls only to windows
that have a text editor. However, if input was already started based on
window flags, behavior is unchanged.
This behavior is guarded by debug flag "debug.optimize_startinput" and
is defaulted to true.
Bug:
37617707
Test: atest CtsInputMethodTestCases
Test: Verify following command reverts the behavior: adb root && adb
shell setprop debug.optimize_startinput false &&
adb shell cmd input_method refresh_debug_options
Change-Id: Ibf9dab3d9c138b5f04e053d41ee4fd248c78e4da
TreeHugger Robot [Thu, 18 Jan 2018 21:30:13 +0000 (21:30 +0000)]
Merge "Fix crash in EditText#getText"
Ningyuan Wang [Thu, 18 Jan 2018 21:20:51 +0000 (21:20 +0000)]
Merge "Remove wifi_allow_scan_with_traffic"
Arthur Hsu [Thu, 18 Jan 2018 21:19:41 +0000 (21:19 +0000)]
Merge "Add config_supportBluetoothPersistedState." am:
524fe66549
am:
171b8f366a
Change-Id: If1f43a76c6ade2dd2ba82f0057aa528d4624981c