OSDN Git Service
Lei Yu [Tue, 25 Jul 2017 20:48:02 +0000 (20:48 +0000)]
Merge "Add anomaly detection method to AnomalyUtils" into oc-dr1-dev
jackqdyulei [Fri, 21 Jul 2017 19:18:33 +0000 (12:18 -0700)]
Add anomaly detection method to AnomalyUtils
So we could reuse it in different loaders.
Bug:
63900914
Test: robotests still pass
Change-Id: I038085f53b9d0a05b8c4849c7544567434885821
Bartosz Fabianowski [Tue, 25 Jul 2017 10:14:50 +0000 (10:14 +0000)]
Merge "Fix "max failed login attempts" disclosure" into oc-dr1-dev
Kevin Chyn [Tue, 25 Jul 2017 05:31:53 +0000 (05:31 +0000)]
Merge "Fingerprint swipe settings and suggestions should not show if hardware unavailable" into oc-dr1-dev
Kevin Chyn [Thu, 20 Jul 2017 07:15:44 +0000 (00:15 -0700)]
Fingerprint swipe settings and suggestions should not show if hardware unavailable
Fixes:
63589121
Test: remove FP driver, make sure swipe setting and suggestions
don't show anymore && make -j RunSettingsRoboTests
Merged-In: I2539128daff8df52d040606141f772fc9edffa57
Change-Id: I2539128daff8df52d040606141f772fc9edffa57
Kevin Chyn [Mon, 24 Jul 2017 21:00:18 +0000 (14:00 -0700)]
Default-off FP Swipe
Fixes:
63992836
Test: adb shell settings delete secure system_navigation_keys_enabled
&& make -j RunSettingsRoboTests
Change-Id: I3245c7b8844df5edaea311c1871b1dd05b8b7784
Lei Yu [Mon, 24 Jul 2017 17:56:35 +0000 (17:56 +0000)]
Merge "Add log for anomaly." into oc-dr1-dev
Andrew Sapperstein [Sat, 22 Jul 2017 23:22:49 +0000 (16:22 -0700)]
Add ResultPayload for always-on ambient display.
Bug:
62022517
Test: robotest
Change-Id: Ib6382030ffa0c159ab6ca4b45dd966ee9287181f
Merged-In: Ib4ee4d8d999e5a1f9edf34ea6068644b41fc4838
TreeHugger Robot [Sat, 22 Jul 2017 17:54:31 +0000 (17:54 +0000)]
Merge "Reindex db when package w/ searchIndexProvider changes" into oc-dr1-dev
TreeHugger Robot [Sat, 22 Jul 2017 16:25:35 +0000 (16:25 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Sat, 22 Jul 2017 10:57:25 +0000 (03:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0dbb4c3f5c88953469428df5ac70973d18e253ba
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
TreeHugger Robot [Sat, 22 Jul 2017 00:28:31 +0000 (00:28 +0000)]
Merge "Add help uri for process stats summary and apps." into oc-dr1-dev
Andrew Sapperstein [Fri, 21 Jul 2017 22:01:55 +0000 (15:01 -0700)]
Add help uri for process stats summary and apps.
Bug:
62903521
Test: manual
Change-Id: I55cdb061d79232676d4064677bd7f5936700e8b7
Fan Zhang [Fri, 21 Jul 2017 21:41:29 +0000 (21:41 +0000)]
Merge "Tweak bluetooth name preference" into oc-dr1-dev
Lei Yu [Fri, 21 Jul 2017 20:28:01 +0000 (20:28 +0000)]
Merge "Make anomaly item refresh in battery" into oc-dr1-dev
Fan Zhang [Fri, 21 Jul 2017 00:05:01 +0000 (17:05 -0700)]
Reindex db when package w/ searchIndexProvider changes
We do this by tracking a list of package/version that provides search
indexing data. When they change, we do a full reindex.
Change-Id: I85d4c4a994c7ff808662371c857cac1929a8b1cd
Merged-In: I906a1524f5b1292932f63727d605283ddb7d6ee2
Bug:
63903835
Test: robotests
TreeHugger Robot [Fri, 21 Jul 2017 20:03:41 +0000 (20:03 +0000)]
Merge "Switch to using gray icon for Bluetooth imaging devices" into oc-dr1-dev
jackqdyulei [Tue, 18 Jul 2017 18:02:53 +0000 (11:02 -0700)]
Add log for anomaly.
This cl adds all the info that need to be logged to Anomaly and add a
dump method for log.
Bug:
63776178
Test: RunSettingsRoboTests
Change-Id: If762bfca725fee07944ffa23998332c81335a37f
Christine Franks [Fri, 21 Jul 2017 18:52:56 +0000 (18:52 +0000)]
Merge "Move logic for FR in demo mode out of Settings" into oc-dr1-dev
Fan Zhang [Fri, 21 Jul 2017 18:34:39 +0000 (11:34 -0700)]
Tweak bluetooth name preference
- remove accent color from device name
- remove useless ripple when tap
Change-Id: I7800523eb27bafa24f3a4549b1acf02c869ac8c8
Fix:
62891178
Test: robotests
Fan Zhang [Fri, 21 Jul 2017 18:18:44 +0000 (18:18 +0000)]
Merge "Add shadow to searchbar when user scrolls vertically" into oc-dr1-dev
jackqdyulei [Fri, 21 Jul 2017 01:00:20 +0000 (18:00 -0700)]
Make anomaly item refresh in battery
Bug:
63908155
Test: RunSettingsRoboTest
Change-Id: I3e220001ca989020447403641360fade4d09e969
Julia Reynolds [Fri, 21 Jul 2017 13:07:23 +0000 (09:07 -0400)]
Zen settings screen update
- Remove app attribution
- Change visual disturbances label
Change-Id: Id2f7a16817a3b044db4374bf45a54706b8c42eff
Fixes:
63905920
Fixes:
63906381
Test: manual
TreeHugger Robot [Fri, 21 Jul 2017 01:43:47 +0000 (01:43 +0000)]
Merge "Make the support loader activity display UI." into oc-dr1-dev
Fan Zhang [Wed, 19 Jul 2017 23:44:28 +0000 (16:44 -0700)]
Add shadow to searchbar when user scrolls vertically
Bug:
63528057
Test: robotests
Change-Id: Ib85676d78b43be38aab1eacd0820d0755a601f60
(cherry picked from commit
e651ddf9e6c00a62338ef8c7114b5e5e9cd307ec)
Christine Franks [Fri, 23 Jun 2017 21:28:21 +0000 (14:28 -0700)]
Move logic for FR in demo mode out of Settings
Bug:
62712426
Test: make \
ROBOTEST_FILTER="(MasterClearTest|FactoryResetPreferenceControllerTest
|UtilsTest)" \
RunSettingsRoboTests -j100
Change-Id: I5e287c3d4a6a7050bda78187c52aec19e90b50bc
TreeHugger Robot [Thu, 20 Jul 2017 21:46:33 +0000 (21:46 +0000)]
Merge "Add some more logging to settings battery stuff" into oc-dr1-dev
TreeHugger Robot [Thu, 20 Jul 2017 21:17:34 +0000 (21:17 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Amit Mahajan [Thu, 20 Jul 2017 20:47:12 +0000 (20:47 +0000)]
Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev
TreeHugger Robot [Thu, 20 Jul 2017 20:34:55 +0000 (20:34 +0000)]
Merge "Ensure that brightness level is within 0-100%." into oc-dr1-dev
TreeHugger Robot [Thu, 20 Jul 2017 20:23:53 +0000 (20:23 +0000)]
Merge "Fix Settings manifest pointing to old class namespace" into oc-dr1-dev
Bill Yi [Thu, 20 Jul 2017 19:58:46 +0000 (19:58 +0000)]
Import translations. DO NOT MERGE
am:
6cf2d99816 -s ours
Change-Id: Ic6e1c58d91200c599211ccf4a1f781892dc75d55
Bill Yi [Thu, 20 Jul 2017 17:53:14 +0000 (10:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: If5c18c395a4293f6c084f9019fd37a17ddfd24d9
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Doris Ling [Wed, 5 Jul 2017 19:53:04 +0000 (12:53 -0700)]
Ensure that brightness level is within 0-100%.
Check whether the retrieved brightnesss value is out of range, and
adjust it if necessary.
Change-Id: Ieb1ccc03dcb9fa3e1ed192fcc3d217b84d4d316c
Fix:
63872023
Test: make RunSettingsRoboTests
(cherry picked from commit
c7d2d270abbe0d05ae00f326539d3dde91450243)
Antony Sargent [Thu, 20 Jul 2017 16:54:29 +0000 (09:54 -0700)]
Switch to using gray icon for Bluetooth imaging devices
All the other Bluetooth icons were switched to gray at some point in the
past, but we must have missed this one.
Bug:
63858978
Test: make RunSettingsRoboTests
Change-Id: I2ebefa42f3ecff8ae6d58f4bdb22dce39ae4dbd4
Julia Reynolds [Thu, 20 Jul 2017 14:19:33 +0000 (14:19 +0000)]
Merge "Zen priority settings update" into oc-dr1-dev
Bill Yi [Thu, 20 Jul 2017 06:13:29 +0000 (23:13 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1dad650eb3d6c49c1b1b8b6873a2f8a0ffe89a9c
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Salvador Martinez [Thu, 20 Jul 2017 00:14:21 +0000 (17:14 -0700)]
Add some more logging to settings battery stuff
This CL adds logging to areas which are possible suspects for
the slowdown some people have been reporting in the
PowerUsageAdvanced screen. It times the time it takes for various
battery stats methods as well as the time it takes to draw things.
Test: still build (only adds logging)
Bug:
62959645
Bug:
63442960
Change-Id: I7e6c5e83e33a931057c9fdef14d3bef84f514940
Julia Reynolds [Wed, 19 Jul 2017 16:44:07 +0000 (16:44 +0000)]
Merge "Add separator to auto zen rule listing." into oc-dr1-dev
Evan Laird [Tue, 18 Jul 2017 20:37:42 +0000 (16:37 -0400)]
Fix Settings manifest pointing to old class namespace
The string declaring the right fragment was never updated to the new
namespace.
Change-Id: I35809f2f35dbf290deeb69d1bc672b86f8d5a752
Fixes:
63677809
Test: make SettingsUnitTests && \
adb install -r out/target/product/<device>/data/app/SettingsUnitTests/SettingsUnitTests.apk && \
adb shell am instrument -w -e class \
com.android.settings.dream.DreamSettingsLaunchTest\
com.android.settings.tests.unit/android.support.test.runner.AndroidJUnitRunner
TreeHugger Robot [Wed, 19 Jul 2017 03:15:29 +0000 (03:15 +0000)]
Merge "Make time remaining estimate debug mode more reliable." into oc-dr1-dev
Phil Weaver [Wed, 19 Jul 2017 01:17:52 +0000 (01:17 +0000)]
Merge "Back-port ag/
2491664" into nyc-mr1-dev am:
87c77fba92 am:
54e508ca63 am:
4fc6cbfa6a -s ours
am:
b019e2c469
Change-Id: Iaa681452ab197e1afea21b76c17441939a9fc6c7
Phil Weaver [Wed, 19 Jul 2017 01:11:09 +0000 (01:11 +0000)]
Merge "Back-port ag/
2491664" into nyc-mr1-dev am:
87c77fba92 am:
54e508ca63
am:
4fc6cbfa6a -s ours
Change-Id: Iaa96265da8e054b791e5d4b7852b91f4a4ace7b2
Alex Kulesza [Thu, 29 Jun 2017 16:27:19 +0000 (12:27 -0400)]
Make time remaining estimate debug mode more reliable.
Previously, the long click handler was unregistered on first use and
never re-registered. This meant that, e.g., on plugging and unplugging
the phone, debug mode stopped working. This change moves long click
activation into restartBatteryInfoLoader().
Bug:
63133793
Test: make RunSettingsRoboTests
Merged-In: I4c25a1f05ab3718bf06faf455cf670b5460a7306
Change-Id: I4c25a1f05ab3718bf06faf455cf670b5460a7306
Phil Weaver [Wed, 19 Jul 2017 01:00:05 +0000 (01:00 +0000)]
Merge "Back-port ag/
2491664" into nyc-mr1-dev am:
87c77fba92
am:
54e508ca63
Change-Id: I87608a5fc71634d99adaf2aecd1e1c1be297659f
Phil Weaver [Wed, 19 Jul 2017 00:53:20 +0000 (00:53 +0000)]
Merge "Back-port ag/
2491664" into nyc-mr1-dev
am:
87c77fba92
Change-Id: Ie540995d5b499a0e87bc13c11e28c4b8adab93f3
Phil Weaver [Wed, 19 Jul 2017 00:50:50 +0000 (00:50 +0000)]
Merge "Back-port ag/
2491664" into mnc-dev am:
7b3ca9886e am:
a801d5e8ec am:
f9d05230df am:
4f8be72b18 -s ours am:
2b8694c33d am:
533c1efbc7 am:
f5675a9ab0 am:
00143e1a7a am:
d68bd495ec
am:
1faf81da83
Change-Id: I506146a00ad79f7faad2888a0f1063a2a1c078d2
Phil Weaver [Wed, 19 Jul 2017 00:46:35 +0000 (00:46 +0000)]
Merge "Back-port ag/
2491664" into nyc-mr1-dev
Phil Weaver [Wed, 19 Jul 2017 00:40:56 +0000 (00:40 +0000)]
Merge "Back-port ag/
2491664" into mnc-dev am:
7b3ca9886e am:
a801d5e8ec am:
f9d05230df am:
4f8be72b18 -s ours am:
2b8694c33d am:
533c1efbc7 am:
f5675a9ab0 am:
00143e1a7a
am:
d68bd495ec
Change-Id: Ib2b14e63463ea041575e6d884cc155972264ae91
Phil Weaver [Wed, 19 Jul 2017 00:31:13 +0000 (00:31 +0000)]
Merge "Back-port ag/
2491664" into mnc-dev am:
7b3ca9886e am:
a801d5e8ec am:
f9d05230df am:
4f8be72b18 -s ours am:
2b8694c33d am:
533c1efbc7 am:
f5675a9ab0
am:
00143e1a7a
Change-Id: I08371b60dbed3351a06f49bed71aaca1f46fb864
Phil Weaver [Wed, 19 Jul 2017 00:24:40 +0000 (00:24 +0000)]
Merge "Back-port ag/
2491664" into mnc-dev am:
7b3ca9886e am:
a801d5e8ec am:
f9d05230df am:
4f8be72b18 -s ours am:
2b8694c33d am:
533c1efbc7
am:
f5675a9ab0
Change-Id: Icbc5147a6050058c78ece104f1c169673b93a373
Phil Weaver [Wed, 19 Jul 2017 00:15:50 +0000 (00:15 +0000)]
Merge "Back-port ag/
2491664" into mnc-dev am:
7b3ca9886e am:
a801d5e8ec am:
f9d05230df am:
4f8be72b18 -s ours am:
2b8694c33d
am:
533c1efbc7
Change-Id: Ib54143b47f6c1b09d2d3c5f73630aebcc1fcba33
Phil Weaver [Wed, 19 Jul 2017 00:05:08 +0000 (00:05 +0000)]
Merge "Back-port ag/
2491664" into mnc-dev am:
7b3ca9886e am:
a801d5e8ec am:
f9d05230df am:
4f8be72b18 -s ours
am:
2b8694c33d
Change-Id: Icef5847bf3eaf4c9fdce6eaaff1d642828f89477
Phil Weaver [Tue, 18 Jul 2017 23:58:43 +0000 (23:58 +0000)]
Merge "Back-port ag/
2491664" into mnc-dev am:
7b3ca9886e am:
a801d5e8ec am:
f9d05230df
am:
4f8be72b18 -s ours
Change-Id: I2b510d0b70eb303fb93a68a0eee0d32bf1226d76
Phil Weaver [Tue, 18 Jul 2017 23:41:33 +0000 (23:41 +0000)]
Merge "Back-port ag/
2491664" into mnc-dev am:
7b3ca9886e am:
a801d5e8ec
am:
f9d05230df
Change-Id: I63ffb648e39d06390a7f72951ad41bed0cf5aac9
Phil Weaver [Tue, 18 Jul 2017 23:35:31 +0000 (23:35 +0000)]
Merge "Back-port ag/
2491664" into mnc-dev am:
7b3ca9886e
am:
a801d5e8ec
Change-Id: I26fad2824208aa46dbfac0bef585729e5424c24c
Phil Weaver [Tue, 18 Jul 2017 23:29:03 +0000 (23:29 +0000)]
Merge "Back-port ag/
2491664" into mnc-dev
am:
7b3ca9886e
Change-Id: Id4c50a2c37096f91accd2b2b28470c230dd655db
Phil Weaver [Tue, 18 Jul 2017 23:21:17 +0000 (23:21 +0000)]
Merge "Back-port ag/
2491664" into mnc-dev
Phil Weaver [Wed, 12 Jul 2017 21:07:07 +0000 (14:07 -0700)]
Back-port ag/
2491664
Bug:
62196835
Test: Verify overlays disappear on a11y capabilities
dialog.
Change-Id: Ic675012dd9faa8e53d1d4b126b3ba68fecdab992
Phil Weaver [Tue, 18 Jul 2017 22:18:18 +0000 (22:18 +0000)]
Merge "Back-port ag/
2491664" into nyc-dev am:
3adf585961 -s ours am:
6fee9a5e91 am:
ade8640d4d am:
57f1af6a0b am:
ae07650724
am:
3ae8ac0911
Change-Id: Ib8797dc1e432871289cd528c0fe188132804e12f
Phil Weaver [Tue, 18 Jul 2017 22:15:30 +0000 (22:15 +0000)]
Merge "Back-port ag/
2491664" into nyc-dev am:
3adf585961 -s ours am:
6fee9a5e91 am:
ade8640d4d am:
57f1af6a0b
am:
ae07650724
Change-Id: I43d075a57c5d327f3949408da7ed4890b0b045f4
Phil Weaver [Tue, 18 Jul 2017 22:11:43 +0000 (22:11 +0000)]
Merge "Back-port ag/
2491664" into nyc-dev am:
3adf585961 -s ours am:
6fee9a5e91 am:
ade8640d4d
am:
57f1af6a0b
Change-Id: I50c783c642a0f1a86535c2423dd335d2e4ec2999
Phil Weaver [Tue, 18 Jul 2017 22:03:51 +0000 (22:03 +0000)]
Merge "Back-port ag/
2491664" into nyc-dev am:
3adf585961 -s ours am:
6fee9a5e91
am:
ade8640d4d
Change-Id: I77a9c4c0d8ce78a02615c5e37bf1843c46a1e5d8
Phil Weaver [Tue, 18 Jul 2017 21:56:10 +0000 (21:56 +0000)]
Merge "Back-port ag/
2491664" into lmp-dev am:
41492a1e2c am:
cbbdc18c7b am:
c84dc8feb3 am:
4b029f8b0d am:
4c70016a94 am:
46592e90a9 am:
55b3b1f349 am:
af26bae8b3 am:
a1426f209c am:
2e690de9cf am:
7a7d6b1d0c am:
3099a7f794
am:
ce3fef5c99
Change-Id: I73eb7f86fd59536f8e9674a7406f83a3711b653e
Phil Weaver [Tue, 18 Jul 2017 21:55:39 +0000 (21:55 +0000)]
Merge "Back-port ag/
2491664" into nyc-dev am:
3adf585961 -s ours
am:
6fee9a5e91
Change-Id: I463a22c05f439acd264c21cb99d2700e9600b78d
Phil Weaver [Tue, 18 Jul 2017 21:48:55 +0000 (21:48 +0000)]
Merge "Back-port ag/
2491664" into lmp-dev am:
41492a1e2c am:
cbbdc18c7b am:
c84dc8feb3 am:
4b029f8b0d am:
4c70016a94 am:
46592e90a9 am:
55b3b1f349 am:
af26bae8b3 am:
a1426f209c am:
2e690de9cf am:
7a7d6b1d0c
am:
3099a7f794
Change-Id: Ib02617e2779b6da6569182cd94936dafc07b7422
Phil Weaver [Tue, 18 Jul 2017 21:44:43 +0000 (21:44 +0000)]
Merge "Back-port ag/
2491664" into nyc-dev
am:
3adf585961 -s ours
Change-Id: I8ba7e805110028752e1968e38ac548fcd4194438
Phil Weaver [Tue, 18 Jul 2017 21:43:53 +0000 (21:43 +0000)]
Merge "Back-port ag/
2491664" into lmp-dev am:
41492a1e2c am:
cbbdc18c7b am:
c84dc8feb3 am:
4b029f8b0d am:
4c70016a94 am:
46592e90a9 am:
55b3b1f349 am:
af26bae8b3 am:
a1426f209c am:
2e690de9cf
am:
7a7d6b1d0c
Change-Id: I7a12d05b79c4a78e14fccf5288c9bea50ae4c4d9
Phil Weaver [Tue, 18 Jul 2017 21:24:36 +0000 (21:24 +0000)]
Merge "Back-port ag/
2491664" into lmp-dev am:
41492a1e2c am:
cbbdc18c7b am:
c84dc8feb3 am:
4b029f8b0d am:
4c70016a94 am:
46592e90a9 am:
55b3b1f349 am:
af26bae8b3 am:
a1426f209c
am:
2e690de9cf
Change-Id: Idb805deec53765994f5ed8a1bd7b1f56d6717b3b
Phil Weaver [Tue, 18 Jul 2017 21:23:17 +0000 (21:23 +0000)]
Merge "Back-port ag/
2491664" into nyc-dev
Phil Weaver [Tue, 18 Jul 2017 21:13:41 +0000 (21:13 +0000)]
Merge "Back-port ag/
2491664" into lmp-dev am:
41492a1e2c am:
cbbdc18c7b am:
c84dc8feb3 am:
4b029f8b0d am:
4c70016a94 am:
46592e90a9 am:
55b3b1f349 am:
af26bae8b3
am:
a1426f209c
Change-Id: I410bcb403ace5044da8f98fadbb622a44d21021b
Phil Weaver [Tue, 18 Jul 2017 21:09:55 +0000 (21:09 +0000)]
Merge "Back-port ag/
2491664" into lmp-dev am:
41492a1e2c am:
cbbdc18c7b am:
c84dc8feb3 am:
4b029f8b0d am:
4c70016a94 am:
46592e90a9 am:
55b3b1f349
am:
af26bae8b3
Change-Id: I0dc45ca53a9c60c830795d6686a0d86efa356f4e
Phil Weaver [Tue, 18 Jul 2017 21:04:27 +0000 (21:04 +0000)]
Back-port ag/
2491664 am:
1d21738bd6 am:
4150739791 -s ours am:
9d889600a9 am:
f6b1267780 am:
5d3967338d am:
57aa22c671 am:
91f4a42dac am:
ba26fabe3e am:
85aa9ccc69 am:
2e2e6fcc04 am:
625d4bffc7
am:
066f79adc3
Change-Id: I3645f94b7220a956a95e13350e51e49a41204dcb
Phil Weaver [Tue, 18 Jul 2017 21:02:30 +0000 (21:02 +0000)]
Back-port ag/
2491664 am:
1d21738bd6 am:
4150739791 -s ours am:
9d889600a9 am:
f6b1267780 am:
5d3967338d am:
57aa22c671 am:
91f4a42dac am:
ba26fabe3e am:
85aa9ccc69 am:
2e2e6fcc04
am:
625d4bffc7
Change-Id: Idb85f53bc0ad17856ee65b4cc2240bef6710851c
Phil Weaver [Tue, 18 Jul 2017 20:59:48 +0000 (20:59 +0000)]
Merge "Back-port ag/
2491664" into lmp-dev am:
41492a1e2c am:
cbbdc18c7b am:
c84dc8feb3 am:
4b029f8b0d am:
4c70016a94 am:
46592e90a9
am:
55b3b1f349
Change-Id: I89635be6d5f768bd4780dd1b6daeb30e9cbab4d2
Phil Weaver [Tue, 18 Jul 2017 20:58:54 +0000 (20:58 +0000)]
Back-port ag/
2491664 am:
1d21738bd6 am:
4150739791 -s ours am:
9d889600a9 am:
f6b1267780 am:
5d3967338d am:
57aa22c671 am:
91f4a42dac am:
ba26fabe3e am:
85aa9ccc69
am:
2e2e6fcc04
Change-Id: I2d9d6a7fb0ac1d88a4e910e9e23e7160bbfcdafd
Phil Weaver [Tue, 18 Jul 2017 20:57:24 +0000 (20:57 +0000)]
Back-port ag/
2491664 am:
1d21738bd6 am:
4150739791 -s ours am:
9d889600a9 am:
f6b1267780 am:
5d3967338d am:
57aa22c671 am:
91f4a42dac am:
ba26fabe3e
am:
85aa9ccc69
Change-Id: I8d411e2b84113763c49ec5c627f966da662a42b6
Lei Yu [Tue, 18 Jul 2017 20:55:58 +0000 (20:55 +0000)]
Merge "Never store battery stats for cache" into oc-dr1-dev
Phil Weaver [Tue, 18 Jul 2017 20:54:26 +0000 (20:54 +0000)]
Back-port ag/
2491664 am:
1d21738bd6 am:
4150739791 -s ours am:
9d889600a9 am:
f6b1267780 am:
5d3967338d am:
57aa22c671 am:
91f4a42dac
am:
ba26fabe3e
Change-Id: I78f285821bc170c9a32b6e911e38826123c81820
Phil Weaver [Tue, 18 Jul 2017 20:54:21 +0000 (20:54 +0000)]
Merge "Back-port ag/
2491664" into lmp-dev am:
41492a1e2c am:
cbbdc18c7b am:
c84dc8feb3 am:
4b029f8b0d am:
4c70016a94
am:
46592e90a9
Change-Id: If666cdb52e2565e889fd026917eaea20502ca59e
Phil Weaver [Tue, 18 Jul 2017 20:52:25 +0000 (20:52 +0000)]
Back-port ag/
2491664 am:
1d21738bd6 am:
4150739791 -s ours am:
9d889600a9 am:
f6b1267780 am:
5d3967338d am:
57aa22c671
am:
91f4a42dac
Change-Id: Iaf412cbcc4b9a3513ba27672ae2e1cfc04e57da5
Phil Weaver [Tue, 18 Jul 2017 20:49:55 +0000 (20:49 +0000)]
Back-port ag/
2491664 am:
1d21738bd6 am:
4150739791 -s ours am:
9d889600a9 am:
f6b1267780 am:
5d3967338d
am:
57aa22c671
Change-Id: Ia487b2e3c0ee6c4eace1502704fda873e3690300
Phil Weaver [Tue, 18 Jul 2017 20:47:53 +0000 (20:47 +0000)]
Back-port ag/
2491664 am:
1d21738bd6 am:
4150739791 -s ours am:
9d889600a9 am:
f6b1267780
am:
5d3967338d
Change-Id: Idcd6c6ab5a7cf0a594236a41a949031ed3e9855c
Phil Weaver [Tue, 18 Jul 2017 20:47:09 +0000 (20:47 +0000)]
Merge "Back-port ag/
2491664" into lmp-dev am:
41492a1e2c am:
cbbdc18c7b am:
c84dc8feb3 am:
4b029f8b0d
am:
4c70016a94
Change-Id: I0b78bc04741d8b0d2d7af292484a025d0c62fd6a
Phil Weaver [Tue, 18 Jul 2017 20:46:34 +0000 (20:46 +0000)]
Back-port ag/
2491664 am:
1d21738bd6 am:
4150739791 -s ours am:
9d889600a9
am:
f6b1267780
Change-Id: I2e61b6da4262cf05ca30e2c2d505eb9cae017a9a
Phil Weaver [Tue, 18 Jul 2017 20:38:01 +0000 (20:38 +0000)]
Merge "Back-port ag/
2491664" into lmp-dev am:
41492a1e2c am:
cbbdc18c7b am:
c84dc8feb3
am:
4b029f8b0d
Change-Id: Ibedf70b6b6b14d51ba482f28f2db9c04c10457d6
Phil Weaver [Tue, 18 Jul 2017 20:35:06 +0000 (20:35 +0000)]
Back-port ag/
2491664 am:
1d21738bd6 am:
4150739791 -s ours
am:
9d889600a9
Change-Id: Ia718620b0ec683d6b24cca6e56e9378a68d0ae3f
Phil Weaver [Tue, 18 Jul 2017 20:28:31 +0000 (20:28 +0000)]
Merge "Back-port ag/
2491664" into lmp-dev am:
41492a1e2c am:
cbbdc18c7b
am:
c84dc8feb3
Change-Id: Ia81f4d5e0e9d433e33e19a70a9f63a6cc2afb79a
Phil Weaver [Tue, 18 Jul 2017 20:25:56 +0000 (20:25 +0000)]
Back-port ag/
2491664 am:
1d21738bd6
am:
4150739791 -s ours
Change-Id: I580b7232fcbe2c2025d2fd35e7f04ddf1255fd6b
Phil Weaver [Tue, 18 Jul 2017 18:36:26 +0000 (18:36 +0000)]
Merge "Back-port ag/
2491664" into lmp-dev am:
41492a1e2c
am:
cbbdc18c7b
Change-Id: I3cb41508ce487f1d4a21517c86ef57f9cc041705
Phil Weaver [Tue, 18 Jul 2017 18:26:18 +0000 (18:26 +0000)]
Merge "Back-port ag/
2491664" into lmp-dev
am:
41492a1e2c
Change-Id: I4e099fb9a737936f12357670635232a7913e3cfd
Phil Weaver [Tue, 18 Jul 2017 18:26:16 +0000 (18:26 +0000)]
Back-port ag/
2491664
am:
1d21738bd6
Change-Id: I30088c2cb1b8c343d21e0b095700df472127c612
Phil Weaver [Tue, 18 Jul 2017 18:19:39 +0000 (18:19 +0000)]
Merge "Back-port ag/
2491664" into lmp-dev
Daniel Nishi [Tue, 18 Jul 2017 17:14:48 +0000 (17:14 +0000)]
Merge "Align the version number text view." into oc-dr1-dev
Amit Mahajan [Tue, 18 Jul 2017 01:23:53 +0000 (18:23 -0700)]
Add new column user_editable to Carriers table in telephony db.
Test: Verified manually that an APN with user_editable=false cannot be
modified via UI
Bug:
62852457
Change-Id: I1dbf2622b7fada8a201c990a06d07a9cdc258840
Phil Weaver [Wed, 12 Jul 2017 21:07:07 +0000 (14:07 -0700)]
Back-port ag/
2491664
Bug:
62196835
Test: Verify overlays disappear on a11y capabilities
dialog.
Change-Id: Ic675012dd9faa8e53d1d4b126b3ba68fecdab992
Julia Reynolds [Mon, 17 Jul 2017 14:33:04 +0000 (10:33 -0400)]
Zen priority settings update
Reordering & adding summary
Change-Id: Icc3388410bdea9960c1e2c8609b7c3a979dc99d7
Fixes:
63712680
Test: RunSettingsRoboTests
Julia Reynolds [Mon, 17 Jul 2017 18:05:08 +0000 (14:05 -0400)]
Add separator to auto zen rule listing.
Test: manual
Change-Id: I9c3549832693d483ec5f0cf72a50909c18483fbb
Fixes:
63681398
TreeHugger Robot [Tue, 18 Jul 2017 02:52:42 +0000 (02:52 +0000)]
Merge "Build extra data in wakeup anomaly" into oc-dr1-dev
jackqdyulei [Tue, 18 Jul 2017 00:37:05 +0000 (17:37 -0700)]
Build extra data in wakeup anomaly
Wakeup Anomaly need this data to decide which action to take. The
previous cl adds it to wakelock anomaly, not wakeup anomaly.
Bug:
63777620
Test: RunSettingsRoboTests
Change-Id: I07c7252398add1573ea7de82953cbeabdbfe947d