OSDN Git Service
Kevin Chyn [Fri, 12 Oct 2018 01:26:37 +0000 (18:26 -0700)]
Proceed to "finish" page upon completing enrollment
Bug:
111548037
Test: manual
Change-Id: I1c0c5cc0eb2d1808221465c5eeba92e59b2cd572
Lei Yu [Thu, 11 Oct 2018 01:14:09 +0000 (01:14 +0000)]
Merge "Add network listener in MobileSettingsActivity"
Lei Yu [Thu, 11 Oct 2018 00:25:18 +0000 (00:25 +0000)]
Merge "Add target fragment for RoamingDialogFragment"
Lei Yu [Thu, 11 Oct 2018 00:24:56 +0000 (00:24 +0000)]
Merge "Refactor MobileDataPreference"
TreeHugger Robot [Wed, 10 Oct 2018 23:23:41 +0000 (23:23 +0000)]
Merge "Remove ShadowKeyValueListParser"
jackqdyulei [Tue, 9 Oct 2018 20:24:06 +0000 (13:24 -0700)]
Add target fragment for RoamingDialogFragment
Bug:
114749736
Test: Manual
Change-Id: I6f2939d99b72ff2dcf094c84bac75c2ca5d7ff66
jackqdyulei [Tue, 9 Oct 2018 19:26:51 +0000 (12:26 -0700)]
Add network listener in MobileSettingsActivity
Listen to subscription change. If it is changed, refresh UI and build
new fragment for it.
Bug:
114749736
Test: RunSettingsRoboTests
Change-Id: I436b4d62b06230e767892bda6cf8582d4946097b
jackqdyulei [Mon, 8 Oct 2018 22:13:53 +0000 (15:13 -0700)]
Refactor MobileDataPreference
1. Remove it and change it to SwitchPrference
2. Build MobileDataDialogFragment to show dialog when needed
3. Create controller for it to decide when to launch the dialog
Bug:
114749736
Test: RunSettingsRoboTests
Change-Id: I02b9662c5829e765f2c71d10ed951d792cf7aaa1
Fan Zhang [Wed, 10 Oct 2018 20:56:49 +0000 (20:56 +0000)]
Merge "Update strings"
TreeHugger Robot [Wed, 10 Oct 2018 20:53:55 +0000 (20:53 +0000)]
Merge "Use default network template in billing cycle settings."
jackqdyulei [Wed, 10 Oct 2018 20:43:01 +0000 (13:43 -0700)]
Remove ShadowKeyValueListParser
It is not used anymore.
Change-Id: I52991f42bc0872fd98809d6d6596f4b85d041d60
Fixes:
38346649
Test: RunSettingsRoboTests
Fan Zhang [Wed, 10 Oct 2018 20:19:38 +0000 (20:19 +0000)]
Merge "Use proto in contextualCard object"
Fan Zhang [Wed, 10 Oct 2018 20:13:52 +0000 (20:13 +0000)]
Merge "Remove mocked resources from slice test cases"
Adam He [Wed, 10 Oct 2018 19:54:50 +0000 (19:54 +0000)]
Merge "Use AFM.getAutofillServiceComponentName() in Settings's AutofillPickerTrampolineActivity"
Doris Ling [Wed, 10 Oct 2018 00:10:34 +0000 (17:10 -0700)]
Use default network template in billing cycle settings.
- if the network template is not set in the bundle arguments, use the
default network template for getting the billing data.
- change to use ConnectivityManager.from(context) in DataUsageUtils to
be consistent with the usage in other methods.
Change-Id: I25eb27f8f26d9ecafc66aa2c69806e94c6b63499
Fixes:
117452991
Test: make RunSettingsRoboTests
Philip P. Moltmann [Wed, 10 Oct 2018 19:50:06 +0000 (19:50 +0000)]
Merge "Use new RestrictedLockUtils API"
Rick Yiu [Wed, 10 Oct 2018 19:06:58 +0000 (12:06 -0700)]
[automerger skipped] Merge "Add null check for vrManager" into pi-dev am:
c9e2d80ade
am:
31e062e640 -s ours
Change-Id: Ia572567d053c0e00cdafeeae71314187720ff9de
TreeHugger Robot [Wed, 10 Oct 2018 18:54:20 +0000 (18:54 +0000)]
Merge "Get the ringtone name in background thread."
Fan Zhang [Wed, 10 Oct 2018 18:16:02 +0000 (11:16 -0700)]
Update strings
Change-Id: I3a70d787e6db6743638460195f36386111647e4e
Fixes:
117508849
Test: visual
Rick Yiu [Wed, 10 Oct 2018 18:07:11 +0000 (11:07 -0700)]
Merge "Add null check for vrManager" into pi-dev
am:
c9e2d80ade
Change-Id: Ifb1f2da7e3493e91f26735e7609c4480b1f0f346
TreeHugger Robot [Wed, 10 Oct 2018 17:46:55 +0000 (17:46 +0000)]
Merge "Add null check for vrManager" into pi-dev
Raff Tsai [Mon, 8 Oct 2018 19:15:04 +0000 (03:15 +0800)]
Use proto in contextualCard object
Test: make RunSettingsRoboTests
Change-Id: Ic7af69047e33e3b10a993dd9820b4c6ceb23666c
Fan Zhang [Wed, 10 Oct 2018 17:24:02 +0000 (17:24 +0000)]
Merge "Add contextual card proto libraries."
Fan Zhang [Tue, 9 Oct 2018 23:12:34 +0000 (16:12 -0700)]
Add contextual card proto libraries.
Test: rebuild
Change-Id: Ifd105a91be4ce3b3ae35766e069d4b4663e54b0f
Fan Zhang [Wed, 10 Oct 2018 17:10:12 +0000 (17:10 +0000)]
Merge "Remove hacks to access framework private resources"
Raff Tsai [Wed, 10 Oct 2018 13:06:19 +0000 (21:06 +0800)]
Fix test case error
Test: make RunSettingsRoboTest
Change-Id: Id8e13cdd13b4a5f21dad5f84be7110ca8cf5282f
Doris Ling [Wed, 10 Oct 2018 00:48:34 +0000 (17:48 -0700)]
Get the ringtone name in background thread.
- to prevent anr, retrieve the current ringtone in background thread.
Change-Id: I701adfa618553c03aa24719b2550ea3ee97d9bfa
Fixes:
117124470
Test: make RunSettingsRoboTests
Philip P. Moltmann [Mon, 8 Oct 2018 17:46:04 +0000 (10:46 -0700)]
Use new RestrictedLockUtils API
This is made necessary by changes to the SystemAPI the lib relies on.
Test: RunSettingsRoboTests
Bug:
116798569
Change-Id: I2812ce9e58e3fb15a5579ddc10cd0edf33d0ed44
TreeHugger Robot [Tue, 9 Oct 2018 19:16:07 +0000 (19:16 +0000)]
Merge "Add entitlement check for usb tethering"
Fan Zhang [Tue, 9 Oct 2018 16:48:04 +0000 (16:48 +0000)]
Merge "Add a filter to take out unnecessary homepage data."
Fan Zhang [Tue, 9 Oct 2018 16:45:35 +0000 (16:45 +0000)]
Merge "Add storage slice in Contextual Settings Homepage"
TreeHugger Robot [Tue, 9 Oct 2018 16:25:22 +0000 (16:25 +0000)]
Merge "Allow DND events rule to choose custom calendars"
Mill Chen [Tue, 9 Oct 2018 15:25:44 +0000 (23:25 +0800)]
Remove mocked resources from slice test cases
Clean up some resources which are useless for the moment.
Bug:
117485451
Test: robotests
Change-Id: Id3591178791cc6c9f628a99a8916e9007a399728
Emily Chuang [Mon, 1 Oct 2018 11:21:23 +0000 (19:21 +0800)]
Add a filter to take out unnecessary homepage data.
After getting the full list from CardContentProvider, at render side
(Settings side) we should perform final filtering to filter out those
data that are not applicable at that moment. Apart from that, we should
also perform slice URI check in this stage to take out invalid slices.
Bug:
116063073
Test: robotests
Change-Id: Idfa94ec6176a9d9cb3379543e0a23858941af742
Mill Chen [Mon, 1 Oct 2018 08:47:12 +0000 (16:47 +0800)]
Add storage slice in Contextual Settings Homepage
- Add storage card that implements CustomSliceable in Contextual
Settings Homepage.
- Add test case for storage slice.
Bug:
117074909,
115971399
Test: visual, robotest, SliceBrowser
Change-Id: Idc7d47ba934c2556c124220545ecc73fb2beb7e2
TreeHugger Robot [Tue, 9 Oct 2018 05:29:15 +0000 (05:29 +0000)]
Merge "Use custom drop-down filter widget"
Maurice Lam [Tue, 9 Oct 2018 02:29:03 +0000 (19:29 -0700)]
Remove hacks to access framework private resources
ag/
5200295 now allows framework private resources to be resolved.
Test: atest RunSettingsRoboTests
Change-Id: Idaf2144bea6d3b44ec133e48d89e6674256b4cbe
Mill Chen [Tue, 9 Oct 2018 01:49:17 +0000 (01:49 +0000)]
Merge "Add device info slice in Contextual Settings Homepage"
Maurice Lam [Tue, 9 Oct 2018 01:02:25 +0000 (01:02 +0000)]
Merge "Ignore lock type in ChooseLockGeneric in non-FBE"
TreeHugger Robot [Mon, 8 Oct 2018 23:00:06 +0000 (23:00 +0000)]
Merge "Remove obsolete chart view widgets."
Lei Yu [Mon, 8 Oct 2018 22:12:26 +0000 (22:12 +0000)]
Merge changes I3008bf85,I43aebf2e,I4fda0708,I744d5376
* changes:
Remove AdvancedOptionsPreference
Add activity for mobile network page
Fix the complie error of network migration
Copy MobileNetworkSettings to settings app
TreeHugger Robot [Mon, 8 Oct 2018 22:11:24 +0000 (22:11 +0000)]
Merge "Remove DeviceIndex feature/service."
Doris Ling [Mon, 8 Oct 2018 21:18:50 +0000 (14:18 -0700)]
Remove obsolete chart view widgets.
ChartDataUsageView and ChartNetworkSeriesView are no longer being used.
Remove them to avoid the need to maintain obsolete codes.
Bug:
117433810
Test: rebuild and make RunSettingsRoboTests
Change-Id: I0c99725500926083bee693c102a323d563647c3a
TreeHugger Robot [Mon, 8 Oct 2018 20:51:27 +0000 (20:51 +0000)]
Merge "Add search keyword to lock screen notification setting."
Fan Zhang [Wed, 3 Oct 2018 21:27:53 +0000 (14:27 -0700)]
Remove DeviceIndex feature/service.
Change-Id: I8444101669aef013183842c2d13cf3960c756398
Fixes:
112587202
Test: rerun all tests
Fan Zhang [Mon, 8 Oct 2018 19:39:23 +0000 (12:39 -0700)]
Add search keyword to lock screen notification setting.
Bug:
115894261
Test: reindex
Change-Id: I0532c5dba8175beb2712cd907d132a360d312c04
Fan Zhang [Mon, 8 Oct 2018 19:16:30 +0000 (12:16 -0700)]
Log open search action in metrics.
Change-Id: I80ab40d0767a9e6e561690f31bd092b384095b6e
Fixes:
117341899
Test: robotests
jackqdyulei [Fri, 5 Oct 2018 22:49:52 +0000 (15:49 -0700)]
Remove AdvancedOptionsPreference
This is used to show "Advanced" preference in telephony package.
Remove it since we have better way to do it in settings.
Bug:
114749736
Test: Manual
Change-Id: I3008bf856b8f42ba10ab26cb81d35a9370601c58
jackqdyulei [Fri, 5 Oct 2018 17:04:19 +0000 (10:04 -0700)]
Add activity for mobile network page
1. Extract the Tabhost to activity level, not fragment level. So
each mobile fragment has a constant subscriptionId
2. Use BottomNavigationView instead of TabHost
Bug:
114749736
Test: RunSettingsRoboTests
Change-Id: I43aebf2ec01a945697c6b2302ab750e715e4bfef
jackqdyulei [Wed, 3 Oct 2018 23:34:57 +0000 (16:34 -0700)]
Fix the complie error of network migration
1. Fix the error in import part
2. Remove broken code and add TODO
Future CL will fix TODO and add tests
Bug:
114749736
Test: Build
Change-Id: I4fda0708959e299015ecb10ac17c9c2dadc6f852
Doris Ling [Mon, 8 Oct 2018 17:24:37 +0000 (17:24 +0000)]
Merge "Fix typo in getHistoriclUsageLevel()"
Mill Chen [Thu, 27 Sep 2018 15:57:21 +0000 (23:57 +0800)]
Add device info slice in Contextual Settings Homepage
- Add device info card that implements CustomSliceable in Contextual
Settings Homepage.
- Add test case for device info slice.
Bug:
114790594,
115971399
Test: robotests, manual, SliceBrowser
Change-Id: I627a5b442e6ee20b3fd2e0500b31921bfec7b1d3
tmfang [Thu, 4 Oct 2018 09:59:03 +0000 (17:59 +0800)]
Use custom drop-down filter widget
This CL is just a example how to use this SettingsSpinner.
Change-Id: Ie0d104ce5f3e4c6b852fe7c051253b1567c6c4cd
Fixes:
112706966
Test: robotests
Bill Yi [Sun, 7 Oct 2018 04:32:01 +0000 (21:32 -0700)]
Import translations. DO NOT MERGE
Change-Id: I97ae0a1863b5a8208b4784e10ee1422e010928c8
Auto-generated-cl: translation import
Sooraj Sasindran [Sat, 6 Oct 2018 03:41:26 +0000 (03:41 +0000)]
Merge "Use updated APIs for CBRS"
TreeHugger Robot [Fri, 5 Oct 2018 23:59:52 +0000 (23:59 +0000)]
Merge "Fix work profile fingerprint userId"
Doris Ling [Fri, 5 Oct 2018 21:22:07 +0000 (14:22 -0700)]
Fix typo in getHistoriclUsageLevel()
Bug:
111751694
Test: make RunSettingsRoboTests
Change-Id: I523e43f60948e49e78d518a4eeb3ed2bf885f7bd
Maurice Lam [Fri, 5 Oct 2018 02:49:08 +0000 (19:49 -0700)]
Ignore lock type in ChooseLockGeneric in non-FBE
We need to show the encryption opt-in in non-FBE cases.
Test: atest RunSettingsRoboTests
Bug:
115847373
Change-Id: I3a92b265c9c8ecf5d4af009943b5b9483e25a738
Beverly [Fri, 5 Oct 2018 14:26:11 +0000 (10:26 -0400)]
Allow DND events rule to choose custom calendars
For the System DND Events rule, users can now select
custom calendars they are contributors to that are
synced to their device.
Test: atest /extra/master/packages/apps/Settings/tests/robotests/src/com/android/settings/notification/ZenModeEventRuleSettingsTest.java
Bug:
113368047
Change-Id: I1b81c528655b8f68867d881cee8125aa2b027eaa
Kevin Chyn [Fri, 5 Oct 2018 18:09:46 +0000 (11:09 -0700)]
Fix work profile fingerprint userId
Fixes:
117303349
Test: Enabling work profile, FP settings shows independent sets again
(same as P behavior)
Change-Id: Ifddd41c8aaa4316a58c9b8d16905d6d05318f5fd
TreeHugger Robot [Thu, 4 Oct 2018 20:00:19 +0000 (20:00 +0000)]
Merge "Get ethernet data usage from NetworkStatsManager."
Doris Ling [Thu, 4 Oct 2018 00:17:52 +0000 (17:17 -0700)]
Get ethernet data usage from NetworkStatsManager.
- change to use NetworkStatsManager.querySummaryForUser() to check for
ethernet usage data instead of getting it from INetworkStatsSession.
Bug:
111751694
Test: make RunSettingsRoboTests
Change-Id: I60364b4a5f7879906beba194c50955154d56803a
Lei Yu [Thu, 4 Oct 2018 17:08:58 +0000 (17:08 +0000)]
Merge "Still check the visibility of view"
Chienyuan [Thu, 4 Oct 2018 03:02:10 +0000 (20:02 -0700)]
Merge "Don't set value when developer options disabled" am:
692f5368d0 am:
5ef8843845
am:
4f7895f08b
Change-Id: I688e3dfee47ead666e93d8b5a42ad88a49259d65
Chienyuan [Thu, 4 Oct 2018 02:57:57 +0000 (19:57 -0700)]
Merge "Don't set value when developer options disabled" am:
692f5368d0
am:
5ef8843845
Change-Id: Idb3c130e31571111911b4e17d989b1199ff7619a
Chienyuan [Thu, 4 Oct 2018 02:48:47 +0000 (19:48 -0700)]
Merge "Don't set value when developer options disabled"
am:
692f5368d0
Change-Id: Icddab4eb38cade9d111e39a0e2dfee24198aabc0
Treehugger Robot [Thu, 4 Oct 2018 02:28:42 +0000 (02:28 +0000)]
Merge "Don't set value when developer options disabled"
jackqdyulei [Wed, 3 Oct 2018 20:54:53 +0000 (13:54 -0700)]
Copy MobileNetworkSettings to settings app
This is a CL to copy most components from telephony to settings app with
following changes to pass the preupload check:
1. Add [CHAR LIMIT]/comments for strings that miss them
This CL cannot build and future CL will fix the broken part.
Bug:
114749736
Test: Build
Change-Id: I744d537610eeeb7f2fb801defdd0ce47ef6088b6
TreeHugger Robot [Wed, 3 Oct 2018 22:46:56 +0000 (22:46 +0000)]
Merge "Add PreferenceController for support tile in homepage."
Fan Zhang [Wed, 3 Oct 2018 19:58:51 +0000 (12:58 -0700)]
Add PreferenceController for support tile in homepage.
Change-Id: I8fe93456a761382513c07ff85c858ded30f599fc
Fixes:
116875332
Test: robotests
TreeHugger Robot [Wed, 3 Oct 2018 20:29:45 +0000 (20:29 +0000)]
Merge "Change reset page to be SUW style"
Doris Ling [Tue, 2 Oct 2018 21:54:21 +0000 (14:54 -0700)]
Use the new loader to show app data usage details.
- this is for showing the detail usage (total, background, and
foreground) for a specific app for each billing cycle.
Bug:
111751694
Test: make RunSettingsRoboTests
Change-Id: I8e02872a4204b682089ea117811b50966e785c55
Lei Yu [Wed, 3 Oct 2018 19:04:16 +0000 (19:04 +0000)]
Merge changes I44039704,Iee0de8a2
* changes:
Use isConnected in CachedBluetoothDevice
Update "Previous connected device" preference
felkachang [Thu, 29 Mar 2018 04:08:20 +0000 (12:08 +0800)]
Change reset page to be SUW style
The factory reset page and the reset confirmation page is too old to
follow the style of Setup Wizard design. To change the layout and apply
the style for textviews and header.
Bug:
73738836
Test: make -j SettingsRoboTests RunSettingsRoboTests
Change-Id: I1ee3d09e1ef9cac8e25c60a566363d4f7d537eeb
TreeHugger Robot [Wed, 3 Oct 2018 17:01:23 +0000 (17:01 +0000)]
Merge "Delete provider data before insert"
Chienyuan [Wed, 3 Oct 2018 13:04:19 +0000 (21:04 +0800)]
Don't set value when developer options disabled
We shouldn't change property when developer options disabled.
Change A2DP HW offload property without reboot, A2DP will not work.
Bug:
109717129
Test: manual
Change-Id: I96103b04922b28995be198badbed324de40624f0
Neil Fuller [Wed, 3 Oct 2018 07:36:19 +0000 (00:36 -0700)]
[automerger skipped] Merge "Avoid deprecated PrivateKeyInfo.getAlgorithmId()" am:
a934366a8d am:
8caeafdf92
am:
eae7538909 -s ours
Change-Id: Ibebf9810795cc9b87bcfdcc123d9f8b360260986
Neil Fuller [Wed, 3 Oct 2018 07:32:10 +0000 (00:32 -0700)]
Merge "Avoid deprecated PrivateKeyInfo.getAlgorithmId()" am:
a934366a8d
am:
8caeafdf92
Change-Id: I9dcfcf4414837d32a42abc152a49fb4544ddac80
Neil Fuller [Wed, 3 Oct 2018 07:26:56 +0000 (00:26 -0700)]
Merge "Avoid deprecated PrivateKeyInfo.getAlgorithmId()"
am:
a934366a8d
Change-Id: If44a79fde1e2694dc24d09cbf889771facef751f
Neil Fuller [Wed, 3 Oct 2018 07:13:37 +0000 (07:13 +0000)]
Merge "Avoid deprecated PrivateKeyInfo.getAlgorithmId()"
Sunny Shao [Wed, 3 Oct 2018 03:01:04 +0000 (11:01 +0800)]
Delete provider data before insert
- Updated CardContentProvider and deleted exist data first to avoid redundant insertion in bulkInsert
Bug:
115575311
Test: robotest
Change-Id: I58b7b26f18bfdb8a59ebc61d7abb478390c58e4c
TreeHugger Robot [Wed, 3 Oct 2018 01:30:40 +0000 (01:30 +0000)]
Merge "Use the new loader to show app data usage summary."
Stanley Tng [Wed, 3 Oct 2018 01:05:04 +0000 (18:05 -0700)]
[automerger skipped] Merge "Fix Connect State message in Device details for Hearing Aids" into pi-dev-plus-aosp
am:
ce939610ba -s ours
Change-Id: Icb817e909ee7f66f8b8f53c8e3572354845167a9
Stanley Tng [Wed, 3 Oct 2018 00:35:11 +0000 (17:35 -0700)]
[automerger skipped] Merge "Fix Connect State message in Device details for Hearing Aids" into pi-dev am:
31703ca227 -s ours
am:
0eb58d6f55 -s ours
Change-Id: I8c89ec79c91605b43a073dbbe225b828bd2fdd35
TreeHugger Robot [Wed, 3 Oct 2018 00:23:42 +0000 (00:23 +0000)]
Merge "Set the layoutPreference not selectable"
TreeHugger Robot [Wed, 3 Oct 2018 00:04:45 +0000 (00:04 +0000)]
Merge "Fix Connect State message in Device details for Hearing Aids" into pi-dev-plus-aosp
Stanley Tng [Tue, 2 Oct 2018 23:46:58 +0000 (16:46 -0700)]
[automerger skipped] Merge "Fix Connect State message in Device details for Hearing Aids" into pi-dev
am:
31703ca227 -s ours
Change-Id: Icaa20e177b9037291b4c9fc03466b692618e95e8
TreeHugger Robot [Tue, 2 Oct 2018 23:41:35 +0000 (23:41 +0000)]
Merge "Check instance before casting"
Doris Ling [Tue, 2 Oct 2018 00:23:22 +0000 (17:23 -0700)]
Use the new loader to show app data usage summary.
- this is for getting the summary text for Apps & notifications ->
(select an app) -> Mobile data & Wi-Fi
Bug:
111751694
Test: make RunSettingsRoboTests
Change-Id: Ib4d8e7308ea8a782b9af3bbb99db2b1235e0aca2
jackqdyulei [Tue, 25 Sep 2018 01:09:01 +0000 (18:09 -0700)]
Use isConnected in CachedBluetoothDevice
This method check whether it has connected profile, not physical
connection between devices.
It make more sense to use it in settings:
1. We only care about whether it has active profile(i.e. A2dp, hfp..)
2. Sometime when profile is disconnected, BluetoothDevice.isConnected()
still return true. This may make UI flaky.
Bug:
79947085
Test: RunSettingsRoboTests
Change-Id: I44039704508a742c7a8aef0a035afcf169b08939
jackqdyulei [Tue, 2 Oct 2018 21:19:27 +0000 (14:19 -0700)]
Add entitlement check for usb tethering
Before this CL, usb tethering in detail page doesn't have entitlement
check. This CL fix it by using the correct API
Also polish it by updating the UI before entitlement check to align
hotspot page. So in UI it will first check "usb tethering". If
entitlement check fail, it will revoke and go back to previous selection.
Bug:
115707279
Test: RunSettingsRoboTests
Change-Id: I3d2ebad2879479a870bcdfe596bb88b83c424389
Fan Zhang [Tue, 2 Oct 2018 20:36:33 +0000 (13:36 -0700)]
Check instance before casting
Change-Id: I1917b2d8e045904145ea833abf35fa1d008fa224
Fixes:
116855783
Test: robotests
Stanley Tng [Mon, 1 Oct 2018 05:47:22 +0000 (22:47 -0700)]
Fix Connect State message in Device details for Hearing Aids
In the Device details of Settings App and when using two Hearing Aids
devices (left and right sides), this will fix the connect state messages
for these two devices. Also added Robo tests for the changes.
Bug:
116725094
Bug:
117074814
Test: Manual tests and also ran RunSettingsLibRoboTests and RunSettingsRoboTests.
Change-Id: I5c9af9ec6a2a17668597a537fd1f7b70368b7ed8
Merged-In: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
Merged-In: I169cda4a1658b0a67cc7c7367b38d57a021e6953
TreeHugger Robot [Tue, 2 Oct 2018 21:18:46 +0000 (21:18 +0000)]
Merge "Add SettingsContextualCardProvider"
TreeHugger Robot [Tue, 2 Oct 2018 20:30:17 +0000 (20:30 +0000)]
Merge "Fix Connect State message in Device details for Hearing Aids" into pi-dev
Hansong Zhang [Tue, 2 Oct 2018 19:44:14 +0000 (12:44 -0700)]
Fix build
am:
78ab907aa6
Change-Id: Ia036fde5adb3a8f060f5d0977147297f5a2f1489
Sooraj Sasindran [Tue, 2 Oct 2018 18:04:27 +0000 (11:04 -0700)]
Use updated APIs for CBRS
Use updated APIs for CBRS
Bug:
117156243
Test: verified enable disable using UI
Change-Id: Ib6be6479c9f51b7c2dd80db5f7971a8c7e820954
Neil Fuller [Tue, 2 Oct 2018 16:58:08 +0000 (16:58 +0000)]
Merge "Avoid deprecated PrivateKeyInfo.getAlgorithmId()"
Hansong Zhang [Tue, 2 Oct 2018 16:28:11 +0000 (09:28 -0700)]
Fix build
Test: compile
Change-Id: I3d236ea1b1f5ee5b4b5b2aa118416383b5b4bb6d
Neil Fuller [Tue, 2 Oct 2018 13:29:44 +0000 (06:29 -0700)]
Merge "Use ICU APIs not impl types" am:
811d817368 am:
09dcb87982
am:
ccef9d9dc2
Change-Id: I302247aa892e018e58b6742f55d30c971a4f77f3