OSDN Git Service
Fan Zhang [Mon, 10 Sep 2018 16:31:09 +0000 (09:31 -0700)]
[automerger skipped] Merge "DO NOT MERGE Import clean up." am:
8a2c9e79b0 -s ours
am:
86e0ae5b6a -s ours
Change-Id: Ie02b99cc39273c02830be231bf407f2a3065a826
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."
Bill Yi [Sun, 9 Sep 2018 04:21:36 +0000 (21:21 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
22360f9706 -s ours
Change-Id: I1c19e330d2c1a3d68db3ae76c501cc33f4f001ba
Bill Yi [Sun, 9 Sep 2018 01:11:46 +0000 (18:11 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I77779e462781ec27ccf1122e7dcac6fd170cad5f
jackqdyulei [Fri, 7 Sep 2018 17:56:57 +0000 (10:56 -0700)]
[automerger skipped] Update PBAP info for all pairing dialogs. DO NOT MERGE am:
ff171eff8e am:
618b808b61 am:
c05958ecdd -s ours
am:
6ec0b21544 -s ours
Change-Id: I14f1f1709d94784fdb0912f1c95b625d6318b4a0
jackqdyulei [Fri, 7 Sep 2018 17:51:10 +0000 (10:51 -0700)]
[automerger skipped] Update PBAP info for all pairing dialogs. DO NOT MERGE am:
ff171eff8e am:
618b808b61
am:
c05958ecdd -s ours
Change-Id: I57dfe29eff8188f32d64d003781d4b63b4d151ad
jackqdyulei [Fri, 7 Sep 2018 17:46:08 +0000 (10:46 -0700)]
Update PBAP info for all pairing dialogs. DO NOT MERGE am:
ff171eff8e
am:
618b808b61
Change-Id: Id92a02a67661e0b7707564b7d83a7ff7f27854e1
jackqdyulei [Fri, 7 Sep 2018 17:42:16 +0000 (10:42 -0700)]
Update PBAP info for all pairing dialogs. DO NOT MERGE
am:
ff171eff8e
Change-Id: I21d048a1ad2d0e37870d380c30e95ee8e3a48091
Dan Willemsen [Fri, 7 Sep 2018 04:13:28 +0000 (21:13 -0700)]
Fix imports on pi-dev-plus-aosp to fix build
Change-Id: Ifa467eef0f9264348d657ceb8372990313b42fed
Merged-In: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
Fan Zhang [Fri, 7 Sep 2018 01:33:30 +0000 (18:33 -0700)]
Merge "Move safety & regulatory manual closer to legal settings" into pi-dev
am:
f81ec88024
Change-Id: I7156cd60aed8ee1a8d439c6e1504df0b578a0ff3
TreeHugger Robot [Fri, 7 Sep 2018 01:05:45 +0000 (01:05 +0000)]
Merge "Move safety & regulatory manual closer to legal settings" into pi-dev
jackqdyulei [Tue, 19 Jun 2018 23:52:07 +0000 (16:52 -0700)]
Update PBAP info for all pairing dialogs. DO NOT MERGE
This is a bug from ag/
4210612, in which it only update PBAP info
for USER_ENTRY_DIALOG. So in other kind of dialogs it never upload
correct PBAP info to bluetooth backend.
This CL fix it by updating PBAP for all dialogs.
Change-Id: Ia39eee1acaece555e8e5a305ec2c803294d7efbd
Merged-In: Ia39eee1acaece555e8e5a305ec2c803294d7efbd
Bug:
109842273
Bug:
72872376
Test: RunSettingsRoboTests
(cherry picked from commit
7015e20a554fd7f8f7ded7359a5ecc13a82a0464)
Fan Zhang [Thu, 6 Sep 2018 19:21:30 +0000 (12:21 -0700)]
Move safety & regulatory manual closer to legal settings
Bug:
113788849
Test: visual
Change-Id: Ie9a706bad9a4c65ff06c2350171ad55f46dd8386
Merged-In: Ie9a706bad9a4c65ff06c2350171ad55f46dd8386
jackqdyulei [Thu, 6 Sep 2018 20:14:18 +0000 (13:14 -0700)]
Merge "Update PBAP info for all pairing dialogs. DO NOT MERGE" into pi-dev
am:
205479c25d
Change-Id: Ib1ae9f0af0cabdc26dc883f58dbc28b37ce54e42
TreeHugger Robot [Thu, 6 Sep 2018 20:00:37 +0000 (20:00 +0000)]
Merge "Update PBAP info for all pairing dialogs. DO NOT MERGE" into pi-dev
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 20:05:10 +0000 (13:05 -0700)]
Merge "Update string for message of DirectBootWarnDialog" am:
b0cc3a6c7d
am:
662e59e628
Change-Id: I58f28cc3473c72c2061cc4c90cc6a2d50812e670
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>
Bill Yi [Fri, 31 Aug 2018 15:56:23 +0000 (08:56 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
94fdfc4a44 -s ours
Change-Id: I5e27882dde15352c8121ed35eb72114f33ff8d53
Bill Yi [Fri, 31 Aug 2018 02:02:59 +0000 (19:02 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I6b44e763661339eab9182743abd1e3cb4d8bdbcd
Youming Ye [Thu, 30 Aug 2018 22:47:05 +0000 (15:47 -0700)]
Merge "Fix the Wifi Calling back button goes to wrong screen" am:
903d2610dd
am:
7c4b70c6e5
Change-Id: Iaf9670b98ef838967ceed1dc9f8cf950532fc48b
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:14:32 +0000 (12:14 -0700)]
[automerger skipped] Merge "Migrate Settings to androidx." am:
a544f17b99 -s ours
am:
2b0960c2d1 -s ours
Change-Id: I4b60d96d764c1ccf1cc5083e0b19f7a196c4c44a
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:15:25 +0000 (15:15 -0700)]
[automerger skipped] Merge "DO NOT MERGE: Cherry-pick misc fixes to AOSP" am:
6e2db2c34b -s ours
am:
e89bf878c6 -s ours
Change-Id: I7e8d43ab2a4c1e735a4e855ce93212b20aa0e858
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
Colin Cross [Tue, 28 Aug 2018 22:03:29 +0000 (15:03 -0700)]
[automerger skipped] Merge "Migrate Settings to androidx." into stage-aosp-master
am:
048f11d0a9 -s ours
Change-Id: I9aafcf6e8525db976ddb5ce29d53dd5bdf612d70
Aurimas Liutikas [Tue, 28 Aug 2018 21:59:45 +0000 (14:59 -0700)]
[automerger skipped] Migrate Settings to androidx.
am:
b1af85d155 -s ours
Change-Id: I098cc300a217762bcb77bc1b0b5f6ee6bdbc56dd
Treehugger Robot [Tue, 28 Aug 2018 21:54:01 +0000 (21:54 +0000)]
Merge "DO NOT MERGE: Cherry-pick misc fixes to AOSP"
Fan Zhang [Tue, 28 Aug 2018 21:45:42 +0000 (14:45 -0700)]
[automerger skipped] Merge "DO NOT MERGE: Cherry-pick a bunch fixes to AOSP" am:
56cc4986df -s ours
am:
0e05005d8d -s ours
Change-Id: Ieb1b69c3fb1f42750044b49c270f4d533bbfb51b
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
Fan Zhang [Tue, 28 Aug 2018 19:14:58 +0000 (12:14 -0700)]
[automerger skipped] Merge "DO NOT MERGE Fix color_lint errors" am:
fcaf926dc1 -s ours
am:
6e65a32468 -s ours
Change-Id: Iaf37f20f3ff607c46a66eb278dc17d6998f87984
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
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
Bill Yi [Sun, 26 Aug 2018 19:58:09 +0000 (12:58 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
994ae82c34 -s ours
Change-Id: I779083c8a8685a719d462160cfd8c8b4479a406c
Doris Ling [Sun, 26 Aug 2018 06:24:51 +0000 (23:24 -0700)]
Merge "Fix crash in clicking Default Home gear icon." am:
0c724f5181
am:
51a72d4c38
Change-Id: I7ff6b0e405c3d87faa869bd53eee9983648ccf69
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
Bill Yi [Sat, 25 Aug 2018 23:44:47 +0000 (16:44 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I3e4f6e468679eec2ad1d8b821115e686e5a4c19a
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:13:33 +0000 (11:13 -0700)]
[automerger skipped] Merge "DO NOT MERGE Fix summary text for advanced button." am:
da38b41b9a -s ours
am:
5c6f6949bf -s ours
Change-Id: I5857d75e1b068446ccfba8859c11e968bc7dade3
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
jackqdyulei [Tue, 19 Jun 2018 23:52:07 +0000 (16:52 -0700)]
Update PBAP info for all pairing dialogs. DO NOT MERGE
This is a bug from ag/
4210612, in which it only update PBAP info
for USER_ENTRY_DIALOG. So in other kind of dialogs it never upload
correct PBAP info to bluetooth backend.
This CL fix it by updating PBAP for all dialogs.
Change-Id: Ia39eee1acaece555e8e5a305ec2c803294d7efbd
Bug:
109842273
Bug:
72872376
Test: RunSettingsRoboTests
(cherry picked from commit
7015e20a554fd7f8f7ded7359a5ecc13a82a0464)
Adrian Roos [Tue, 21 Aug 2018 23:43:39 +0000 (16:43 -0700)]
[automerger skipped] DO NOT MERGE leverage default_theme string for display_cutout_emulation_device_default
am:
12c9be1255 -s ours
Change-Id: Iaeffe4999365f975887b336598a7ab4bf078c7b9
Adrian Roos [Tue, 21 Aug 2018 18:25:47 +0000 (20:25 +0200)]
DO NOT MERGE leverage default_theme string for display_cutout_emulation_device_default
Bug:
112876936
Test: manual
Change-Id: I1a41b96f9f19a5d5854eb1cce214616e303ca4f9
Adrian Roos [Tue, 21 Aug 2018 20:59:45 +0000 (13:59 -0700)]
Merge "Cutout emulation: string changes and ordering" into pi-dev
am:
8d82158036
Change-Id: I6d6c191e1dc511d2ab6e563f7bbea27962fe7b63
TreeHugger Robot [Tue, 21 Aug 2018 20:49:37 +0000 (20:49 +0000)]
Merge "Cutout emulation: string changes and ordering" into pi-dev
Adrian Roos [Tue, 21 Aug 2018 16:26:29 +0000 (18:26 +0200)]
Cutout emulation: string changes and ordering
Updates strings according to spec. Also ensures
that the emulation overlays are shown in the
order of their priority.
Bug:
112876936
Test: Open developer options, go to "display cutout", verify strings.
Change-Id: If2d05595d02a277896202ab2a6262c99508a3a17
Merged-In: If2d05595d02a277896202ab2a6262c99508a3a17
Hemant Gupta [Fri, 17 Aug 2018 19:57:33 +0000 (12:57 -0700)]
Merge "Bluetooth: PBAP not disconnected on disabling contact sharing" am:
84bb2293ae
am:
ff985c6bc7
Change-Id: I9c2c99a0f3999c550195b4ed7eed5a31caea9d2a
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
Fan Zhang [Fri, 17 Aug 2018 18:34:53 +0000 (11:34 -0700)]
Merge "Fix memory leaks in Settings" into pi-dev
am:
be13e74deb
Change-Id: I51e9c6682a0589afbdfcc8799b10598eac496396
Treehugger Robot [Fri, 17 Aug 2018 18:05:21 +0000 (18:05 +0000)]
Merge "Bluetooth: PBAP not disconnected on disabling contact sharing"
TreeHugger Robot [Fri, 17 Aug 2018 18:04:44 +0000 (18:04 +0000)]
Merge "Fix memory leaks in Settings" into pi-dev
ChenChen Chen [Fri, 17 Aug 2018 03:29:49 +0000 (20:29 -0700)]
Merge "Always show items in options menu for Wi-Fi Direct settings" am:
1e160cc8bf
am:
0173130d73
Change-Id: I7e70b3f2140301673b45beb3fb7ad7ed2d848a1d
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
Matthew Fritze [Fri, 17 Aug 2018 00:33:01 +0000 (17:33 -0700)]
Merge "Hide SettingsSlice provider" into pi-dev
am:
041bfbd2b6
Change-Id: I9e9f0cfc71a6352f7adfa3072a097dd126f38a29
TreeHugger Robot [Thu, 16 Aug 2018 21:23:17 +0000 (21:23 +0000)]
Merge "Hide SettingsSlice provider" into pi-dev
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 [Thu, 16 Aug 2018 00:06:22 +0000 (17:06 -0700)]
Merge "Refresh subscription info when subid changes" am:
5226ac6110
am:
114cacf2a8
Change-Id: If8e2d3a2045b7db65856673a7aed5192d7ff4bc9
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
Matthew Fritze [Mon, 30 Jul 2018 21:12:50 +0000 (14:12 -0700)]
Hide SettingsSlice provider
Explicitly set the Settings SliceBroadcastReceiver to
be non-exported and remove the intent-filter.
Add a second provider: SliceRelayReceiver to receive
broadcasts from SysUI to alert Settings to potential
changes to bound Settings Slices. The new receiver is
exported, but only notifies changes to Settings, and
doesn't make any changes itself.
Change-Id: I422c0b07a61efa8996e9fdfa398eee84bbc1796f
Merged-In: I80d070f7636614135ebe4f57a16f12a3eb6dee81
Fixes:
111330641
Test: boot, robolectric, Slicebrowser
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 07:44:42 +0000 (00:44 -0700)]
Merge "Reload APNs setting page when receive the intent ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED" am:
5b7535d5b4
am:
b951ba66e5
Change-Id: I15b5f716f97efe9ba54a5dee25f2e0cbb33fecff
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 22:06:16 +0000 (15:06 -0700)]
Merge "Use new SubscriptionInfo constructor" am:
e8e24e7e0b
am:
188272e12b
Change-Id: I3bd584dd5e8258713bd101e488ffefea81ad0a48
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 [Tue, 14 Aug 2018 00:36:58 +0000 (17:36 -0700)]
Merge stage-dr1-aosp-master into stage-aosp-master
am:
fbc7d27155
Change-Id: I02a6acca4f15b665cf5b5f3f19d1df07b65264cb
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:44:57 +0000 (16:44 -0700)]
Merge "Fix ACTION_NFC_SETTINGS doesn't show connection preference" am:
44360bc96a am:
b69559f882
am:
2c23e6ab75
Change-Id: I99bb280fd1697d890a6f44cc8cb49e0eaadef325
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
Doris Ling [Thu, 9 Aug 2018 22:40:59 +0000 (15:40 -0700)]
[automerger skipped] Merge "DO NOT MERGE Disable changing lock when device is not provisioned." into oc-dev am:
62158f0943 -s ours am:
2ef0e15b66 -s ours am:
bea56da7d6 -s ours
am:
8143665d70 -s ours
Change-Id: Id4783d9333f538d739c0ef6546738d2a46a4e2d9
Doris Ling [Thu, 9 Aug 2018 22:32:03 +0000 (15:32 -0700)]
[automerger skipped] Merge "DO NOT MERGE Disable changing lock when device is not provisioned." into oc-dev am:
62158f0943 -s ours am:
2ef0e15b66 -s ours
am:
bea56da7d6 -s ours
Change-Id: I60cf60a6158d8c498b6b1f2a67b88c10ebb7e072
Doris Ling [Thu, 9 Aug 2018 22:26:36 +0000 (15:26 -0700)]
[automerger skipped] Merge "DO NOT MERGE Disable changing lock when device is not provisioned." into oc-dev am:
62158f0943 -s ours
am:
2ef0e15b66 -s ours
Change-Id: I3c13ee22f6e19d1ba45dd9fc34489d45c887ef35
Doris Ling [Thu, 9 Aug 2018 22:19:19 +0000 (15:19 -0700)]
[automerger skipped] Merge "DO NOT MERGE Disable changing lock when device is not provisioned." into oc-dev
am:
62158f0943 -s ours
Change-Id: I892834c6c0655f40954ee94d98b29ac271b3de4c
TreeHugger Robot [Thu, 9 Aug 2018 21:51:32 +0000 (21:51 +0000)]
Merge "DO NOT MERGE Disable changing lock when device is not provisioned." into oc-dev
Treehugger Robot [Thu, 9 Aug 2018 21:37:17 +0000 (21:37 +0000)]
Merge "Fix ACTION_NFC_SETTINGS doesn't show connection preference"
Doris Ling [Thu, 9 Aug 2018 20:17:12 +0000 (13:17 -0700)]
[automerger skipped] Merge "Disable changing lock when device is not provisioned." into oc-mr1-dev am:
38b9504a41 -s ours
am:
8c84949c84 -s ours
Change-Id: Id93d5293c4dd5ab1a0a7b3ca816795351221ef80
OSDN Git Service
