OSDN Git Service
Myles Watson [Wed, 10 Jan 2018 19:42:16 +0000 (19:42 +0000)]
Merge "Don't wait for Bluetooth when shutting down" am:
d9b3322e88 am:
9ae00d9d9a
am:
51019ab1d5 -s ours
Change-Id: I0f2351759a463de8f59036040c58ef706862b0f8
Myles Watson [Wed, 10 Jan 2018 19:32:21 +0000 (19:32 +0000)]
Merge "Don't wait for Bluetooth when shutting down" am:
d9b3322e88
am:
9ae00d9d9a
Change-Id: I005548cc409547cc6bdb7182c6d9ea52b4a4a46d
Myles Watson [Wed, 10 Jan 2018 19:22:23 +0000 (19:22 +0000)]
Merge "Don't wait for Bluetooth when shutting down"
am:
d9b3322e88
Change-Id: I31142d6ac6b04d2cfb7fcfc721d251a956c81c11
TreeHugger Robot [Wed, 10 Jan 2018 18:59:43 +0000 (18:59 +0000)]
Merge "Added new MANAGE_SCOPED_ACCESS_DIRECTORY_PERMISSIONS permission."
TreeHugger Robot [Wed, 10 Jan 2018 18:50:55 +0000 (18:50 +0000)]
Merge "Map isolated uid to host uid when processing log event in statsD."
Treehugger Robot [Wed, 10 Jan 2018 18:19:03 +0000 (18:19 +0000)]
Merge "Don't wait for Bluetooth when shutting down"
TreeHugger Robot [Wed, 10 Jan 2018 18:16:24 +0000 (18:16 +0000)]
Merge "Remove use of preference-v14 res directory that is removed."
Myles Watson [Sat, 6 Jan 2018 00:12:54 +0000 (16:12 -0800)]
Don't wait for Bluetooth when shutting down
Bluetooth doesn't need to be shut down cleanly; shutting it down just
slows down the shutdown process.
Change-Id: I91fc9b26930a392f0c4462c76626a966051aea7b
Merged-In: Ic2ed89dd618806adc6646066ab0956dea4a94d8e
Bug:
70855323
Test: Boot, shut down, boot, shut down.
TreeHugger Robot [Wed, 10 Jan 2018 17:59:23 +0000 (17:59 +0000)]
Merge "Remove user state in onUserRemoved"
Vishnu Nair [Wed, 10 Jan 2018 17:50:48 +0000 (17:50 +0000)]
Merge "Add window tracing functions to WindowMangerService"
Sunny Goyal [Wed, 10 Jan 2018 17:46:07 +0000 (17:46 +0000)]
Merge "Adding support for overriding app-awidget properties at runtime"
Jordan Liu [Wed, 10 Jan 2018 17:34:40 +0000 (17:34 +0000)]
Merge "Add precise disconnect cause in DisconnectCause" am:
8098078edf am:
e77087994d
am:
35abe14435
Change-Id: Id1f9fe432c37fb8e34912b428f7b36c8d8c8403d
Jordan Liu [Wed, 10 Jan 2018 17:23:05 +0000 (17:23 +0000)]
Merge "Add precise disconnect cause in DisconnectCause" am:
8098078edf
am:
e77087994d
Change-Id: I1aae0435aa09faaeae396242fcd01cd6c7480527
Felipe Leme [Wed, 10 Jan 2018 01:29:24 +0000 (17:29 -0800)]
Added new MANAGE_SCOPED_ACCESS_DIRECTORY_PERMISSIONS permission.
Test: m update-api
Bug:
63720392
Change-Id: I1c77c94597b98f72e210d3a8e3fe00c12a149b8a
Jordan Liu [Wed, 10 Jan 2018 17:15:17 +0000 (17:15 +0000)]
Merge "Add precise disconnect cause in DisconnectCause"
am:
8098078edf
Change-Id: Idac4f27406b359bf51ae33f483d651e9e8316504
Jordan Liu [Wed, 10 Jan 2018 17:06:14 +0000 (17:06 +0000)]
Merge "Add precise disconnect cause in DisconnectCause"
TreeHugger Robot [Wed, 10 Jan 2018 16:30:19 +0000 (16:30 +0000)]
Merge "ShutdownThread: Don't wait for Bluetooth"
Michael Plass [Wed, 10 Jan 2018 16:23:49 +0000 (16:23 +0000)]
Merge "Deprecate WifiManager EXTRA_BSSID, EXTRA_WIFI_INFO"
TreeHugger Robot [Wed, 10 Jan 2018 14:38:32 +0000 (14:38 +0000)]
Merge "Add ImageDecoder.ImageInfo.getMimeType"
TreeHugger Robot [Wed, 10 Jan 2018 13:01:38 +0000 (13:01 +0000)]
Merge "WorkSource: Fix corner-case in equals method."
Peter Visontay [Wed, 10 Jan 2018 12:54:40 +0000 (12:54 +0000)]
Merge "Mark AppOpsManager.setMode() @TestApi."
TreeHugger Robot [Wed, 10 Jan 2018 12:53:04 +0000 (12:53 +0000)]
Merge "Additions and cleanups for ImageDecoder API"
TreeHugger Robot [Wed, 10 Jan 2018 12:34:17 +0000 (12:34 +0000)]
Merge "Correct synthetic password test assertions."
Victor Chang [Wed, 10 Jan 2018 10:56:45 +0000 (10:56 +0000)]
Merge "Add a new API android.icu.util.LocaleData"
Andrew Scull [Fri, 5 Jan 2018 18:33:58 +0000 (18:33 +0000)]
Correct synthetic password test assertions.
assertNotSame() compares object references not integer values which are
auto-boxed and so are never the same object.
Test: runtest frameworks-services -p com.android.server.locksettings
Change-Id: I70b54474004e7be843a5a0d352fe555f9d81cf75
TreeHugger Robot [Wed, 10 Jan 2018 09:49:25 +0000 (09:49 +0000)]
Merge "YAAFFFCR - Yet Another Android Autofill Framework Field Classification Refactoring."
Alan Stokes [Wed, 10 Jan 2018 09:26:06 +0000 (09:26 +0000)]
Merge "More DexLoggerIntegrationTests tweaks."
TreeHugger Robot [Wed, 10 Jan 2018 07:07:37 +0000 (07:07 +0000)]
Merge "[API review] Add ShortcutInfo.DISABLED_REASON_UNKNOWN"
Holly Jiuyu Sun [Wed, 10 Jan 2018 05:58:24 +0000 (05:58 +0000)]
Merge "Merge EuiccProfile into EuiccProfileInfo." am:
b01bd54b11 am:
6a5dc32ac3
am:
20f35f962e
Change-Id: I8f7cc7e81fc163119ffa15666f054b298d47fff1
Holly Jiuyu Sun [Wed, 10 Jan 2018 05:49:06 +0000 (05:49 +0000)]
Merge "Merge EuiccProfile into EuiccProfileInfo." am:
b01bd54b11
am:
6a5dc32ac3
Change-Id: I3d6df6f2bce5b6e19ce0ef2c13adc39fa1b9a862
Yangster-mac [Wed, 10 Jan 2018 00:29:22 +0000 (16:29 -0800)]
Map isolated uid to host uid when processing log event in statsD.
Test: added test case for isolated uid in Attribution e2e test.
Change-Id: I63d16ebee3e611b1ef0c910e5154cf27766cb330
Holly Jiuyu Sun [Wed, 10 Jan 2018 05:35:48 +0000 (05:35 +0000)]
Merge "Merge EuiccProfile into EuiccProfileInfo."
am:
b01bd54b11
Change-Id: I98c726fc7d6fb91e16234773fe6423b7e111126e
Holly Jiuyu Sun [Wed, 10 Jan 2018 05:21:35 +0000 (05:21 +0000)]
Merge "Merge EuiccProfile into EuiccProfileInfo."
yinxu [Wed, 10 Jan 2018 03:38:21 +0000 (03:38 +0000)]
Merge "Check null before calling clone()" am:
e1bdd513d0 am:
1c60aa03fc
am:
910cf3219c
Change-Id: I51ee6e90e464bfa1bae74ff8aacdf12378e15449
yinxu [Wed, 10 Jan 2018 03:28:45 +0000 (03:28 +0000)]
Merge "Check null before calling clone()" am:
e1bdd513d0
am:
1c60aa03fc
Change-Id: Ie06c696c8805e188d1af3121c66f3180a9845c16
yinxu [Wed, 10 Jan 2018 03:18:37 +0000 (03:18 +0000)]
Merge "Check null before calling clone()"
am:
e1bdd513d0
Change-Id: Ifabe6352c950f9d6ead4cbdd4345ef1fb20f065d
Treehugger Robot [Wed, 10 Jan 2018 03:07:26 +0000 (03:07 +0000)]
Merge "Check null before calling clone()"
Fyodor Kupolov [Wed, 10 Jan 2018 02:51:59 +0000 (18:51 -0800)]
Remove user state in onUserRemoved
Test: manual
Bug:
67959359
Change-Id: I63b1afea9e32c9a102b5b45c1ca8ba1419a93696
Jack Yu [Wed, 10 Jan 2018 02:49:44 +0000 (02:49 +0000)]
Merge "Exposed CDMA SID/NID get APIs" am:
0cb936a855 am:
46ffa48122
am:
e936a81557
Change-Id: I357f89c8d8ab7032710063e5cd6d2f761c9e1bb4
Jack Yu [Wed, 10 Jan 2018 02:39:54 +0000 (02:39 +0000)]
Merge "Exposed CDMA SID/NID get APIs" am:
0cb936a855
am:
46ffa48122
Change-Id: I4693b44d59a312def9f26ad54badd5533cd36dfd
TreeHugger Robot [Wed, 10 Jan 2018 02:38:11 +0000 (02:38 +0000)]
Merge "Add API EuiccController#startOtaUpdatingIfNecessary"
Jack Yu [Wed, 10 Jan 2018 02:33:16 +0000 (02:33 +0000)]
Merge "Exposed CDMA SID/NID get APIs"
am:
0cb936a855
Change-Id: Iec76a777a126a10c012363247acb4b6a3516c008
TreeHugger Robot [Wed, 10 Jan 2018 02:31:08 +0000 (02:31 +0000)]
Merge "Revert "Move zygote's seccomp setup to post-fork""
TreeHugger Robot [Wed, 10 Jan 2018 02:20:33 +0000 (02:20 +0000)]
Merge "Update recovery snapshot version."
Treehugger Robot [Wed, 10 Jan 2018 02:19:20 +0000 (02:19 +0000)]
Merge "Exposed CDMA SID/NID get APIs"
Elliott Hughes [Wed, 10 Jan 2018 01:55:14 +0000 (01:55 +0000)]
Merge "Remove obsolete workaround." am:
f448371208 am:
365604c300
am:
8ca799e22f
Change-Id: I6afd17cacebc896831f3b6049e850d671c2d7f73
TreeHugger Robot [Wed, 10 Jan 2018 01:47:27 +0000 (01:47 +0000)]
Merge "Avoid binder call on getAlwaysOn()"
Elliott Hughes [Wed, 10 Jan 2018 01:46:14 +0000 (01:46 +0000)]
Merge "Remove obsolete workaround." am:
f448371208
am:
365604c300
Change-Id: Ia153c371b8833b926b3e643bf265e67a438dfd91
Android Build Merger (Role) [Wed, 10 Jan 2018 01:35:37 +0000 (01:35 +0000)]
Merge "Merge "Expose a new public column network_type_bitmask and deprecate bearer_bitmask gradually." am:
72acefa6d8 am:
b51df90f28 am:
23274614da"
Elliott Hughes [Wed, 10 Jan 2018 01:35:34 +0000 (01:35 +0000)]
Merge "Remove obsolete workaround."
am:
f448371208
Change-Id: I2bd057c12b9915b9e45b206b9839d1a57b296f26
Cassie Han [Wed, 10 Jan 2018 01:33:29 +0000 (01:33 +0000)]
Merge "Expose a new public column network_type_bitmask and deprecate bearer_bitmask gradually." am:
72acefa6d8 am:
b51df90f28
am:
23274614da
Change-Id: Id1b1667359a45259aea7d32cf7426f843ba0f33f
Jerry Zhang [Wed, 10 Jan 2018 01:30:03 +0000 (01:30 +0000)]
Merge "Add setScreenUnlockedFunctions method to UsbManager"
Treehugger Robot [Wed, 10 Jan 2018 01:24:41 +0000 (01:24 +0000)]
Merge "Remove obsolete workaround."
Cassie Han [Wed, 10 Jan 2018 01:20:42 +0000 (01:20 +0000)]
Merge "Expose a new public column network_type_bitmask and deprecate bearer_bitmask gradually." am:
72acefa6d8
am:
b51df90f28
Change-Id: I7045d6b684351e3545d24a52d16cb53d85483f20
Cassie Han [Wed, 10 Jan 2018 01:08:55 +0000 (01:08 +0000)]
Merge "Expose a new public column network_type_bitmask and deprecate bearer_bitmask gradually."
am:
72acefa6d8
Change-Id: I25ad45c52cdcb9b4bf3d21f4f3b71c68e8ace362
TreeHugger Robot [Wed, 10 Jan 2018 00:58:06 +0000 (00:58 +0000)]
Merge "Import translations. DO NOT MERGE"
Cassie Han [Wed, 10 Jan 2018 00:55:32 +0000 (00:55 +0000)]
Merge "Expose a new public column network_type_bitmask and deprecate bearer_bitmask gradually."
Victor Hsieh [Wed, 10 Jan 2018 00:48:54 +0000 (00:48 +0000)]
Revert "Move zygote's seccomp setup to post-fork"
This reverts commit
a188dbc050b9fca41ed92928d68ed00c562de580.
Reason for revert: selinux denials, see b/
71768585
Change-Id: Ic1b81e146b52b68445ba634de39657f199107da3
Android Build Merger (Role) [Wed, 10 Jan 2018 00:38:18 +0000 (00:38 +0000)]
Merge "Merge "HFP: Add isInbandRingingEnabled() API (1/4)" am:
b1065d6995 am:
8dbfc24e5f am:
96a01775ac"
TreeHugger Robot [Wed, 10 Jan 2018 00:37:24 +0000 (00:37 +0000)]
Merge "Rename createSHA256Parameters to createSha256Parameters"
Jack He [Wed, 10 Jan 2018 00:36:06 +0000 (00:36 +0000)]
Merge "HFP: Add isInbandRingingEnabled() API (1/4)" am:
b1065d6995 am:
8dbfc24e5f
am:
96a01775ac
Change-Id: I3a6d80fcc6c510ceec1b4f1411344cf644093677
yinxu [Wed, 10 Jan 2018 00:27:10 +0000 (16:27 -0800)]
Check null before calling clone()
Bug:
67748005
Test: Basic telephony sanity
Change-Id: Ia46a82823b2d3c2bf3a6cb77a6fe191a7f7cb5d0
Dmitry Dementyev [Fri, 5 Jan 2018 23:46:00 +0000 (15:46 -0800)]
Update recovery snapshot version.
There is exactly one snapshot per userId - recovery agent uid pair.
Version is incremented when
1) User credential is updated
2) User unlockes phone and list of application keys was changes since
last snapshot creation.
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: I6ab98fcbbb05e33958e6def644b40441cb52de6a
Jack He [Wed, 10 Jan 2018 00:26:33 +0000 (00:26 +0000)]
Merge "HFP: Add isInbandRingingEnabled() API (1/4)" am:
b1065d6995
am:
8dbfc24e5f
Change-Id: I52fce02e6a0169dff418f4dae89ae54de7fd952d
TreeHugger Robot [Wed, 10 Jan 2018 00:22:45 +0000 (00:22 +0000)]
Merge "E2e test: attribution matching and slicing by attribution."
TreeHugger Robot [Wed, 10 Jan 2018 00:21:18 +0000 (00:21 +0000)]
Merge "WifiManager: startScan throttling"
Malcolm Chen [Wed, 10 Jan 2018 00:18:56 +0000 (00:18 +0000)]
Merge "Add isMobileDataEnabled in TelephonyManager." am:
ed7eead23b am:
6b943d5deb
am:
904340088a -s ours
Change-Id: Id32dd08ebec6e0f90a08a360ce1b6488adbeab40
Jack He [Wed, 10 Jan 2018 00:18:15 +0000 (00:18 +0000)]
Merge "HFP: Add isInbandRingingEnabled() API (1/4)"
am:
b1065d6995
Change-Id: Ia3112caa3971406cb0ef44cc25c19865a0b6ddf1
TreeHugger Robot [Wed, 10 Jan 2018 00:09:16 +0000 (00:09 +0000)]
Merge "Fix small but crashy edge case in Icon.scaleDown"
Android Build Merger (Role) [Wed, 10 Jan 2018 00:08:22 +0000 (00:08 +0000)]
Merge "Merged-In: I0906de76abf4124d74f7f4f80ac0eab3cbf94f7e docs: Revised descriptions of binding and connecting to services. am:
d195a9972b am:
800e061359 am:
0630348fa5 am:
14f71757c2 -s ours"
Kevin Hufnagle [Wed, 10 Jan 2018 00:07:52 +0000 (00:07 +0000)]
Merged-In: I0906de76abf4124d74f7f4f80ac0eab3cbf94f7e docs: Revised descriptions of binding and connecting to services. am:
d195a9972b am:
800e061359 am:
0630348fa5
am:
14f71757c2 -s ours
Change-Id: I1bfff1823386d65c8981e4b9edd99f60571df13c
Treehugger Robot [Wed, 10 Jan 2018 00:07:11 +0000 (00:07 +0000)]
Merge "HFP: Add isInbandRingingEnabled() API (1/4)"
Malcolm Chen [Wed, 10 Jan 2018 00:06:27 +0000 (00:06 +0000)]
Merge "Add isMobileDataEnabled in TelephonyManager." am:
ed7eead23b
am:
6b943d5deb
Change-Id: I132cc6d3de77f20717a40884683fb0c81fbb7083
Amith Yamasani [Wed, 10 Jan 2018 00:05:22 +0000 (00:05 +0000)]
Merge "Track last job run time"
Kevin Hufnagle [Tue, 9 Jan 2018 23:59:29 +0000 (23:59 +0000)]
Merged-In: I0906de76abf4124d74f7f4f80ac0eab3cbf94f7e docs: Revised descriptions of binding and connecting to services. am:
d195a9972b am:
800e061359
am:
0630348fa5
Change-Id: I0ccaa18cf5a9e84c5f015cf4b97b74a249348c93
Malcolm Chen [Tue, 9 Jan 2018 23:55:47 +0000 (23:55 +0000)]
Merge "Add isMobileDataEnabled in TelephonyManager."
am:
ed7eead23b
Change-Id: I851529bc4b5507ffa04c07a840aeba6eb3c7f94b
TreeHugger Robot [Tue, 9 Jan 2018 23:54:21 +0000 (23:54 +0000)]
Merge "Use String instead of byte[] to represent alias in KeyEntryRecoveryData."
Kevin Hufnagle [Tue, 9 Jan 2018 23:51:10 +0000 (23:51 +0000)]
Merged-In: I0906de76abf4124d74f7f4f80ac0eab3cbf94f7e docs: Revised descriptions of binding and connecting to services. am:
d195a9972b
am:
800e061359
Change-Id: I3854641ab4f80f4bbeae9acd67522fcd8b8484c0
Treehugger Robot [Tue, 9 Jan 2018 23:46:55 +0000 (23:46 +0000)]
Merge "Add isMobileDataEnabled in TelephonyManager."
Kevin Hufnagle [Tue, 9 Jan 2018 23:44:04 +0000 (23:44 +0000)]
Merged-In: I0906de76abf4124d74f7f4f80ac0eab3cbf94f7e docs: Revised descriptions of binding and connecting to services.
am:
d195a9972b
Change-Id: I7a59a3b8c18492961aea7f480276a401ab8bb6ae
TreeHugger Robot [Tue, 9 Jan 2018 23:39:22 +0000 (23:39 +0000)]
Merge changes from topic "add-android.test.legacy"
* changes:
Add android.test.legacy target
Modify android.test.runner to use new mock APIs
Jerry Zhang [Fri, 1 Dec 2017 03:10:55 +0000 (19:10 -0800)]
Add setScreenUnlockedFunctions method to UsbManager
The screen unlocked functions save effort on setting
the usb config during each connection. These
functions persist between connections and between
boots. When the screen is unlocked and these
functions are set, the current functions will
be automatically set to the screen unlocked functions.
Also added svc command for this so it can be
used and tested while the UI is worked on.
Bug:
62876645
Test: svc usb setScreenUnlockedFunctions mtp
Test: Test functions with locking, unlocking, and
disconnecting, with no lockscreen, swipe, and pattern
Change-Id: Ia05e095917166d25398c4d310b02971e3a1bb12a
Pengquan Meng [Tue, 9 Jan 2018 23:22:42 +0000 (23:22 +0000)]
Merge "Add connection serivce focus api interface" am:
2f37060ee0 am:
ed673edbf0
am:
40e2b37105 -s ours
Change-Id: Ia896874afcf725ffee4fed0b70028f20d493463a
Jack He [Sat, 6 Jan 2018 01:17:06 +0000 (17:17 -0800)]
HFP: Add isInbandRingingEnabled() API (1/4)
* Use BluetoothHeadset.isInbandRingingEnabled() API to check whether
in-band ringing is currently enabled in the system when deciding on
audio routes for ringtone
* Add this as a hidden internal API for system components
Bug:
71646213
Test: make, toggle in-band ringing from Development Settings and observe
whether Telecom service tries to open SCO when there is an
incoming call
Change-Id: I1ef0dd2b54ace7649ddd1f043f0ef5847743a5c4
TreeHugger Robot [Tue, 9 Jan 2018 23:15:19 +0000 (23:15 +0000)]
Merge "incidentd: dumping jobscheduler to proto"
Pengquan Meng [Tue, 9 Jan 2018 23:13:15 +0000 (23:13 +0000)]
Merge "Add connection serivce focus api interface" am:
2f37060ee0
am:
ed673edbf0
Change-Id: I581b75dcaf63f73150faac9d34e78ccd267eb1cd
Bernardo Rufino [Tue, 9 Jan 2018 23:13:14 +0000 (23:13 +0000)]
Merge "Binding on-demand #9: selectBackupTransport[Async]"
Holly Jiuyu Sun [Thu, 7 Dec 2017 23:35:49 +0000 (15:35 -0800)]
Merge EuiccProfile into EuiccProfileInfo.
After EuiccCard is moved to the platform, it can depend on
EuiccProfileInfo directly.
Bug:
70292228
Test: unit test
Change-Id: Ibe2c61ce9c4d2c99bac1cd9df8bb62414c46feee
Pengquan Meng [Tue, 9 Jan 2018 23:06:10 +0000 (23:06 +0000)]
Merge "Add connection serivce focus api interface"
am:
2f37060ee0
Change-Id: I0797828f9d8edee95b1b8ce8c838c766f5775f97
TreeHugger Robot [Tue, 9 Jan 2018 23:05:48 +0000 (23:05 +0000)]
Merge "Remove error log messages when skia shader cache is disabled"
Treehugger Robot [Tue, 9 Jan 2018 22:54:42 +0000 (22:54 +0000)]
Merge "Add connection serivce focus api interface"
TreeHugger Robot [Tue, 9 Jan 2018 22:54:33 +0000 (22:54 +0000)]
Merge "Disable gesture control to switch apps from nav bar"
Kevin Hufnagle [Tue, 9 Jan 2018 22:54:01 +0000 (22:54 +0000)]
Merge "docs: Revised descriptions of binding and connecting to services."
Bill Yi [Tue, 9 Jan 2018 22:48:29 +0000 (14:48 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id450600fb1da58f8ed6b8085b307d89bf492211b
Auto-generated-cl: translation import
Elliott Hughes [Tue, 9 Jan 2018 22:44:10 +0000 (14:44 -0800)]
Remove obsolete workaround.
Bug: http://b/
24465209
Test: manually ran the app.
Change-Id: Id64e92875417e62ae225c3369cf6bf58048dcc97
TreeHugger Robot [Tue, 9 Jan 2018 22:42:12 +0000 (22:42 +0000)]
Merge "Change style for CheckBoxPreference"
TreeHugger Robot [Tue, 9 Jan 2018 22:39:16 +0000 (22:39 +0000)]
Merge "Add missing usb_device_close() in (native) getDescriptorString()."
TreeHugger Robot [Tue, 9 Jan 2018 22:37:32 +0000 (22:37 +0000)]
Merge "Lower FSP on window animation too"
Michal Karpinski [Tue, 9 Jan 2018 22:35:33 +0000 (22:35 +0000)]
Merge "Drop support for full backup of com.android.providers.settings"
Myles Watson [Tue, 9 Jan 2018 22:34:23 +0000 (22:34 +0000)]
Merge "BluetoothProfile: Add Object Push Profile (OPP)" am:
37275780c0 am:
152b4f28b0
am:
96f4e49339
Change-Id: Ie321dd5d94bbc827d88855b634bc6a538d432918