OSDN Git Service
Andrew Sapperstein [Tue, 25 Jul 2017 23:47:00 +0000 (23:47 +0000)]
Merge "Fix robotests." into oc-mr1-dev
am:
205857726a
Change-Id: I4f04275f7a6d71d3a19b6b8bf2540af4debdd76e
TreeHugger Robot [Tue, 25 Jul 2017 23:21:44 +0000 (23:21 +0000)]
Merge "Fix robotests." into oc-mr1-dev
Fan Zhang [Tue, 25 Jul 2017 23:11:13 +0000 (23:11 +0000)]
Merge "Fix a monkey crash in Developer settings." into oc-mr1-dev
am:
7da06bd11b
Change-Id: Ieb1fb873537f8faca68b185e0f219e7bd4031524
Fan Zhang [Tue, 25 Jul 2017 23:06:11 +0000 (23:06 +0000)]
Merge "Fix a monkey crash in Developer settings." into oc-mr1-dev
Fan Zhang [Tue, 25 Jul 2017 21:40:34 +0000 (21:40 +0000)]
Merge "Fix search indexing for encryption_and_credential page" into oc-dr1-dev am:
6ef56e43ee
am:
f854a08c3e
Change-Id: Ie113d470743947ffa22844de50243d0d7b42534a
Fan Zhang [Tue, 25 Jul 2017 21:39:00 +0000 (21:39 +0000)]
Merge "Fix search indexing for encryption_and_credential page" into oc-dr1-dev am:
6ef56e43ee
am:
2f84a358d9
Change-Id: I727693edc69b0adfb862efce87834fc78657600e
Fan Zhang [Tue, 25 Jul 2017 21:30:57 +0000 (21:30 +0000)]
Merge "Fix search indexing for encryption_and_credential page" into oc-dr1-dev
am:
6ef56e43ee
Change-Id: I162d479851065017806cb82a16eb8fba7ad5aca7
Fan Zhang [Tue, 25 Jul 2017 21:30:26 +0000 (21:30 +0000)]
Merge "Fix search indexing for encryption_and_credential page" into oc-dr1-dev
am:
6ef56e43ee
Change-Id: I8778464bb80ff791b1e127bdca420065252fd76f
TreeHugger Robot [Tue, 25 Jul 2017 21:23:19 +0000 (21:23 +0000)]
Merge "Fix search indexing for encryption_and_credential page" into oc-dr1-dev
Matthew Fritze [Tue, 25 Jul 2017 21:23:15 +0000 (21:23 +0000)]
Merge "Add default value to inline payloads" into oc-mr1-dev
am:
151cc3166d
Change-Id: I026dc25e97d2628237e2f02c2a95e3ecbefa8d5e
Matthew Fritze [Tue, 25 Jul 2017 21:10:55 +0000 (21:10 +0000)]
Merge "Add default value to inline payloads" into oc-mr1-dev
Roshan Pius [Tue, 25 Jul 2017 21:06:25 +0000 (21:06 +0000)]
Merge "settings(manifest): Add NETWORK_SETTINGS permission" into oc-dr1-dev am:
2b689e63ca
am:
974920af47 -s ours
Change-Id: Ib44b99d0d8804de60948929c4c6fc5e7d9c55cd5
Roshan Pius [Tue, 25 Jul 2017 21:01:43 +0000 (21:01 +0000)]
Merge "settings(manifest): Add NETWORK_SETTINGS permission" into oc-dr1-dev
am:
2b689e63ca
Change-Id: I39ee1e7e6712e6acec56aaa088ef19ea2669784c
Roshan Pius [Tue, 25 Jul 2017 21:01:25 +0000 (21:01 +0000)]
Merge "settings(manifest): Add NETWORK_SETTINGS permission" into oc-dr1-dev am:
2b689e63ca -s ours
am:
096e14d92f -s ours
Change-Id: I1bec0f5ef17946fa49cdd2aa36ebc51f3d3c1d23
Lei Yu [Tue, 25 Jul 2017 21:00:41 +0000 (21:00 +0000)]
Merge "Add anomaly detection method to AnomalyUtils" into oc-dr1-dev am:
5963ffd4e3
am:
2e70aea742
Change-Id: I09713571128aac7050a0be706497a241edead8dd
Lei Yu [Tue, 25 Jul 2017 20:58:12 +0000 (20:58 +0000)]
Merge "Add anomaly detection method to AnomalyUtils" into oc-dr1-dev am:
5963ffd4e3
am:
ce4ed05085
Change-Id: Ibca49417ed69cbce3edf5d841d4c4f591c8f1e21
Andrew Sapperstein [Tue, 25 Jul 2017 18:01:23 +0000 (11:01 -0700)]
Fix robotests.
Couldn't find config_headlineFontFamily. Added some
SettingsShadowResources.overrideResource calls.
Change-Id: I13f5b5dd6b97057e7f77cc4d15abdb6451314b50
Fixes:
64024743
Test: robotests
Roshan Pius [Tue, 25 Jul 2017 20:56:33 +0000 (20:56 +0000)]
Merge "settings(manifest): Add NETWORK_SETTINGS permission" into oc-dr1-dev
am:
2b689e63ca -s ours
Change-Id: Ifb8441b5cb1554ac94dde28ae247596cdf810e6c
Lei Yu [Tue, 25 Jul 2017 20:55:21 +0000 (20:55 +0000)]
Merge "Add anomaly detection method to AnomalyUtils" into oc-dr1-dev
am:
5963ffd4e3
Change-Id: I71b5405e87c0ad7833eb8aa6cc8cbd6dfc0420bb
Lei Yu [Tue, 25 Jul 2017 20:55:16 +0000 (20:55 +0000)]
Merge "Add anomaly detection method to AnomalyUtils" into oc-dr1-dev
am:
5963ffd4e3
Change-Id: If4946179167529463ddbe23c83b3e37a21fec222
Roshan Pius [Tue, 25 Jul 2017 20:52:29 +0000 (20:52 +0000)]
Merge "settings(manifest): Add NETWORK_SETTINGS permission" into oc-dr1-dev
Lei Yu [Tue, 25 Jul 2017 20:48:02 +0000 (20:48 +0000)]
Merge "Add anomaly detection method to AnomalyUtils" into oc-dr1-dev
Fan Zhang [Tue, 25 Jul 2017 17:30:24 +0000 (10:30 -0700)]
Fix a monkey crash in Developer settings.
- DevSetting shouldn't add switchbar listener if it's a Monkey test run
- DevSetting shouldn't remove switchbar listener if it's not registered
- Refactor some switchbar logic in order to create test
Change-Id: Ie65ff9b04778075789010169039393bd0551acfb
Fix:
64021498
Test: robotests
Matthew Fritze [Mon, 24 Jul 2017 21:58:36 +0000 (14:58 -0700)]
Add default value to inline payloads
If we try to set an inline result when it has not yet been
accessed in settings, nothing is read from Settings.
Thus, include a default value for a fallback.
Manual merge for: ag/
2588219/
Change-Id: I3b8eea4f82764852cea642db4455ba57f10a7d37
Fixes:
63955012
Test: robotests
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
Roshan Pius [Tue, 25 Jul 2017 17:19:12 +0000 (17:19 +0000)]
Merge "settings(manifest): Add NETWORK_SETTINGS permission" into oc-mr1-dev
am:
7030ceb9e3
Change-Id: I0a9cbb6a36950f354145ca1a1a0dac71506aee68
Roshan Pius [Mon, 24 Jul 2017 22:05:36 +0000 (15:05 -0700)]
settings(manifest): Add NETWORK_SETTINGS permission
This is needed for invoking some wifi/connectivity API's. For example,
we switched over using this permission to determine if an app is allowed
to modify any saved wifi network configuration on the device.
Bug:
64001841
Test: Able to forget networks created by SetupWizard.
Change-Id: I932226a74b12bf726a2445188953b1ec34523cf9
Merged-In: I932226a74b12bf726a2445188953b1ec34523cf9
Roshan Pius [Tue, 25 Jul 2017 17:09:52 +0000 (17:09 +0000)]
Merge "settings(manifest): Add NETWORK_SETTINGS permission" into oc-mr1-dev
Roshan Pius [Mon, 24 Jul 2017 22:05:36 +0000 (15:05 -0700)]
settings(manifest): Add NETWORK_SETTINGS permission
This is needed for invoking some wifi/connectivity API's. For example,
we switched over using this permission to determine if an app is allowed
to modify any saved wifi network configuration on the device.
Bug:
64001841
Test: Able to forget networks created by SetupWizard.
Change-Id: I932226a74b12bf726a2445188953b1ec34523cf9
(cherry-picked from
b0a09304e380645a84651c0de668a78a7beaac3b)
Android Build Merger (Role) [Tue, 25 Jul 2017 10:22:31 +0000 (10:22 +0000)]
Merge "Merge "Fix "max failed login attempts" disclosure" into oc-dr1-dev am:
262aacd353 am:
96a14ff07e" into oc-mr1-dev-plus-aosp
Bartosz Fabianowski [Tue, 25 Jul 2017 10:22:10 +0000 (10:22 +0000)]
Merge "Fix "max failed login attempts" disclosure" into oc-dr1-dev am:
262aacd353
am:
96a14ff07e
Change-Id: I771a025ef9b38b80c6719de3dbc3b7f86971727e
Bartosz Fabianowski [Tue, 25 Jul 2017 10:22:09 +0000 (10:22 +0000)]
Merge "Fix "max failed login attempts" disclosure" into oc-dr1-dev am:
262aacd353
am:
cfc3ccdb82
Change-Id: I2c73cf6895da1188027d0f8704f795490f1e7be1
Bartosz Fabianowski [Tue, 25 Jul 2017 10:18:41 +0000 (10:18 +0000)]
Merge "Fix "max failed login attempts" disclosure" into oc-dr1-dev
am:
262aacd353
Change-Id: I24ffc75897c92124cf9416ea79ff4c704a733c0e
Bartosz Fabianowski [Tue, 25 Jul 2017 10:18:41 +0000 (10:18 +0000)]
Merge "Fix "max failed login attempts" disclosure" into oc-dr1-dev
am:
262aacd353
Change-Id: I66fbaf0f98dd22679068f1fdefce0e7dbfc81939
Bartosz Fabianowski [Tue, 25 Jul 2017 10:14:50 +0000 (10:14 +0000)]
Merge "Fix "max failed login attempts" disclosure" into oc-dr1-dev
Android Build Merger (Role) [Tue, 25 Jul 2017 05:40:14 +0000 (05:40 +0000)]
Merge "Merge "Fingerprint swipe settings and suggestions should not show if hardware unavailable" into oc-dr1-dev am:
5e707ccb3d am:
936680ab3e -s ours" into oc-mr1-dev-plus-aosp
Kevin Chyn [Tue, 25 Jul 2017 05:39:57 +0000 (05:39 +0000)]
Merge "Fingerprint swipe settings and suggestions should not show if hardware unavailable" into oc-dr1-dev am:
5e707ccb3d
am:
936680ab3e -s ours
Change-Id: I584f4a373902d590e46e93df75cfcb4fd56608ec
Kevin Chyn [Tue, 25 Jul 2017 05:39:56 +0000 (05:39 +0000)]
Merge "Fingerprint swipe settings and suggestions should not show if hardware unavailable" into oc-dr1-dev am:
5e707ccb3d -s ours
am:
7edaa60315 -s ours
Change-Id: Ib353f82b3bff8cd8a420bf6581a603e06d2b8244
Kevin Chyn [Tue, 25 Jul 2017 05:36:32 +0000 (05:36 +0000)]
Merge "Fingerprint swipe settings and suggestions should not show if hardware unavailable" into oc-dr1-dev
am:
5e707ccb3d
Change-Id: Ib988ae3439dbbaed2c84d906b6e88412ce27461f
Kevin Chyn [Tue, 25 Jul 2017 05:36:26 +0000 (05:36 +0000)]
Merge "Fingerprint swipe settings and suggestions should not show if hardware unavailable" into oc-dr1-dev
am:
5e707ccb3d -s ours
Change-Id: Ia0a0f8fff5bec512656229aaf2d81e0952760c4e
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 [Tue, 25 Jul 2017 02:42:11 +0000 (02:42 +0000)]
Merge "Fingerprint swipe settings and suggestions should not show if hardware unavailable" into oc-mr1-dev
am:
af63fc249e
Change-Id: I15fc66e922871264476a2ebb6893838b273f8576
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
TreeHugger Robot [Tue, 25 Jul 2017 02:32:31 +0000 (02:32 +0000)]
Merge "Fingerprint swipe settings and suggestions should not show if hardware unavailable" into oc-mr1-dev
Android Build Merger (Role) [Tue, 25 Jul 2017 01:11:02 +0000 (01:11 +0000)]
Merge "Default-off FP Swipe am:
8f5de15ba1 am:
e4fed2ee05" into oc-mr1-dev-plus-aosp
Kevin Chyn [Tue, 25 Jul 2017 01:10:35 +0000 (01:10 +0000)]
Default-off FP Swipe am:
8f5de15ba1
am:
e4fed2ee05
Change-Id: I16a7a4aa7198c77885c44841c3a175cee46753e6
Kevin Chyn [Tue, 25 Jul 2017 01:10:34 +0000 (01:10 +0000)]
Default-off FP Swipe am:
8f5de15ba1
am:
0d378e04ca
Change-Id: I8dd88ec940d3624c5eb7f59facd0c1ed7c4de55e
Kevin Chyn [Tue, 25 Jul 2017 01:07:31 +0000 (01:07 +0000)]
Default-off FP Swipe
am:
8f5de15ba1
Change-Id: Ie575c4a6335b83b00d8f2614bba532843a88534d
Kevin Chyn [Tue, 25 Jul 2017 01:07:31 +0000 (01:07 +0000)]
Default-off FP Swipe
am:
8f5de15ba1
Change-Id: Iac3a85ac3e0d6f30d32b2823f168f3123d375f08
Fan Zhang [Mon, 24 Jul 2017 21:38:18 +0000 (21:38 +0000)]
Merge "Update string for bluetooth device visibility" into oc-mr1-dev
am:
c239561da5
Change-Id: Ic124bbed9f9bf3185787444264d063185f9754f6
TreeHugger Robot [Mon, 24 Jul 2017 21:29:22 +0000 (21:29 +0000)]
Merge "Update string for bluetooth device visibility" into oc-mr1-dev
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
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
Change-Id: I2539128daff8df52d040606141f772fc9edffa57
Fan Zhang [Sat, 22 Jul 2017 00:51:47 +0000 (17:51 -0700)]
Fix search indexing for encryption_and_credential page
- Rewrite search index provider to include all possible keys through
getXmlResourcesToIndex()
- Add isPageSearchEnabled() to disable all keys if user is not admin
- Add getNonIndexableKeys to suppress unrelated keys based on current
device state
Change-Id: I2c6943483789bf4c9f3931d344cf279fec0edaee
Fix:
37650170
Test: robotests
Michael Wachenschwanz [Mon, 24 Jul 2017 19:06:37 +0000 (19:06 +0000)]
Merge "Add Foreground Service time to battery usage" into oc-mr1-dev
am:
a47a3f58bf
Change-Id: Ib34924d8749d7012139ef2e8e48921fe4fc62f2a
Michael Wachenschwanz [Mon, 24 Jul 2017 19:02:12 +0000 (19:02 +0000)]
Merge "Add Foreground Service time to battery usage" into oc-mr1-dev
Fan Zhang [Mon, 24 Jul 2017 17:52:23 +0000 (10:52 -0700)]
Update string for bluetooth device visibility
Change-Id: I33baa5e72596e10f10f13d2324144ca9036c3fc9
Fix:
62891178
Test: visual
Test: robotests
Android Build Merger (Role) [Mon, 24 Jul 2017 18:14:28 +0000 (18:14 +0000)]
Merge "Merge "Add log for anomaly." into oc-dr1-dev am:
6666bf5605 am:
5e48ea193b" into oc-mr1-dev-plus-aosp
Lei Yu [Mon, 24 Jul 2017 18:14:14 +0000 (18:14 +0000)]
Merge "Add log for anomaly." into oc-dr1-dev am:
6666bf5605
am:
5e48ea193b
Change-Id: Id5d6e02eb05e7a5446c81a1c1ef94c2104ce4902
Lei Yu [Mon, 24 Jul 2017 18:14:13 +0000 (18:14 +0000)]
Merge "Add log for anomaly." into oc-dr1-dev am:
6666bf5605
am:
0f9fa63c3a
Change-Id: Ibb11b891799815a3ec2f8c8961b197ffadeaf9db
Lei Yu [Mon, 24 Jul 2017 18:07:13 +0000 (18:07 +0000)]
Merge "Add log for anomaly." into oc-dr1-dev
am:
6666bf5605
Change-Id: I7ca4b466c6f175192bebb2b9a7807ebf783a249e
Lei Yu [Mon, 24 Jul 2017 18:07:12 +0000 (18:07 +0000)]
Merge "Add log for anomaly." into oc-dr1-dev
am:
6666bf5605
Change-Id: I4903e3617b2fab64831b6e0ad8b5214ea5dd5317
Lei Yu [Mon, 24 Jul 2017 17:56:35 +0000 (17:56 +0000)]
Merge "Add log for anomaly." into oc-dr1-dev
Android Build Merger (Role) [Mon, 24 Jul 2017 17:42:01 +0000 (17:42 +0000)]
Merge "Add ResultPayload for always-on ambient display. am:
eb1a45b95b am:
cfb2b87d03 -s ours" into oc-mr1-dev-plus-aosp
Andrew Sapperstein [Mon, 24 Jul 2017 17:41:47 +0000 (17:41 +0000)]
Add ResultPayload for always-on ambient display. am:
eb1a45b95b
am:
cfb2b87d03 -s ours
Change-Id: I56bad70b1614cf80c4bb24695902c4fc5fa5dc53
Andrew Sapperstein [Mon, 24 Jul 2017 17:41:42 +0000 (17:41 +0000)]
Add ResultPayload for always-on ambient display. am:
eb1a45b95b -s ours
am:
8389d669f1 -s ours
Change-Id: I7d0778edd726966a4e68398b5c14a6144d1ee4af
Andrew Sapperstein [Mon, 24 Jul 2017 17:34:10 +0000 (17:34 +0000)]
Add ResultPayload for always-on ambient display.
am:
eb1a45b95b
Change-Id: Ie00201adc19b7da516e3bb64fe857a17f8282d28
Andrew Sapperstein [Mon, 24 Jul 2017 17:34:06 +0000 (17:34 +0000)]
Add ResultPayload for always-on ambient display.
am:
eb1a45b95b -s ours
Change-Id: I67522a734dff97d37f09751817f99e5f8a6bf602
Andrew Sapperstein [Mon, 24 Jul 2017 17:08:17 +0000 (17:08 +0000)]
Add ResultPayload for always-on ambient display.
am:
36af00bb21
Change-Id: I4b451605cee675c5949aeb68be27588502ded0d0
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: Ib4ee4d8d999e5a1f9edf34ea6068644b41fc4838
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
Android Build Merger (Role) [Sat, 22 Jul 2017 18:03:23 +0000 (18:03 +0000)]
Merge "Merge "Reindex db when package w/ searchIndexProvider changes" into oc-dr1-dev am:
6fcc38975c -s ours am:
6cd295af8a -s ours" into oc-mr1-dev-plus-aosp
Fan Zhang [Sat, 22 Jul 2017 18:03:07 +0000 (18:03 +0000)]
Merge "Reindex db when package w/ searchIndexProvider changes" into oc-dr1-dev am:
6fcc38975c -s ours
am:
6cd295af8a -s ours
Change-Id: Ib310943f7b0dae93714b01d19cdf08f14b8eeb8e
Fan Zhang [Sat, 22 Jul 2017 18:03:06 +0000 (18:03 +0000)]
Merge "Reindex db when package w/ searchIndexProvider changes" into oc-dr1-dev am:
6fcc38975c
am:
2c7b00d101 -s ours
Change-Id: Iaa1c8ef7686c8842becf494d210b08aed097fb50
Fan Zhang [Sat, 22 Jul 2017 17:59:38 +0000 (17:59 +0000)]
Merge "Reindex db when package w/ searchIndexProvider changes" into oc-dr1-dev
am:
6fcc38975c
Change-Id: Iacb3b689d1099bb12e43ff42e2f17166428ddfc5
Fan Zhang [Sat, 22 Jul 2017 17:59:36 +0000 (17:59 +0000)]
Merge "Reindex db when package w/ searchIndexProvider changes" into oc-dr1-dev
am:
6fcc38975c -s ours
Change-Id: I8ab95d4753c9369a4d47c83ade83380d26733b46
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
Android Build Merger (Role) [Sat, 22 Jul 2017 16:38:48 +0000 (16:38 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
4d7111b0e9 -s ours am:
ccf6996623 -s ours" into oc-mr1-dev-plus-aosp
Bill Yi [Sat, 22 Jul 2017 16:38:29 +0000 (16:38 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
4d7111b0e9 -s ours
am:
098c04e781 -s ours
Change-Id: Ie43f65cae3a7422bfbb0d95281e30489f1c36365
Bill Yi [Sat, 22 Jul 2017 16:38:28 +0000 (16:38 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
4d7111b0e9 -s ours
am:
ccf6996623 -s ours
Change-Id: I61ebe83e46f7dcaf8ffe3eddc817858c48695b38
Bill Yi [Sat, 22 Jul 2017 16:32:30 +0000 (16:32 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
4d7111b0e9 -s ours
Change-Id: Ia23869b823b5f9f578eea955f037393960bb02e0
Bill Yi [Sat, 22 Jul 2017 16:32:30 +0000 (16:32 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
4d7111b0e9 -s ours
Change-Id: Ida2173d9ce4c4f4aa3efbb24fe0b68d9fa940a29
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
Android Build Merger (Role) [Sat, 22 Jul 2017 00:38:00 +0000 (00:38 +0000)]
Merge "Merge "Add help uri for process stats summary and apps." into oc-dr1-dev am:
59a66d9b77 am:
ebd8308698" into oc-mr1-dev-plus-aosp
Andrew Sapperstein [Sat, 22 Jul 2017 00:37:40 +0000 (00:37 +0000)]
Merge "Add help uri for process stats summary and apps." into oc-dr1-dev am:
59a66d9b77
am:
ebd8308698
Change-Id: I5bcbe810c82c2a71a8cd8ff8f9ab5a6f4a6015e7
Android Build Merger (Role) [Sat, 22 Jul 2017 00:37:19 +0000 (00:37 +0000)]
Merge "Merge "Tweak bluetooth name preference" into oc-dr1-dev am:
03c595ce24 am:
3ecdee573b" into oc-mr1-dev-plus-aosp
Fan Zhang [Sat, 22 Jul 2017 00:37:06 +0000 (00:37 +0000)]
Merge "Tweak bluetooth name preference" into oc-dr1-dev am:
03c595ce24
am:
3ecdee573b
Change-Id: Iceb537582606cca48f50de701232c8c868cc523c
Michael Wachenschwanz [Tue, 11 Jul 2017 18:11:16 +0000 (11:11 -0700)]
Add Foreground Service time to battery usage
Add foreground service time to foreground usage time of apps. This will
account for app usage that user is aware of but is not being displayed
on screen, such as playing music while screen is locked.
Change-Id: Ica9fe0819e46b50299eb2eab7f0483ea01441fb0
Fixes:
38313557
Test: RunSettingsRoboTests
Android Build Merger (Role) [Sat, 22 Jul 2017 00:37:00 +0000 (00:37 +0000)]
Merge "Merge "Make anomaly item refresh in battery" into oc-dr1-dev am:
0ec3e4e626 am:
ab7a4db9df" into oc-mr1-dev-plus-aosp
Lei Yu [Sat, 22 Jul 2017 00:36:48 +0000 (00:36 +0000)]
Merge "Make anomaly item refresh in battery" into oc-dr1-dev am:
0ec3e4e626
am:
ab7a4db9df
Change-Id: Ic8abdff3468d1670533fe7bc99915fe3132c44ee
Android Build Merger (Role) [Sat, 22 Jul 2017 00:36:43 +0000 (00:36 +0000)]
Merge "Merge "Switch to using gray icon for Bluetooth imaging devices" into oc-dr1-dev am:
a6ac4890ed am:
0531bd48e3" into oc-mr1-dev-plus-aosp
Antony Sargent [Sat, 22 Jul 2017 00:36:30 +0000 (00:36 +0000)]
Merge "Switch to using gray icon for Bluetooth imaging devices" into oc-dr1-dev am:
a6ac4890ed
am:
0531bd48e3
Change-Id: I0c7931f70db596cce9ddeb91d2bbdc3fc2a99aeb
Android Build Merger (Role) [Sat, 22 Jul 2017 00:36:29 +0000 (00:36 +0000)]
Merge "Merge "Add help uri for process stats summary and apps." into oc-dr1-dev am:
59a66d9b77 am:
80a5336b25" into oc-mr1-dev-plus-aosp
Christine Franks [Sat, 22 Jul 2017 00:36:07 +0000 (00:36 +0000)]
Merge "Move logic for FR in demo mode out of Settings" into oc-dr1-dev am:
cb9a7075f8 -s ours
am:
18cd618368
Change-Id: Ia4986adc50cca19ca72e2e036cd7bef78006bbaf
Andrew Sapperstein [Sat, 22 Jul 2017 00:36:03 +0000 (00:36 +0000)]
Merge "Add help uri for process stats summary and apps." into oc-dr1-dev am:
59a66d9b77
am:
80a5336b25
Change-Id: Ib32bcfa22706abf89633b86333498f77328daebb
Andrew Sapperstein [Sat, 22 Jul 2017 00:33:13 +0000 (00:33 +0000)]
Merge "Add help uri for process stats summary and apps." into oc-dr1-dev
am:
59a66d9b77
Change-Id: I2b279d3a1562e693caeaf64f2f91ab629b4e294f
Fan Zhang [Sat, 22 Jul 2017 00:32:48 +0000 (00:32 +0000)]
Merge "Tweak bluetooth name preference" into oc-dr1-dev am:
03c595ce24
am:
ef0e290e65
Change-Id: I77ca5052477a9e1efee01c7022378164096669b8
Fan Zhang [Sat, 22 Jul 2017 00:32:42 +0000 (00:32 +0000)]
Merge "Tweak bluetooth name preference" into oc-dr1-dev
am:
03c595ce24
Change-Id: I1d2f8d65fb7ba48bac656222c4501306103b385c
Andrew Sapperstein [Sat, 22 Jul 2017 00:32:32 +0000 (00:32 +0000)]
Merge "Add help uri for process stats summary and apps." into oc-dr1-dev
am:
59a66d9b77
Change-Id: I7513463a50ddef4f49d8d7ab06ed8fd9e19d3a52
OSDN Git Service
