OSDN Git Service
TreeHugger Robot [Mon, 8 Jan 2018 11:45:49 +0000 (11:45 +0000)]
Merge "Start BackupManagerConstants content observer"
Bartosz Fabianowski [Fri, 5 Jan 2018 10:56:26 +0000 (11:56 +0100)]
Start BackupManagerConstants content observer
BackupManagerConstants has a content observer that is meant to be
notified whenever backup settings change. However, that observer is
never registered.
Bug:
71622864
Test: cts-tradefed run cts-dev --module CtsBackupHostTestCase
Change-Id: Icbd90ef3af83dd2f29e26a5d787505bcf5681154
Alan Stokes [Mon, 8 Jan 2018 09:48:43 +0000 (09:48 +0000)]
Merge "Tidy up DexLoggerIntegrationTests."
Peter Visontay [Mon, 8 Jan 2018 09:12:44 +0000 (09:12 +0000)]
Merge "Add AndroidTest.xml for privacy tests."
TreeHugger Robot [Mon, 8 Jan 2018 07:33:19 +0000 (07:33 +0000)]
Merge "Parameter to hide bottom affordances"
TreeHugger Robot [Mon, 8 Jan 2018 06:30:57 +0000 (06:30 +0000)]
Merge "[RTT2] Clean-up the RTT service name"
Jeff Sharkey [Mon, 8 Jan 2018 02:08:17 +0000 (02:08 +0000)]
Merge "Add DataUnit to clarify SI-vs-IEC units."
Jeff Sharkey [Sun, 7 Jan 2018 23:47:31 +0000 (16:47 -0700)]
Add DataUnit to clarify SI-vs-IEC units.
Mirrors the design of TimeUnit and ChronoUnit which many developers
are already familiar with, making it easy to pick up and use.
Yes, this is an enum.
Bug:
70915728
Test: bit FrameworksCoreTests:android.util.DataUnitTest
Change-Id: Id0cfdac5c81ed89c3c9ece23c964acba4a4f8471
TreeHugger Robot [Sun, 7 Jan 2018 23:09:27 +0000 (23:09 +0000)]
Merge "Notifier: Chained attribution support for noteLongPartialWakeLock[finish|start]"
TreeHugger Robot [Sat, 6 Jan 2018 21:28:23 +0000 (21:28 +0000)]
Merge "Add permission necessary to use RecoverableKeyStoreLoader API."
Robert Berry [Sat, 6 Jan 2018 19:16:25 +0000 (19:16 +0000)]
Add API to remove recoverable keys
Test: adb shell am instrument -w -e package com.android.server.locksettings.recoverablekeystore com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: Ib69e730467974d34ffe4a700bd6aaf4543a524ae
TreeHugger Robot [Sat, 6 Jan 2018 18:41:05 +0000 (18:41 +0000)]
Merge "Check the public key bytes of veriferPublicKey matche the ones in vaultParams"
TreeHugger Robot [Sat, 6 Jan 2018 04:37:59 +0000 (04:37 +0000)]
Merge "Fix a few things with the loadtest app."
Lucas Dupin [Sat, 6 Jan 2018 04:29:24 +0000 (04:29 +0000)]
Turn default gradient into solid black am:
12dad0c4fc
am:
555e680089 -s ours
Change-Id: Ieafc75f5f6d7aeb05b4a03cdd83cf48ece650b69
Lucas Dupin [Sat, 6 Jan 2018 03:34:46 +0000 (03:34 +0000)]
Turn default gradient into solid black
am:
12dad0c4fc
Change-Id: I6f5c702487f46395bd1930d943782d1a9b6bac5d
TreeHugger Robot [Sat, 6 Jan 2018 03:31:24 +0000 (03:31 +0000)]
Merge "Turn on Settings security settings v2."
TreeHugger Robot [Sat, 6 Jan 2018 01:30:21 +0000 (01:30 +0000)]
Merge "pullers now cache data to throttle frequent pull requests. all pullers have a default 1s cool down before next pull. We can adjust these later. Also add puller stats in StatsdStats"
TreeHugger Robot [Sat, 6 Jan 2018 01:16:31 +0000 (01:16 +0000)]
Merge "Re-commit: Smooth scroll RecyclerView on a11y ACTION_SCROLL_*"
Stefan Lafon [Fri, 5 Jan 2018 06:03:29 +0000 (22:03 -0800)]
Fix a few things with the loadtest app.
Test: Loadtest app is running fine.
Change-Id: I834f6c618f5a6b0b17ecd5592e2ab2209ce7b94a
Fyodor Kupolov [Sat, 6 Jan 2018 00:54:41 +0000 (00:54 +0000)]
Merge "Added GlobalSettingsToPropertiesMapper"
TreeHugger Robot [Sat, 6 Jan 2018 00:54:32 +0000 (00:54 +0000)]
Merge "Remove @SystemApi annotation from private or package-private members"
Bo Zhu [Fri, 5 Jan 2018 22:50:52 +0000 (14:50 -0800)]
Check the public key bytes of veriferPublicKey matche the ones in
vaultParams
Test: adb shell am instrument -w -e package
com.android.server.locksettings.recoverablekeystore
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: Iac26de202be88c8328619b03dd59ab742aa7e4c3
Chenjie Yu [Mon, 18 Dec 2017 23:15:34 +0000 (15:15 -0800)]
pullers now cache data to throttle frequent pull requests.
all pullers have a default 1s cool down before next pull.
We can adjust these later.
Also add puller stats in StatsdStats
Test: unit test
Change-Id: I71894a24c41e059d841591312dbb852f54387b7d
TreeHugger Robot [Fri, 5 Jan 2018 23:22:32 +0000 (23:22 +0000)]
Merge "Single color scrim"
Lucas Dupin [Mon, 30 Oct 2017 18:09:25 +0000 (11:09 -0700)]
Turn default gradient into solid black
Test: visual
Bug:
66957450
Change-Id: I6a34a35912e4dd4594565f88636ce89689d26f2f
(cherry picked from commit
e7476addecb4fec6abd08cfb7aa27c473ce5c1f0)
TreeHugger Robot [Fri, 5 Jan 2018 22:59:48 +0000 (22:59 +0000)]
Merge "Refactor PlatformKeyManger to remove mUserId to fix two tests that fail on clean devices without secure screenlocks"
Michal Karpinski [Fri, 5 Jan 2018 22:46:08 +0000 (22:46 +0000)]
Merge "Ancestral restore versioning for PackageManagerBackupAgent"
TreeHugger Robot [Fri, 5 Jan 2018 22:40:46 +0000 (22:40 +0000)]
Merge "Add config flag to enable/disable nav bar auto dim"
TreeHugger Robot [Fri, 5 Jan 2018 22:23:36 +0000 (22:23 +0000)]
Merge "Avoid overwriting bucket in Gauge metric producer as anomaly tracker needs past buckets."
TreeHugger Robot [Fri, 5 Jan 2018 22:04:22 +0000 (22:04 +0000)]
Merge "Prevents scheduling sysui frames on smaller devices with no sim"
Siyamed Sinir [Fri, 5 Jan 2018 22:02:07 +0000 (22:02 +0000)]
Merge "Enable/disable fallback line spacing in TextView"
Chen Xu [Fri, 5 Jan 2018 21:56:42 +0000 (21:56 +0000)]
Merge "Carrier identification config updater"
Lucas Dupin [Fri, 5 Jan 2018 19:36:51 +0000 (11:36 -0800)]
Single color scrim
Removed gradient and kept brightest color.
Test: atest ./tests/Internal/src/com/android/internal/colorextraction/types/TonalTest.java
Test: visual
Bug:
64122537
Change-Id: I75cba32172a5869f3d8a57ab9955bffcba60db76
Tomasz Wasilczyk [Fri, 5 Jan 2018 21:26:20 +0000 (21:26 +0000)]
Merge "Implement part of ITunerSession interface."
Fan Zhang [Fri, 5 Jan 2018 21:10:16 +0000 (13:10 -0800)]
Turn on Settings security settings v2.
Bug:
32953042
Test: rebuild
Change-Id: Ia21d2947306b567dc9580c816c0261836356a281
Bo Zhu [Fri, 5 Jan 2018 06:42:36 +0000 (22:42 -0800)]
Refactor PlatformKeyManger to remove mUserId to fix two tests that fail
on clean devices without secure screenlocks
The mUserId is removed to allow a mocked PlatformKeyManager to be passed
into RecoverableKeyStoreManager for tests.
Test: adb shell am instrument -w -e package
com.android.server.locksettings.recoverablekeystore
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I9b1fda3c7d869b683cd71cb81ea88da5d995ace9
Lucas Dupin [Fri, 5 Jan 2018 20:57:27 +0000 (12:57 -0800)]
Parameter to hide bottom affordances
Created configurable xml parameter to hide the mic/phone
affordance at the bottom of the lock screen, fixed minor
animation issue where circle would still expand if affordance
isn't visible and set default visibility to false.
Test: Double tap to open camera from AoD, lock screen and launcher
Test: visual, set config, look at lock screen
Bug:
64155983
Change-Id: If5cd2c2c369578480c0ad4e8a98970bcfabd5f3e
TreeHugger Robot [Fri, 5 Jan 2018 20:55:02 +0000 (20:55 +0000)]
Merge "WebView: clarify docs regarding base64 encoding"
Jean-Michel Trivi [Fri, 5 Jan 2018 20:20:46 +0000 (20:20 +0000)]
Merge "Audio focus: definitive loss of focus removes client from stack"
Yangster-mac [Fri, 5 Jan 2018 20:00:37 +0000 (12:00 -0800)]
Avoid overwriting bucket in Gauge metric producer as anomaly tracker needs past buckets.
Test: statsd unit test passed.
Change-Id: I3c76846da169b36c447c77db76b3deeda87e9e6e
TreeHugger Robot [Fri, 5 Jan 2018 19:29:17 +0000 (19:29 +0000)]
Merge "Bugfix: wakeup alarms logging"
Rob Carr [Fri, 5 Jan 2018 19:15:54 +0000 (19:15 +0000)]
Merge "Ensure the IME container is never magnified."
TreeHugger Robot [Fri, 5 Jan 2018 18:44:54 +0000 (18:44 +0000)]
Merge "Updates atoms.proto for statsd."
TreeHugger Robot [Fri, 5 Jan 2018 18:35:55 +0000 (18:35 +0000)]
Merge "Remove transport dir name from TransportClient"
fionaxu [Fri, 29 Dec 2017 00:41:52 +0000 (16:41 -0800)]
Carrier identification config updater
Bug:
64131637
Test: test_carrier_id_full.sh samples/carrier-ids-sample.pb
Change-Id: I355e90292ef2073e403f13fb0f1d545e0f503c2f
TreeHugger Robot [Fri, 5 Jan 2018 18:24:14 +0000 (18:24 +0000)]
Merge "Use ServiceSpecificException in RecoverableKeyStoreMgr"
TreeHugger Robot [Fri, 5 Jan 2018 18:21:53 +0000 (18:21 +0000)]
Merge "Binding on-demand #8: Miscellaneous usages"
Bernardo Rufino [Thu, 4 Jan 2018 14:16:32 +0000 (14:16 +0000)]
Remove transport dir name from TransportClient
To be able to re-use the TransportClient infra for transport
registration, I need to remove transport dir name property from
TransportClient because it's not available before registration
itself. As a result callsites that used getTransportDirName()
from TransportClient will have to go through the
TransportManager for that. Bryan suggested that the
TransportClient wasn't the best place for the property before.
Ref: http://go/br-binding-on-demand
Bug:
17140907
Test: m -j RunFrameworksServicesTests
Change-Id: I3fa335faf97d63adfad1a929336073a70fc8bc02
Bernardo Rufino [Tue, 2 Jan 2018 16:01:53 +0000 (16:01 +0000)]
Binding on-demand #8: Miscellaneous usages
Migrate usages of the transport binder to binding on-demand:
* getDestinationString()
* isAppEligibleForBackup()
* dump()
For getDestinationString() we'll be introducing an invisible bug for
people that haven't updated GMSCore to include the usage of
updateTransportAttributes() API introduced in earlier CL. The bug is
that that text won't change, it'll remain constant. It's invisible
because currently only place that uses that method is Settings in some
circumstances that depend on the transport, and those circunstances
don't happen with our transports. Check http://ag/
1831025.
For isAppEligibleForBackup(), a new filterAppsEligibleForBackup() is
created and there we bind on-demand.
Change-Id: Idc9e31f0e8eda8531e204c05a84fafdaf0247d08
Ref: http://go/br-binding-on-demand
Bug:
17140907
Test: adb shell dumpsys backup, observe destination of transports
Test: adb shell bmgr backupnow --all, observe only eligible apps got backed-up
Test: Force-loaded settings screen and observed destination string
Test: m -j RunFrameworksServicesRoboTests
Mike Reed [Fri, 5 Jan 2018 16:33:18 +0000 (16:33 +0000)]
Merge "IWYU for sk_malloc_throw"
Etan Cohen [Fri, 5 Jan 2018 16:00:15 +0000 (16:00 +0000)]
Merge "[AWARE] Uhide the RTT in context of Aware discovery API"
Mike Reed [Fri, 5 Jan 2018 15:25:08 +0000 (10:25 -0500)]
IWYU for sk_malloc_throw
Test: build
Change-Id: I20155994d8d22445afbe9ab9949ae8cce6871a0b
Alan Stokes [Fri, 5 Jan 2018 14:36:00 +0000 (14:36 +0000)]
Tidy up DexLoggerIntegrationTests.
Addressing comments from ag/
3381420.
I also fixed two lines that were slightly too long.
Bug:
63927552
Test: atest DexLoggerIntegrationTests
Change-Id: I258d0aa2068c76175d30c0be9ba95482d3db9437
Jorim Jaggi [Fri, 5 Jan 2018 14:34:06 +0000 (14:34 +0000)]
Merge "Mark tests flaky"
Peter Visontay [Mon, 18 Dec 2017 20:34:03 +0000 (20:34 +0000)]
Define a @SystemApi string ID for each App Op.
Internal numeric op codes may change, but the public string IDs must consistently refer to the same operation.
Bug:
63907873
Test: Ran the tests being added in this this topic: make CtsPermissionTestCases -j32 && cts-tradefed run singleCommand cts-dev -m CtsPermissionTestCases --test android.permission.cts.AppOpsTest
Change-Id: I12bd9e2384d938120a403c4d76be4c1479ffd4ee
Robert Berry [Fri, 5 Jan 2018 12:43:13 +0000 (12:43 +0000)]
Use ServiceSpecificException in RecoverableKeyStoreMgr
This is so we can better convey error codes to the client.
Test: adb shell am instrument -w -e package
com.android.server.locksettings.recoverablekeystore
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I02d0ed07e895d3a0297f77934830e19bb6abf43e
Jorim Jaggi [Fri, 5 Jan 2018 12:14:39 +0000 (13:14 +0100)]
Mark tests flaky
Bug:
71602314
Change-Id: Iebbc8d6bf4e2a528bf19f84782a892f506ca75a8
TreeHugger Robot [Fri, 5 Jan 2018 10:59:28 +0000 (10:59 +0000)]
Merge "Add createNewItem() to RingBuffer util class."
Narayan Kamath [Fri, 5 Jan 2018 09:16:21 +0000 (09:16 +0000)]
Merge "BatteryStatsImpl: Support chained attribution for BT events."
Narayan Kamath [Tue, 2 Jan 2018 18:57:17 +0000 (18:57 +0000)]
Notifier: Chained attribution support for noteLongPartialWakeLock[finish|start]
Test: BatteryStatsNoteTest
Bug:
62390666
Change-Id: I1f393b475cb18171f4d24f8774f3509a00e2a404
Narayan Kamath [Fri, 5 Jan 2018 09:02:18 +0000 (09:02 +0000)]
Merge "BatteryStats: Add WorkChain support for WiFi events."
TreeHugger Robot [Fri, 5 Jan 2018 08:22:18 +0000 (08:22 +0000)]
Merge "Remove unused userId parameter from RecoverableKeyStoreManager."
TreeHugger Robot [Fri, 5 Jan 2018 07:19:13 +0000 (07:19 +0000)]
Merge "Do not block ambient mode IPC"
Howard Ro [Fri, 5 Jan 2018 06:44:38 +0000 (06:44 +0000)]
Merge "Use the configs from disk after reboot and separate out ConfigManager startup for unit test to avoid reading configs for tests"
Nate Fischer [Fri, 5 Jan 2018 05:57:33 +0000 (21:57 -0800)]
WebView: clarify docs regarding base64 encoding
Docs change only, no change to logic.
This CL provides a better loadData() example, using base64 encoding.
This uses the Base64 class already provided by Android to automatically
handle the encoding.
This also changes the percent-encoding docs to:
* Link to the official RFC
* No longer provide examples of characters to encode (one example was
incorrect, '\' is not %27)
Bug:
70555565
Test: make docs (manually verify things look good)
Test: I built a sample app and tested Base64#encodetoString to make sure the flags are correct
Change-Id: If9f810e6b568efdc5d1ad84ac64f2abf3788f40b
Lucas Dupin [Thu, 4 Jan 2018 22:28:52 +0000 (14:28 -0800)]
Do not block ambient mode IPC
This can happen asynchronously, blocking may lower
frame rate.
Bug:
70857288
Test: press power button, look at AoD wallpaper
Change-Id: I453082adc0d5f58eb8e7cbf7663fca0cd0183075
Yangster-mac [Thu, 4 Jan 2018 21:28:38 +0000 (13:28 -0800)]
Bug fix: gauge metric producer does not need the atom id parameter.
Test: statsd unit test passed
Change-Id: Ifd1e2f7a05a03886eb227ac1ae0e30b884e49f0c
Jeff Sharkey [Fri, 5 Jan 2018 03:53:56 +0000 (03:53 +0000)]
Merge "FBE devices now fully support adoptable storage."
Jeff Sharkey [Fri, 5 Jan 2018 03:49:06 +0000 (03:49 +0000)]
Merge "Intent to manage subscription plans."
Siyamed Sinir [Thu, 4 Jan 2018 03:39:39 +0000 (19:39 -0800)]
Enable/disable fallback line spacing in TextView
Add API to enable/disable fallback line spacing in TextView.
Test: bit FrameworksCoreTests:android.widget.TextViewFallbackLineSpacingTest
Bug:
65161512
Change-Id: I76ba7bdb7d25c7a94653144536295c50d8b0e495
Tomasz Wasilczyk [Thu, 4 Jan 2018 20:26:40 +0000 (12:26 -0800)]
Implement part of ITunerSession interface.
Methods not covered are related to tuning or program list.
This makes 11 passing test cases and still 6 failing for the new HAL.
Test: instrumentation
Bug:
69958777
Change-Id: I2631d66d05774adb9e8fd42c8309e16f832c4478
TreeHugger Robot [Fri, 5 Jan 2018 02:45:33 +0000 (02:45 +0000)]
Merge "Move Field proto out of stats_log.proto to keep it clean."
Robert Carr [Fri, 5 Jan 2018 02:27:42 +0000 (18:27 -0800)]
Ensure the IME container is never magnified.
The existing logic works based on the window types inside
containers but if we magnify the IME container before the
IME window is ever added then things can get out of whack.
Bug:
70640763
Test: Manual
Change-Id: Icb937c2e1c37a77190eed1c6248277036b7c0e6d
Fyodor Kupolov [Fri, 5 Jan 2018 02:18:24 +0000 (02:18 +0000)]
Merge "Account: Fix the risk of sqliteconnection leak" am:
766f0a4981 am:
130d5e3915
am:
28c72b43d9
Change-Id: Ibcf49239bae44081d2c8e10fe05ad3f6a07b52a1
Fyodor Kupolov [Fri, 5 Jan 2018 02:10:46 +0000 (02:10 +0000)]
Merge "Account: Fix the risk of sqliteconnection leak" am:
766f0a4981
am:
130d5e3915
Change-Id: I89eb0c20c06c7b077b59a4aa66b6693014192e43
Fyodor Kupolov [Fri, 5 Jan 2018 02:03:33 +0000 (02:03 +0000)]
Merge "Account: Fix the risk of sqliteconnection leak"
am:
766f0a4981
Change-Id: I7e0c6ee50fba9563ba45231709e0df8a3dbe266c
TreeHugger Robot [Fri, 5 Jan 2018 01:59:48 +0000 (01:59 +0000)]
Merge "Remove obsolete aidl list"
Fyodor Kupolov [Fri, 5 Jan 2018 01:53:28 +0000 (01:53 +0000)]
Merge "Account: Fix the risk of sqliteconnection leak"
Jeff Sharkey [Thu, 4 Jan 2018 23:46:48 +0000 (16:46 -0700)]
FBE devices now fully support adoptable storage.
We've finished all the underlying work to support adoptable storage
on FBE devices, so remove the code that was disabling it by default.
Introduce feature flag to make it easier to detect devices that
support adoptable storage.
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.AdoptableHostTest
Bug:
29923055,
25861755,
33252673,
37289651
Change-Id: I3630d690c9e66c7e41e316a4263ea2eb1e752ad3
Etan Cohen [Fri, 5 Jan 2018 01:47:37 +0000 (17:47 -0800)]
[RTT2] Clean-up the RTT service name
Replace place-holder rttmanager2 with final wifirtt.
Bug:
65108607
Test: integration tests
Change-Id: I287c2173a67b047f2796f12189ce269c416d87d7
Android Build Merger (Role) [Fri, 5 Jan 2018 01:47:48 +0000 (01:47 +0000)]
Merge "Merge changes I872a81ae,I0b9e72d2 am:
f30c2c02f0 am:
34445736d8 am:
3fcce9f251"
Andreas Gampe [Fri, 5 Jan 2018 01:47:23 +0000 (01:47 +0000)]
Merge changes I872a81ae,I0b9e72d2 am:
f30c2c02f0 am:
34445736d8
am:
3fcce9f251
Change-Id: Ic78c8cea300e402328313f8e70dcbee2d4716b64
TreeHugger Robot [Fri, 5 Jan 2018 01:45:14 +0000 (01:45 +0000)]
Merge "Bluetooth: Remove strings for enabling inband ringing"
Andreas Gampe [Fri, 5 Jan 2018 01:39:13 +0000 (01:39 +0000)]
Merge changes I872a81ae,I0b9e72d2 am:
f30c2c02f0
am:
34445736d8
Change-Id: I506b0e29977f0fbb410066dea46c99f264e01028
Dmitry Dementyev [Thu, 4 Jan 2018 23:19:19 +0000 (15:19 -0800)]
Remove unused userId parameter from RecoverableKeyStoreManager.
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: Ibf09724839cbdbf7172462ce0368278c7e65155f
Andreas Gampe [Fri, 5 Jan 2018 01:30:56 +0000 (01:30 +0000)]
Merge changes I872a81ae,I0b9e72d2
am:
f30c2c02f0
Change-Id: Ie495ff6b40f72203b5fae68fb00e35289b29f356
Treehugger Robot [Fri, 5 Jan 2018 01:14:44 +0000 (01:14 +0000)]
Merge changes I872a81ae,I0b9e72d2
* changes:
Revert "Frameworks: Move SharedPreferencesImpl to Future"
Revert "Frameworks: Silently ignore InterruptedException"
TreeHugger Robot [Fri, 5 Jan 2018 01:01:07 +0000 (01:01 +0000)]
Merge "Remove AndroidKeyStoreFactory now as it's not used anymore"
TreeHugger Robot [Fri, 5 Jan 2018 00:57:21 +0000 (00:57 +0000)]
Merge "Always bind slice on background"
Yangster-mac [Thu, 4 Jan 2018 23:43:39 +0000 (15:43 -0800)]
Move Field proto out of stats_log.proto to keep it clean.
Test: statsd unit test passed.
Change-Id: I31ffea40cf1b82c16bf37c706969bfb159639c7b
TreeHugger Robot [Fri, 5 Jan 2018 00:32:25 +0000 (00:32 +0000)]
Merge "Let wallpaper know when to animate AoD transition"
Jeff Sharkey [Fri, 5 Jan 2018 00:14:15 +0000 (00:14 +0000)]
Merge "Enforce file transfer restrictions for shell."
TreeHugger Robot [Fri, 5 Jan 2018 00:02:48 +0000 (00:02 +0000)]
Merge "Add getSummaryMethod to AbstractPreferenceController"
Philip P. Moltmann [Thu, 4 Jan 2018 23:50:40 +0000 (23:50 +0000)]
Merge changes from topic "BackupManagerModernInstallInterface"
* changes:
Disable installation via adb restore
Use modern install method in backup service
Jack He [Thu, 7 Dec 2017 23:18:40 +0000 (15:18 -0800)]
Bluetooth: Remove strings for enabling inband ringing
* As in-band ringing is enabled by default on supported devices, user
action in development settings should be disabling it instead of
enabling it
* The new string is added to packages/apps/Settings and the old string
is hence removed from SettingsLib
Bug:
65383086
Test: make, try toggling the preference and verify in-band ringing's
behavior
Change-Id: I18858e86f4127f6555cce27d239d2682b6134fe2
TreeHugger Robot [Thu, 4 Jan 2018 23:45:38 +0000 (23:45 +0000)]
Merge "Log wallpaper redraw"
Jeff Sharkey [Thu, 4 Jan 2018 23:04:11 +0000 (16:04 -0700)]
Intent to manage subscription plans.
Define an API for carrier apps to provide a deep-link into their app
for the user to see more details about their billing relationship,
such as upgrading plans.
The createManageSubscriptionIntent() method is ready for OS
components to use when deciding if they should show a "MANAGE"
button in their UI, and the returned Intent is fully constructed
and ready to roll.
Test: builds, boots
Bug:
64133169
Change-Id: I9b2775b7cba5313f517996870135eb4682082873
yro [Thu, 4 Jan 2018 22:57:45 +0000 (14:57 -0800)]
Use the configs from disk after reboot and separate out ConfigManager
startup for unit test to avoid reading configs for tests
Bug:
70667694
Test: manual testing conducted, statsd, statsd_test
Change-Id: I49cb82d2b1d7c178b7a4c30c089d8d93e7902faa
Colin Cross [Thu, 4 Jan 2018 22:59:10 +0000 (14:59 -0800)]
Remove obsolete aidl list
Remove the obsolete aidl list, framework.aidl is now generated
from the stubs jars.
Bug:
70046217
Test: m checkbuild
Change-Id: I2417f0a8f193bd4db4058f6f0bb05c147e18de25
TreeHugger Robot [Thu, 4 Jan 2018 22:57:25 +0000 (22:57 +0000)]
Merge "Do not return pointer to freed memory"