Paul Duffin
4862614004
Add dependencies on org.apache.http.legacy where needed
...
Incorporates two main changes:
* Stops statically including the org.apache.http.legacy library. That library is
a stubs library so it makes no sense to statically include it.
* Adds uses-library declaration for org.apache.http.legacy to those packages
that depend on org.apache.http.legacy, either directly or transitively.
The following change descriptions were generated automatically and so
may be a little repetitive. They are provided to give the reviewer
enough information to check the comments match what has actually been
changed and check the reasoning behind the changes.
* AndroidManifest.xml
Added <uses-library> for org.apache.http.legacy to ensure classes
are provided at runtime. It is not treated as optional as the
application is not intended to be run on a version that does not
provide the library, i.e. its minSdkVersion is >= M (23)
Bug: 18027885
Test: m -j32 droid && adb reboot bootloader && fastboot flashall -w
Change-Id: I556b54f57ee430b40c4d0870d8179b2cdda43b96
2017-07-24 15:46:40 +01:00
Andrew Sapperstein
36af00bb21
Add ResultPayload for always-on ambient display.
...
Bug: 62022517
Test: robotest
Change-Id: Ib4ee4d8d999e5a1f9edf34ea6068644b41fc4838
2017-07-23 06:11:22 +00:00
Andrew Sapperstein
eb1a45b95b
Add ResultPayload for always-on ambient display.
...
Bug: 62022517
Test: robotest
Change-Id: Ib6382030ffa0c159ab6ca4b45dd966ee9287181f
Merged-In: Ib4ee4d8d999e5a1f9edf34ea6068644b41fc4838
2017-07-22 20:57:07 -07:00
Fan Zhang
2e550c25d5
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
...
am: 34e1495b9a
2017-07-22 18:06:33 +00:00
Fan Zhang
3ab1481442
Merge "Reindex db when package w/ searchIndexProvider changes" into oc-dr1-dev am: 6fcc38975c am: 2c7b00d101 -s ours
...
am: 4bcaef7b0c
2017-07-22 18:06:09 +00:00
Android Build Merger (Role)
34e1495b9a
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
2017-07-22 18:03:23 +00:00
Fan Zhang
85e7ac21d7
Merge "Reindex db when package w/ searchIndexProvider changes" into oc-dr1-dev am: 6fcc38975c -s ours
...
am: 6cd295af8a
2017-07-22 18:03:07 +00:00
Fan Zhang
4bcaef7b0c
Merge "Reindex db when package w/ searchIndexProvider changes" into oc-dr1-dev am: 6fcc38975c
...
am: 2c7b00d101
2017-07-22 18:03:06 +00:00
Fan Zhang
2c7b00d101
Merge "Reindex db when package w/ searchIndexProvider changes" into oc-dr1-dev
...
am: 6fcc38975c
2017-07-22 17:59:38 +00:00
Fan Zhang
6cd295af8a
Merge "Reindex db when package w/ searchIndexProvider changes" into oc-dr1-dev
...
am: 6fcc38975c
2017-07-22 17:59:36 +00:00
TreeHugger Robot
6fcc38975c
Merge "Reindex db when package w/ searchIndexProvider changes" into oc-dr1-dev
2017-07-22 17:54:31 +00:00
Bill Yi
e079b45c81
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
...
am: 47099cf173
2017-07-22 16:47:52 +00:00
Bill Yi
a0a33d158c
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 4d7111b0e9 -s ours am: 098c04e781 -s ours
...
am: eca137aa43
2017-07-22 16:47:28 +00:00
Android Build Merger (Role)
47099cf173
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
2017-07-22 16:38:48 +00:00
Bill Yi
eca137aa43
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 4d7111b0e9 -s ours
...
am: 098c04e781
2017-07-22 16:38:29 +00:00
Bill Yi
4e3ff0501f
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 4d7111b0e9 -s ours
...
am: ccf6996623
2017-07-22 16:38:28 +00:00
Bill Yi
098c04e781
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: 4d7111b0e9
2017-07-22 16:32:30 +00:00
Bill Yi
ccf6996623
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: 4d7111b0e9
2017-07-22 16:32:30 +00:00
TreeHugger Robot
4d7111b0e9
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
2017-07-22 16:25:35 +00:00
TreeHugger Robot
06ce58b8d5
Merge "Import translations. DO NOT MERGE"
2017-07-22 16:13:53 +00:00
Bill Yi
555a55210a
Import translations. DO NOT MERGE
...
Change-Id: I0dbb4c3f5c88953469428df5ac70973d18e253ba
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-22 03:57:25 -07:00
Bill Yi
5f049085b9
Import translations. DO NOT MERGE
...
Change-Id: I72ad5b5a671392c519f7a4ca5fce76404c2240b5
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-22 03:36:18 -07:00
TreeHugger Robot
60bb1d39eb
Merge "Post preference update logic to main thread"
2017-07-22 02:23:48 +00:00
Andrew Sapperstein
4e5a6b988a
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
...
am: cdb44fee84
2017-07-22 00:44:28 +00:00
Fan Zhang
fe70452f51
Merge "Merge "Tweak bluetooth name preference" into oc-dr1-dev am: 03c595ce24 am: 3ecdee573b" into oc-mr1-dev-plus-aosp
...
am: b0431ad1ca
2017-07-22 00:44:07 +00:00
Lei Yu
f1286c1281
Merge "Merge "Make anomaly item refresh in battery" into oc-dr1-dev am: 0ec3e4e626 am: ab7a4db9df" into oc-mr1-dev-plus-aosp
...
am: 1ef1ea17b2
2017-07-22 00:43:47 +00:00
Antony Sargent
46a4a76c90
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
...
am: 465871284e
2017-07-22 00:43:28 +00:00
Andrew Sapperstein
5a99deabf2
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
...
am: 3c6df33d4b
2017-07-22 00:42:57 +00:00
Christine Franks
3c7c330038
Merge "Move logic for FR in demo mode out of Settings" into oc-dr1-dev am: cb9a7075f8 -s ours am: 18cd618368
...
am: e147a19773
2017-07-22 00:42:31 +00:00
Fan Zhang
8047d73aea
Merge "Tweak bluetooth name preference" into oc-dr1-dev am: 03c595ce24 am: ef0e290e65
...
am: 715f0956f4
2017-07-22 00:42:13 +00:00
Lei Yu
6b82b25e62
Merge "Make anomaly item refresh in battery" into oc-dr1-dev am: 0ec3e4e626 am: 454131cdb0
...
am: c857c195cf
2017-07-22 00:41:54 +00:00
Antony Sargent
99257e5d7f
Merge "Switch to using gray icon for Bluetooth imaging devices" into oc-dr1-dev am: a6ac4890ed am: 62b7527da5
...
am: 75512a3215
2017-07-22 00:41:38 +00:00
Christine Franks
4eeb7111c7
Merge "Move logic for FR in demo mode out of Settings" into oc-dr1-dev am: cb9a7075f8 am: c350386476 -s ours
...
am: c2bd97a5df
2017-07-22 00:41:22 +00:00
Android Build Merger (Role)
cdb44fee84
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
2017-07-22 00:38:00 +00:00
Andrew Sapperstein
012244e52d
Merge "Add help uri for process stats summary and apps." into oc-dr1-dev am: 59a66d9b77
...
am: ebd8308698
2017-07-22 00:37:40 +00:00
Android Build Merger (Role)
b0431ad1ca
Merge "Merge "Tweak bluetooth name preference" into oc-dr1-dev am: 03c595ce24 am: 3ecdee573b" into oc-mr1-dev-plus-aosp
2017-07-22 00:37:19 +00:00
Fan Zhang
fab6b8cd4d
Merge "Tweak bluetooth name preference" into oc-dr1-dev am: 03c595ce24
...
am: 3ecdee573b
2017-07-22 00:37:06 +00:00
Michael Wachenschwanz
987711712c
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
2017-07-21 17:37:00 -07:00
Android Build Merger (Role)
1ef1ea17b2
Merge "Merge "Make anomaly item refresh in battery" into oc-dr1-dev am: 0ec3e4e626 am: ab7a4db9df" into oc-mr1-dev-plus-aosp
2017-07-22 00:37:00 +00:00
Lei Yu
5711e05a93
Merge "Make anomaly item refresh in battery" into oc-dr1-dev am: 0ec3e4e626
...
am: ab7a4db9df
2017-07-22 00:36:48 +00:00
Android Build Merger (Role)
465871284e
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
2017-07-22 00:36:43 +00:00
Antony Sargent
6055b14919
Merge "Switch to using gray icon for Bluetooth imaging devices" into oc-dr1-dev am: a6ac4890ed
...
am: 0531bd48e3
2017-07-22 00:36:30 +00:00
Android Build Merger (Role)
3c6df33d4b
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
2017-07-22 00:36:29 +00:00
Christine Franks
e147a19773
Merge "Move logic for FR in demo mode out of Settings" into oc-dr1-dev am: cb9a7075f8 -s ours
...
am: 18cd618368
2017-07-22 00:36:07 +00:00
Andrew Sapperstein
ca87892984
Merge "Add help uri for process stats summary and apps." into oc-dr1-dev am: 59a66d9b77
...
am: 80a5336b25
2017-07-22 00:36:03 +00:00
Andrew Sapperstein
ebd8308698
Merge "Add help uri for process stats summary and apps." into oc-dr1-dev
...
am: 59a66d9b77
2017-07-22 00:33:13 +00:00
Fan Zhang
715f0956f4
Merge "Tweak bluetooth name preference" into oc-dr1-dev am: 03c595ce24
...
am: ef0e290e65
2017-07-22 00:32:48 +00:00
Fan Zhang
3ecdee573b
Merge "Tweak bluetooth name preference" into oc-dr1-dev
...
am: 03c595ce24
2017-07-22 00:32:42 +00:00
Andrew Sapperstein
80a5336b25
Merge "Add help uri for process stats summary and apps." into oc-dr1-dev
...
am: 59a66d9b77
2017-07-22 00:32:32 +00:00
Christine Franks
61082f5d58
Merge "Move logic for FR in demo mode out of Settings" into oc-mr1-dev am: fd8b8eb0b1
...
am: 8061500847
2017-07-22 00:32:30 +00:00
