OSDN Git Service
Bill Yi [Mon, 15 Oct 2018 08:55:17 +0000 (01:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id3ba67104115b2148f36fb26a94957ee6ac4a89d
Auto-generated-cl: translation import
Brad Ebinger [Fri, 12 Oct 2018 23:03:02 +0000 (16:03 -0700)]
Merge "RadioInfo: Disable ims provisioning switches in USER-build"
am:
61c5a296e6
Change-Id: I3211ffb7e25af0e60ac20175bf86466ee4c85998
Brad Ebinger [Fri, 12 Oct 2018 22:46:21 +0000 (22:46 +0000)]
Merge "RadioInfo: Disable ims provisioning switches in USER-build"
Takamasa Kuramitsu [Fri, 12 Oct 2018 21:07:25 +0000 (14:07 -0700)]
Merge "Move content later button doesn't work on Migration Wizard"
am:
1308b56908
Change-Id: I210eb94a69ce434c5b838dedbf90a937e92e71e9
Treehugger Robot [Fri, 12 Oct 2018 20:52:31 +0000 (20:52 +0000)]
Merge "Move content later button doesn't work on Migration Wizard"
Neil Fuller [Fri, 12 Oct 2018 10:31:10 +0000 (03:31 -0700)]
Merge "Remove explicit dependency on bouncycastle"
am:
ed21203ea3
Change-Id: Iff190e6a70b85b927597a5b82ff28eaf63070450
Neil Fuller [Fri, 12 Oct 2018 10:18:22 +0000 (10:18 +0000)]
Merge "Remove explicit dependency on bouncycastle"
Neil Fuller [Tue, 2 Oct 2018 20:37:30 +0000 (21:37 +0100)]
Remove explicit dependency on bouncycastle
The dependency is unnecessary once bouncycastle
is included in the "standard libraries".
Test: build
Bug:
113148576
Change-Id: I057bb0e277220389db3c77b1035044d93f35432a
Sreekanth Badida [Mon, 5 Feb 2018 16:18:40 +0000 (17:18 +0100)]
RadioInfo: Disable ims provisioning switches in USER-build
Disables provisioning switches for Ims-related features in the RadioInfo
dialog when using USER-build. This prevents the user from circumventing
ims provisioning checks.
Bug:
78372174
Test: Manual
Change-Id: If538d7ed56ca53ae6a8be31ddf374d9a15a8fdec
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"
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: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()"
Neil Fuller [Tue, 2 Oct 2018 13:16:23 +0000 (06:16 -0700)]
Merge "Use ICU APIs not impl types"
am:
811d817368
Change-Id: I38d6806255619fec3de23945a184455072f34ec0
Neil Fuller [Tue, 2 Oct 2018 12:59:47 +0000 (12:59 +0000)]
Merge "Use ICU APIs not impl types"
Neil Fuller [Tue, 2 Oct 2018 10:55:20 +0000 (11:55 +0100)]
Avoid deprecated PrivateKeyInfo.getAlgorithmId()
Switch from using the PrivateKeyInfo.getAlgorithmId() method to
using the functionally identical PrivateKeyInfo.getPrivateKeyAlgorithm()
method instead.
Bug:
113148576
Test: build only / inspection
Merged-In: Iab2d3b23ad969f683d716cb981e32fd554c67a81
Change-Id: I9ed5c96a20d6749bf75212c0fd820d71ca0a6053
Neil Fuller [Tue, 2 Oct 2018 09:15:36 +0000 (10:15 +0100)]
Use ICU APIs not impl types
It's possible to use BasicTimeZone in place of OlsonTimeZone.
Although neither are currently public SDK APIs the BasicTimeZone
is preferable.
Bug:
113148576
Test: build
Change-Id: I745b17feee678ecd053fadc6c447107fa80918e8
Takamasa Kuramitsu [Mon, 1 Oct 2018 13:34:06 +0000 (22:34 +0900)]
Move content later button doesn't work on Migration Wizard
"Move content later" button doesn't work on StorageWizardMigrateConfirm
screen which is shown when end-user try to migrate data from adopted
SD Card to internal storage.
The cause is "Move content later" button triggers to StorageWizardReady
screen but cannot launch because the mDisk is null when the destination
of migration is internal storage.
This CL fixes to just exit StorageWizardMigrateConfirm screen when mDisk
is null.
Bug:
117082495
Test: manual
Change-Id: Iccdccf4dda126d77458b9db35e4ec6ae6a263cb7
Leon Liao [Wed, 26 Sep 2018 12:59:20 +0000 (05:59 -0700)]
Merge "Rename isConnectable()"
am:
ec65174f11
Change-Id: Ibfc536ba78a118bc33890e52efa6650b21bff62e
Leon Liao [Tue, 25 Sep 2018 23:06:20 +0000 (23:06 +0000)]
Merge "Rename isConnectable()"
Youming Ye [Tue, 25 Sep 2018 17:20:06 +0000 (10:20 -0700)]
Merge "Wrong Carrier Config values are used in ApnSettings for Multi SIM device"
am:
b7e3552b83
Change-Id: I14a7f51ace0637a6248fe13f9a4dc46ee4b9c0a1
Youming Ye [Tue, 25 Sep 2018 17:04:10 +0000 (17:04 +0000)]
Merge "Wrong Carrier Config values are used in ApnSettings for Multi SIM device"
Torbjorn Eklund [Mon, 24 Sep 2018 17:48:00 +0000 (10:48 -0700)]
Merge "ApnEditor: Consider subId when reading carrier config"
am:
f6f7079709
Change-Id: I8d49e7f38528da4f5fc0cd18eecfd59854b7505f
Treehugger Robot [Mon, 24 Sep 2018 17:24:03 +0000 (17:24 +0000)]
Merge "ApnEditor: Consider subId when reading carrier config"
Lei Yu [Fri, 21 Sep 2018 20:13:39 +0000 (13:13 -0700)]
Merge "Fix incorrect API invoke for BT profiles"
am:
625c1eeaa9
Change-Id: I1a7f98b25cae2695d8f5895c8f6e03072ef4600f
Lei Yu [Fri, 21 Sep 2018 19:50:45 +0000 (19:50 +0000)]
Merge "Fix incorrect API invoke for BT profiles"
jackqdyulei [Tue, 18 Sep 2018 22:07:49 +0000 (15:07 -0700)]
Fix incorrect API invoke for BT profiles
When hearing aid device has been set active, we shouldn't invoke
1. a2dpProfile.setActiveDevice()
2. hfpProfile.setActiveDevice()
Change-Id: Ie13dea041dd98d0cb9d913e1f28574b300095db9
Merged-In: Ie13dea041dd98d0cb9d913e1f28574b300095db9
Fixes:
113625278
Test: RunSettingsRoboTests
Torbjorn Eklund [Wed, 25 Jul 2018 20:14:30 +0000 (22:14 +0200)]
ApnEditor: Consider subId when reading carrier config
Considers subId when reading carrier config values
KEY_READ_ONLY_APN_TYPES_STRING_ARRAY and
KEY_READ_ONLY_APN_FIELDS_STRING_ARRAY.
This ensures that the APN will be editable or non-editable correctly
when using dual sim.
Bug:
112929355
Test: Manual
Change-Id: I2186dd5e1f71ca5361309a7314f84cf4fa2d3937
Leon Liao [Tue, 18 Sep 2018 04:21:51 +0000 (12:21 +0800)]
Rename isConnectable()
LocalBluetoothProfile.isConnectable() checks whether the user can initiate a connection
for a specific profile, not really whether the profile is connectable.
Change-Id: If6c6cd1554acf35db2460ea6ddb65148a7e86e45
Bug:
79982487
Test: atest tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java
Fan Zhang [Thu, 13 Sep 2018 00:12:54 +0000 (17:12 -0700)]
Merge "Clean up: delete unused methods"
am:
41f9566da8
Change-Id: I973b289c688c04c00f70a6c0ba15a5b205d6633a
Fan Zhang [Wed, 12 Sep 2018 23:46:31 +0000 (23:46 +0000)]
Merge "Clean up: delete unused methods"
Fan Zhang [Wed, 12 Sep 2018 23:13:08 +0000 (16:13 -0700)]
Merge "Changes on Settings UI for a better user experience"
am:
7737b64159
Change-Id: I591b6eac611109bd903c99f79ecd63d37ca59511
Fan Zhang [Wed, 12 Sep 2018 22:44:39 +0000 (22:44 +0000)]
Merge "Changes on Settings UI for a better user experience"
Fan Zhang [Wed, 12 Sep 2018 20:08:15 +0000 (13:08 -0700)]
Clean up: delete unused methods
Test: rebuild
Change-Id: I144ebbdaf137ee091af949a9e38f68d02941f705
Jin Dong [Fri, 24 Aug 2018 08:24:53 +0000 (16:24 +0800)]
Changes on Settings UI for a better user experience
Oem can change the left padding and right padding of main text
in below screens by overlay the relative dimens:
- "Network settings reset"
- "Factory data reset"
- "Screen pinning"
Bug:
113607004
Test: manual
Change-Id: Ief1afd6ee05b9723874866a06f1748d9d9987333
Fan Zhang [Wed, 12 Sep 2018 01:28:08 +0000 (18:28 -0700)]
Merge "Fix a crash when launching app detail for bad package name"
am:
ada1a39ffb
Change-Id: Ia96ca4a889e9005da4e685b8e04ae2d6b78eff85
Treehugger Robot [Wed, 12 Sep 2018 00:57:40 +0000 (00:57 +0000)]
Merge "Fix a crash when launching app detail for bad package name"
Fan Zhang [Tue, 11 Sep 2018 21:52:46 +0000 (14:52 -0700)]
Fix a crash when launching app detail for bad package name
Change-Id: I3bfb5f8e003b810c09d295bc89f4a59af186a121
Fixes:
78779901
Test: robotests
Fan Zhang [Tue, 11 Sep 2018 20:13:33 +0000 (13:13 -0700)]
[automerger skipped] Merge "Add config to disable app tray preview in display size."
am:
98a1ebedcd -s ours
Change-Id: I36fb69986ab30b14f3040de35cbd9aaa6d7969b1
Fan Zhang [Tue, 11 Sep 2018 16:27:57 +0000 (16:27 +0000)]
Merge "Add config to disable app tray preview in display size."
Fan Zhang [Sat, 8 Sep 2018 00:06:07 +0000 (17:06 -0700)]
Add config to disable app tray preview in display size.
Also move some files
Change-Id: I4636fcd81425991acadede0b703e09513c82543c
Merged-In: I4636fcd81425991acadede0b703e09513c82543c
Fixes:
113374067
Test: robotests
Fan Zhang [Mon, 10 Sep 2018 16:27:07 +0000 (09:27 -0700)]
[automerger skipped] Merge "DO NOT MERGE Import clean up."
am:
8a2c9e79b0 -s ours
Change-Id: Id958f79e2c26f0276a02714b5b4d3ec9b8c2327a
Fan Zhang [Mon, 10 Sep 2018 15:58:34 +0000 (15:58 +0000)]
Merge "DO NOT MERGE Import clean up."
Fan Zhang [Tue, 4 Sep 2018 20:52:15 +0000 (13:52 -0700)]
DO NOT MERGE Import clean up.
Reordered all imports according to Android codestyle.
Test: rebuild
Change-Id: I750f01f70f2114d51838bf652833aebdc4065c98
tiansiming [田思明] [Tue, 4 Sep 2018 19:55:11 +0000 (12:55 -0700)]
Merge "Update string for message of DirectBootWarnDialog"
am:
b0cc3a6c7d
Change-Id: Ie04be9cf61a87fcc2b866d4effd0d27ca21064db
Treehugger Robot [Tue, 4 Sep 2018 19:46:18 +0000 (19:46 +0000)]
Merge "Update string for message of DirectBootWarnDialog"
tiansiming [田思明] [Thu, 18 Jan 2018 12:50:48 +0000 (20:50 +0800)]
Update string for message of DirectBootWarnDialog
Some users feedback to us that they are not very clear of the
meaning of the string 'direct_boot_unaware_dialog_message'.
The updated one may be more clear.
Bug: https://partnerissuetracker.corp.google.com/u/0/issues/
72197006
Test: manual test. Go to the Available virtual keyboard interface,
turn on a 3rd party ime keyboard and check the message.
Change-Id: Ib3a999601fa40f678956550d8941b7cb1db8a9af
Signed-off-by: tiansiming [田思明] <tiansiming@xiaomi.com>
Youming Ye [Thu, 30 Aug 2018 22:28:44 +0000 (15:28 -0700)]
Merge "Fix the Wifi Calling back button goes to wrong screen"
am:
903d2610dd
Change-Id: I41466f3f6e77c66f77550900193320b48a123d21
Youming Ye [Thu, 30 Aug 2018 22:03:06 +0000 (22:03 +0000)]
Merge "Fix the Wifi Calling back button goes to wrong screen"
Youming Ye [Thu, 30 Aug 2018 01:20:22 +0000 (18:20 -0700)]
Fix the Wifi Calling back button goes to wrong screen
The Wifi Calling activitis had Settings as it's parent activity.
Remove the parent declaration to navigate Wifi Calling screen back
to previous activity or fragment correctly.
Bug:
111818398
Test: Manual
Change-Id: I95168785936aeea0740dbb8e26280eaa8417c015
Aurimas Liutikas [Wed, 29 Aug 2018 19:00:24 +0000 (12:00 -0700)]
[automerger skipped] Merge "Migrate Settings to androidx."
am:
a544f17b99 -s ours
Change-Id: I507cbff22f0daa46c9aaac05646f23698f86d861
Treehugger Robot [Wed, 29 Aug 2018 18:31:08 +0000 (18:31 +0000)]
Merge "Migrate Settings to androidx."
Aurimas Liutikas [Tue, 17 Apr 2018 18:22:43 +0000 (11:22 -0700)]
Migrate Settings to androidx.
Test: make Settings
Bug:
76692459
Change-Id: I941dea40562170649bf056e675cc32e5163c0e39
Merged-In: I941dea40562170649bf056e675cc32e5163c0e39
(cherry picked from commit
a290b873d05c64ebdd9aeff8ffccf0a6dcbffc89)
(cherry picked from commit
b1af85d15523db44d4fa80c78409069ec691ed0a)
hjchangliao [Tue, 28 Aug 2018 22:07:13 +0000 (15:07 -0700)]
[automerger skipped] Merge "DO NOT MERGE: Cherry-pick misc fixes to AOSP"
am:
6e2db2c34b -s ours
Change-Id: I3e0340030a240a2e51209deeed0915ac62a1dcda
Treehugger Robot [Tue, 28 Aug 2018 21:54:01 +0000 (21:54 +0000)]
Merge "DO NOT MERGE: Cherry-pick misc fixes to AOSP"
Colin Cross [Tue, 28 Aug 2018 21:42:48 +0000 (21:42 +0000)]
Merge "Migrate Settings to androidx." into stage-aosp-master
Fan Zhang [Tue, 28 Aug 2018 21:41:43 +0000 (14:41 -0700)]
[automerger skipped] Merge "DO NOT MERGE: Cherry-pick a bunch fixes to AOSP"
am:
56cc4986df -s ours
Change-Id: Iff1f6e189feae17f1166990de31d6f64f920734e
Treehugger Robot [Tue, 28 Aug 2018 21:29:05 +0000 (21:29 +0000)]
Merge "DO NOT MERGE: Cherry-pick a bunch fixes to AOSP"
hjchangliao [Fri, 27 Apr 2018 03:27:46 +0000 (11:27 +0800)]
DO NOT MERGE: Cherry-pick misc fixes to AOSP
Remove wrapper for LocationManager
Remove LocationManagerWrapper from SettingsLib
Bug:
76167422
Test: RunSettingsRoboTests
Remove OverlayManagerWrapper class out from Settings
Remove OverlayManagerWrapper and use IOverlayManager instead. Based on
comment from reviewer to refactor ThemePreferenceController.
Bug:
76167422
Test: RunSettingsRoboTests
Change-Id: I13a7997b5e21a16ffb723971d267132fbf65e4a6
Fan Zhang [Mon, 27 Aug 2018 21:28:54 +0000 (14:28 -0700)]
DO NOT MERGE: Cherry-pick a bunch fixes to AOSP
Task affinity updates
- Remove task affinity for AppDrawOver Settings
- Remove task affinity for ConfigNotificationSettings
The task affinity is messing with the back stack for this activity when
launched externally
Fixes:
80281932
Fixes:
80290571
Test: manual
Disable uninstall update option for secondary users.
Fixes:
110249550
Test: manual
Suppress some gesture search when there is no hardware
Fixes:
110250839
Test: robotests
Check wifi password length by byte, not char.
Change-Id: Ic25ef766886507211c3de8764c1cffef2b27a025
Fixes:
79209073
Test: robotest
Aurimas Liutikas [Tue, 17 Apr 2018 18:22:43 +0000 (11:22 -0700)]
Migrate Settings to androidx.
Test: make Settings
Bug:
76692459
Change-Id: I941dea40562170649bf056e675cc32e5163c0e39
Merged-In: I941dea40562170649bf056e675cc32e5163c0e39
(cherry picked from commit
a290b873d05c64ebdd9aeff8ffccf0a6dcbffc89)
Fan Zhang [Tue, 28 Aug 2018 18:38:27 +0000 (11:38 -0700)]
[automerger skipped] Merge "DO NOT MERGE Fix color_lint errors"
am:
fcaf926dc1 -s ours
Change-Id: I4d66ba0b4164b5b700c7671f5d249c30ad38722e
Treehugger Robot [Tue, 28 Aug 2018 18:03:31 +0000 (18:03 +0000)]
Merge "DO NOT MERGE Fix color_lint errors"
Fan Zhang [Mon, 27 Aug 2018 21:28:54 +0000 (14:28 -0700)]
DO NOT MERGE Fix color_lint errors
Test: repo upload
Change-Id: I83abb69123e1365cf90db2ab0f60c3a6330f2828
Doris Ling [Sun, 26 Aug 2018 06:12:24 +0000 (23:12 -0700)]
Merge "Fix crash in clicking Default Home gear icon."
am:
0c724f5181
Change-Id: I53b6c18077d0bcf5a7bc13fcc425c6c1ca4143ad
Treehugger Robot [Fri, 24 Aug 2018 23:58:31 +0000 (23:58 +0000)]
Merge "Fix crash in clicking Default Home gear icon."
Doris Ling [Thu, 23 Aug 2018 20:25:06 +0000 (13:25 -0700)]
Fix crash in clicking Default Home gear icon.
- change the way that default home query the resolve activity to only
check for LAUNCHER activity.
Change-Id: Ib53154afe7951f4e2c7c3ab147be4c691113e0e7
Merged-In: Ib53154afe7951f4e2c7c3ab147be4c691113e0e7
Fixes:
112249115
Test: make RunSettingsRoboTests
Fan Zhang [Thu, 23 Aug 2018 18:08:32 +0000 (11:08 -0700)]
[automerger skipped] Merge "DO NOT MERGE Fix summary text for advanced button."
am:
da38b41b9a -s ours
Change-Id: I1dadf9bcd016e61ea04fe5b851e6430b1d63574d
Treehugger Robot [Thu, 23 Aug 2018 17:38:38 +0000 (17:38 +0000)]
Merge "DO NOT MERGE Fix summary text for advanced button."
Fan Zhang [Thu, 23 Aug 2018 16:25:18 +0000 (09:25 -0700)]
DO NOT MERGE Fix summary text for advanced button.
- the resource for the summary text is in the support library. However,
the prebuilt version in the build does not contain the latest change for
the summary text. Add the overlay for the summary resource here with the
updated translation to remove the redundant summary prefix in the
advanced button.
Change-Id: Ib6db0c402d79a2d965e6060b1851d7b898ae3f94
Fixes:
112986476
Bug:
111195268
Test: manual
Yuchen Dong [Thu, 23 Aug 2018 08:32:40 +0000 (17:32 +0900)]
Wrong Carrier Config values are used in ApnSettings for Multi SIM device
In ApnSettings, it always uses Carrier Config values of default subId.
So, wrong carrier config values are used for non-default subId.
To resolve this issue, read Carrier Config values based on subId.
Test: manual - Check Carrier Config values are read based on subId.
Bug:
111172301
Change-Id: I87e4cbb2e8020198fa03c2c84ef9bd10d5970341
Hemant Gupta [Fri, 17 Aug 2018 19:11:27 +0000 (12:11 -0700)]
Merge "Bluetooth: PBAP not disconnected on disabling contact sharing"
am:
84bb2293ae
Change-Id: Ief10c8b5b3cdae90ba37a6349528f85e59562dc9
Treehugger Robot [Fri, 17 Aug 2018 18:05:21 +0000 (18:05 +0000)]
Merge "Bluetooth: PBAP not disconnected on disabling contact sharing"
ChenChen Chen [Fri, 17 Aug 2018 00:39:00 +0000 (17:39 -0700)]
Merge "Always show items in options menu for Wi-Fi Direct settings"
am:
1e160cc8bf
Change-Id: Ie1edf750d2f205be97b07c84429e2c1468aa6c58
Treehugger Robot [Thu, 16 Aug 2018 17:15:40 +0000 (17:15 +0000)]
Merge "Always show items in options menu for Wi-Fi Direct settings"
ChenChen Chen [Tue, 14 Aug 2018 06:27:25 +0000 (14:27 +0800)]
Always show items in options menu for Wi-Fi Direct settings
Remove MenuItem.SHOW_AS_ACTION_IF_ROOM flag for menu items
to avoid showing truncated texts on action bar.
Bug:
112671955
Test: Manual
Change-Id: I1c9678321442169bc86d719e820d4af68261dee1
Jordan Liu [Wed, 15 Aug 2018 23:29:14 +0000 (16:29 -0700)]
Merge "Refresh subscription info when subid changes"
am:
5226ac6110
Change-Id: I874fb7e8f3d3146cb614de3ee088e93c1863a592
Jordan Liu [Wed, 15 Aug 2018 21:48:01 +0000 (21:48 +0000)]
Merge "Refresh subscription info when subid changes"
Jordan Liu [Tue, 14 Aug 2018 23:52:07 +0000 (16:52 -0700)]
Refresh subscription info when subid changes
We store the initial subId and check if it has changed so that we always
have the updated subscription info in fillList().
Fixes:
111731641
Test: manually verify that swapping the SIM loads new APNs
Change-Id: I3475915f2c380fb67b2e56436423d491e489d91e
Jordan Liu [Wed, 15 Aug 2018 03:09:31 +0000 (20:09 -0700)]
Merge "Reload APNs setting page when receive the intent ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED"
am:
5b7535d5b4
Change-Id: I7b1f6e53c521c0f17d17199de2f185eb64fd3c59
Jordan Liu [Tue, 14 Aug 2018 23:54:12 +0000 (23:54 +0000)]
Merge "Reload APNs setting page when receive the intent ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED"
irisykyang [Tue, 10 Apr 2018 07:34:33 +0000 (15:34 +0800)]
Reload APNs setting page when receive the intent ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED
Bug:
77250264
Test: Manual testing
Change-Id: Ie28c67c89a2590425ff9c06153b53dac6cf141f0
Merged-In: Ie28c67c89a2590425ff9c06153b53dac6cf141f0
Xiangyu/Malcolm Chen [Tue, 14 Aug 2018 20:59:07 +0000 (13:59 -0700)]
Merge "Use new SubscriptionInfo constructor"
am:
e8e24e7e0b
Change-Id: I1e51d7951cc3594685c9dd2e0b4c0e2aedb3e84f
Xiangyu/Malcolm Chen [Tue, 14 Aug 2018 18:58:25 +0000 (18:58 +0000)]
Merge "Use new SubscriptionInfo constructor"
Malcolm Chen [Thu, 9 Aug 2018 23:32:32 +0000 (16:32 -0700)]
Use new SubscriptionInfo constructor
Bug:
92796390
Test: build
Change-Id: I5a90831b0050a0a201fce5b8f824fcb4c983a722
Merged-In: I5a90831b0050a0a201fce5b8f824fcb4c983a722
Xin Li [Mon, 13 Aug 2018 20:01:18 +0000 (13:01 -0700)]
Merge stage-dr1-aosp-master into stage-aosp-master
Bug:
112535855
Change-Id: Ifd79dc537052cc78e7f5451316d637b24c9830ca
Zhaoyu Su [Thu, 9 Aug 2018 23:31:49 +0000 (16:31 -0700)]
Merge "Fix ACTION_NFC_SETTINGS doesn't show connection preference" am:
44360bc96a
am:
b69559f882
Change-Id: Ia7b74d284a1385dc401eb168d82fc9cb8756192f
Zhaoyu Su [Thu, 9 Aug 2018 23:20:45 +0000 (16:20 -0700)]
Merge "Fix ACTION_NFC_SETTINGS doesn't show connection preference"
am:
44360bc96a
Change-Id: I6975c5213f74d4b9df343cae82d93f654774d1c3
Treehugger Robot [Thu, 9 Aug 2018 21:37:17 +0000 (21:37 +0000)]
Merge "Fix ACTION_NFC_SETTINGS doesn't show connection preference"
Jordan Liu [Wed, 8 Aug 2018 22:50:24 +0000 (15:50 -0700)]
Merge "Preserve leading 0s in mcc mnc" am:
593d767e15
am:
c2a5c47290
Change-Id: Id1a84cc4cc55fef4167f28ab0e665ebffe5d2c05
Jordan Liu [Wed, 8 Aug 2018 22:46:32 +0000 (15:46 -0700)]
Merge "Preserve leading 0s in mcc mnc"
am:
593d767e15
Change-Id: I97041a9f2a50d8448a95226e66162b55a42f841b
Jordan Liu [Wed, 8 Aug 2018 22:21:40 +0000 (22:21 +0000)]
Merge "Preserve leading 0s in mcc mnc"
Jordan Liu [Fri, 13 Jul 2018 17:43:47 +0000 (10:43 -0700)]
Preserve leading 0s in mcc mnc
Fixes:
79408450
Test: ApnEditorTest.java
Change-Id: Iad7ffe04f23b30857588e50d7f5f0dd307bd2c6e
Merged-In: Iad7ffe04f23b30857588e50d7f5f0dd307bd2c6e
Zhaoyu Su [Mon, 9 Jul 2018 06:50:47 +0000 (14:50 +0800)]
Fix ACTION_NFC_SETTINGS doesn't show connection preference
NFC settings has been moved from "Device connection" to
"Connection preference". So ACTION_NFC_SETTINGS
should invoke "Connection preference" page.
Test: send intent with action "android.settings.NFC_SETTINGS"
Bug:
111424119
Change-Id: Iea9ddc876aa800f94585c434911be5dc8cedd550
Xin Li [Wed, 8 Aug 2018 01:37:11 +0000 (18:37 -0700)]
Merge "Merge Android Pie into master" am:
eae6f13389
am:
b745578205
Change-Id: I6da67456fef37ea0df3b003c0190692e9aeaf571
Xin Li [Tue, 7 Aug 2018 22:06:54 +0000 (15:06 -0700)]
Merge "Merge Android Pie into master"
am:
eae6f13389
Change-Id: I8da592027bd7658b9d900aa8fae529c4bf7a6a7d
Xin Li [Tue, 7 Aug 2018 16:51:28 +0000 (16:51 +0000)]
Merge "Merge Android Pie into master"
Xin Li [Mon, 6 Aug 2018 23:51:22 +0000 (16:51 -0700)]
Merge Android Pie into master
Bug:
112104996
Change-Id: I4930d57cc584503a8e16e2b69549efb5780faad8
Bill Yi [Sun, 5 Aug 2018 01:21:26 +0000 (18:21 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
000f97dcf9 -s ours
Change-Id: Ia6cce5c5529998a45fa52d353f63a8edc8e2c0ef
OSDN Git Service
